polynode 0.9.1__py3-none-any.whl → 0.9.2__py3-none-any.whl

polynode/trading/constants.py

@@ -54,7 +54,10 @@ COLLATERAL_ONRAMP = "0x93070a847efef7f70739046a929d47a521f5b8ee"
 COLLATERAL_OFFRAMP = "0x2957922eb93258b93368531d39facca3b4dc5854"
 
 # Fee Escrow
+# V1 (USDC.e collateral, paired with the V1 CLOB)
 FEE_ESCROW_ADDRESS = "0xa11D28433B79D0A88F3119b16A090075752258EA"
+# V2 (pUSD collateral, paired with the V2 CLOB). Deployed 2026-04-24.
+FEE_ESCROW_ADDRESS_V2 = "0x3A43D88ef8Aae4dF5a50B3abf67122CAAeEF7c9F"
 
 # Metadata cache TTL (5 minutes)
 META_TTL_SECONDS = 300

polynode/trading/escrow.py

@@ -14,10 +14,15 @@ from typing import Any
 
 import httpx
 
-from .constants import CHAIN_ID, FEE_ESCROW_ADDRESS
-from .types import Eip712Payload
+from .constants import CHAIN_ID, FEE_ESCROW_ADDRESS, FEE_ESCROW_ADDRESS_V2
+from .types import Eip712Payload, ExchangeVersion
 
 # ── EIP-712 Types ──
+#
+# Both V1 and V2 FeeEscrow share the same FeeAuth struct typehash. They differ only in
+# the EIP-712 domain: V1 is ("PolyNodeFeeEscrow", "1", V1 contract); V2 is
+# ("PolyNodeFeeEscrowV2", "2", V2 contract). Signing against the wrong domain produces
+# a digest the contract won't accept — `pullFee` reverts with `InvalidSignature`.
 
 FEE_AUTH_DOMAIN = {
     "name": "PolyNodeFeeEscrow",
@@ -26,6 +31,13 @@ FEE_AUTH_DOMAIN = {
     "verifyingContract": FEE_ESCROW_ADDRESS,
 }
 
+FEE_AUTH_DOMAIN_V2 = {
+    "name": "PolyNodeFeeEscrowV2",
+    "version": "2",
+    "chainId": CHAIN_ID,
+    "verifyingContract": FEE_ESCROW_ADDRESS_V2,
+}
+
 FEE_AUTH_TYPES = {
     "FeeAuth": [
         {"name": "orderId", "type": "bytes32"},
@@ -40,6 +52,16 @@ FEE_AUTH_TYPES = {
 ZERO_ADDRESS = "0x0000000000000000000000000000000000000000"
 
 
+def fee_auth_domain_for(version: ExchangeVersion) -> dict:
+    """Return the EIP-712 FeeAuth domain for a given exchange version."""
+    return FEE_AUTH_DOMAIN_V2 if version == ExchangeVersion.V2 else FEE_AUTH_DOMAIN
+
+
+def fee_escrow_address_for(version: ExchangeVersion) -> str:
+    """Return the FeeEscrow contract address for a given exchange version."""
+    return FEE_ESCROW_ADDRESS_V2 if version == ExchangeVersion.V2 else FEE_ESCROW_ADDRESS
+
+
 # ── Fee Calculation ──
 
 def calculate_fee(price: float, size: float, fee_bps: int) -> int:
@@ -67,8 +89,17 @@ def generate_escrow_order_id() -> str:
 
 # ── Nonce Fetching ──
 
-async def fetch_escrow_nonce(rpc_url: str, signer_address: str) -> int:
-    """Fetch the current nonce for a signer from the FeeEscrow contract via eth_call."""
+async def fetch_escrow_nonce(
+    rpc_url: str,
+    signer_address: str,
+    escrow_address: str = FEE_ESCROW_ADDRESS,
+) -> int:
+    """Fetch the current nonce for a signer from a FeeEscrow contract via eth_call.
+
+    Pass `fee_escrow_address_for(exchange_version)` for the `escrow_address` argument
+    when the caller's exchange version is known (V2 customers must read nonces from
+    the V2 contract — nonces on V1 and V2 are tracked independently).
+    """
     # getNonce(address) selector = 0x2d0335ab
     addr = signer_address.lower().replace("0x", "").zfill(64)
     data = "0x2d0335ab" + addr
@@ -80,7 +111,7 @@ async def fetch_escrow_nonce(rpc_url: str, signer_address: str) -> int:
                 "jsonrpc": "2.0",
                 "id": 1,
                 "method": "eth_call",
-                "params": [{"to": FEE_ESCROW_ADDRESS, "data": data}, "latest"],
+                "params": [{"to": escrow_address, "data": data}, "latest"],
             },
         )
         result = resp.json()
@@ -103,6 +134,9 @@ class FeeAuthRequest:
     signature: str
     affiliate: str
     affiliate_share_bps: int
+    # V2-routing hint for the cosigner. Set when exchange_version == V2 so the
+    # cosigner picks the V2 operator; absent for V1 (preserves backwards compat).
+    escrow_contract: str | None = None
 
 
 async def sign_fee_auth(
@@ -116,19 +150,22 @@ async def sign_fee_auth(
     nonce: int,
     affiliate: str | None = None,
     affiliate_share_bps: int | None = None,
+    exchange_version: ExchangeVersion = ExchangeVersion.V1,
 ) -> FeeAuthRequest:
     """Sign a FeeAuth EIP-712 message.
 
     Args:
         sign_typed_data: Callable that signs an Eip712Payload and returns a hex signature.
         escrow_order_id: Random bytes32 hex string.
-        payer: Safe wallet address (where USDC is pulled from).
+        payer: Safe wallet address (where collateral is pulled from — USDC.e on V1, pUSD on V2).
         signer_address: EOA address (signs the message).
-        fee_amount: Fee in raw USDC (6 decimals).
+        fee_amount: Fee in raw collateral units (6 decimals).
         deadline: Unix timestamp — authorization expires after this.
         nonce: Signer's current nonce from the escrow contract.
         affiliate: Partner wallet address.
         affiliate_share_bps: Partner's share of fee in bps.
+        exchange_version: V1 (default, USDC.e) or V2 (pUSD). Selects the EIP-712 domain
+            and the escrow contract address the cosigner should route to.
 
     Returns:
         FeeAuthRequest ready for the cosigner.
@@ -143,7 +180,7 @@ async def sign_fee_auth(
     }
 
     payload = Eip712Payload(
-        domain=FEE_AUTH_DOMAIN,
+        domain=fee_auth_domain_for(exchange_version),
         types=FEE_AUTH_TYPES,
         primary_type="FeeAuth",
         message=message,
@@ -153,6 +190,10 @@ async def sign_fee_auth(
     if not signature.startswith("0x"):
         signature = f"0x{signature}"
 
+    escrow_contract = (
+        FEE_ESCROW_ADDRESS_V2 if exchange_version == ExchangeVersion.V2 else None
+    )
+
     return FeeAuthRequest(
         escrow_order_id=escrow_order_id,
         payer=payer,
@@ -163,4 +204,5 @@ async def sign_fee_auth(
         signature=signature,
         affiliate=affiliate or ZERO_ADDRESS,
         affiliate_share_bps=affiliate_share_bps if affiliate_share_bps is not None else 10000,
+        escrow_contract=escrow_contract,
     )

polynode/trading/onboarding.py

@@ -29,6 +29,7 @@ from .constants import (
     USDC,
     V2_SPENDERS,
     FEE_ESCROW_ADDRESS,
+    FEE_ESCROW_ADDRESS_V2,
 )
 from .types import ApprovalStatus, BalanceInfo, ExchangeVersion, SignatureType
 
@@ -189,9 +190,16 @@ async def check_approvals(
         approved = ctf_contract.functions.isApprovedForAll(funder, spender_addr).call()
         ctf_status[name] = approved
 
-    # Fee Escrow USDC approval (always USDC.e regardless of exchange version)
-    usdc_contract = w3.eth.contract(address=Web3.to_checksum_address(USDC), abi=erc20_abi)
-    escrow_allowance = usdc_contract.functions.allowance(funder, Web3.to_checksum_address(FEE_ESCROW_ADDRESS)).call()
+    # Fee Escrow approval. V1 approves USDC.e for the V1 contract; V2 approves pUSD
+    # for the V2 contract. pullFee fails with `TransferFailed` if the approval is
+    # missing on the version the caller's orders are routed to.
+    if version == ExchangeVersion.V2:
+        escrow_token_contract = w3.eth.contract(address=Web3.to_checksum_address(POLY_USD), abi=erc20_abi)
+        escrow_addr = Web3.to_checksum_address(FEE_ESCROW_ADDRESS_V2)
+    else:
+        escrow_token_contract = w3.eth.contract(address=Web3.to_checksum_address(USDC), abi=erc20_abi)
+        escrow_addr = Web3.to_checksum_address(FEE_ESCROW_ADDRESS)
+    escrow_allowance = escrow_token_contract.functions.allowance(funder, escrow_addr).call()
     usdc_status["fee_escrow"] = escrow_allowance >= threshold
 
     all_approved = all(usdc_status.values()) and all(ctf_status.values())
@@ -273,9 +281,16 @@ async def set_approvals(
         tx_hashes.append(tx_hash.hex())
         nonce += 1
 
-    # Fee Escrow USDC approval (always USDC.e regardless of exchange version)
-    escrow_contract = w3.eth.contract(address=Web3.to_checksum_address(USDC), abi=erc20_abi)
-    tx = escrow_contract.functions.approve(Web3.to_checksum_address(FEE_ESCROW_ADDRESS), max_uint).build_transaction({
+    # Fee Escrow collateral approval — V1 approves USDC.e for V1 FeeEscrow;
+    # V2 approves pUSD for V2 FeeEscrow.
+    if version == ExchangeVersion.V2:
+        escrow_token = POLY_USD
+        escrow_target = FEE_ESCROW_ADDRESS_V2
+    else:
+        escrow_token = USDC
+        escrow_target = FEE_ESCROW_ADDRESS
+    escrow_token_contract = w3.eth.contract(address=Web3.to_checksum_address(escrow_token), abi=erc20_abi)
+    tx = escrow_token_contract.functions.approve(Web3.to_checksum_address(escrow_target), max_uint).build_transaction({
         "from": account.address,
         "nonce": nonce,
         "chainId": CHAIN_ID,

polynode/trading/trader.py

@@ -26,7 +26,7 @@ from .constants import (
 )
 from .cosigner import build_l2_headers, send_via_cosigner
 from .eip712 import create_signed_order, create_signed_order_v2
-from .escrow import calculate_fee, generate_escrow_order_id, fetch_escrow_nonce, sign_fee_auth
+from .escrow import calculate_fee, fee_escrow_address_for, fetch_escrow_nonce, generate_escrow_order_id, sign_fee_auth
 from .onboarding import (
     check_approvals as check_approvals_onchain,
     check_balance as check_balance_onchain,
@@ -699,7 +699,8 @@ class PolyNodeTrader:
             fee_amount_raw = calculate_fee(params.price, params.size, fee_config.fee_bps)
             if fee_amount_raw > 0:
                 funder = creds.funder_address or creds.wallet_address
-                nonce = await fetch_escrow_nonce(self._rpc_url, signer.address)
+                escrow_address = fee_escrow_address_for(self._exchange_version)
+                nonce = await fetch_escrow_nonce(self._rpc_url, signer.address, escrow_address)
                 deadline = int(time.time()) + 300
                 escrow_oid = generate_escrow_order_id()
                 fee_auth = await sign_fee_auth(
@@ -712,6 +713,7 @@ class PolyNodeTrader:
                     nonce=nonce,
                     affiliate=fee_config.affiliate,
                     affiliate_share_bps=fee_config.affiliate_share_bps,
+                    exchange_version=self._exchange_version,
                 )
                 fee_auth_dict = {
                     "escrow_order_id": fee_auth.escrow_order_id,
@@ -724,6 +726,8 @@ class PolyNodeTrader:
                     "affiliate": fee_auth.affiliate,
                     "affiliate_share_bps": fee_auth.affiliate_share_bps,
                 }
+                if fee_auth.escrow_contract:
+                    fee_auth_dict["escrow_contract"] = fee_auth.escrow_contract
 
         request_data: dict[str, Any] = {"method": "POST", "path": "/order", "body": body_str, "headers": headers}
         if fee_auth_dict:

{polynode-0.9.1.dist-info → polynode-0.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polynode
-Version: 0.9.1
+Version: 0.9.2
 Summary: Python SDK for the PolyNode real-time prediction market data platform
 Project-URL: Homepage, https://polynode.dev
 Project-URL: Documentation, https://docs.polynode.dev

{polynode-0.9.1.dist-info → polynode-0.9.2.dist-info}/RECORD

@@ -14,17 +14,17 @@ polynode/cache/__init__.py,sha256=A9lXcIE3ISKKo1r0o3o-CkmQpBhLdKwdQfCR0eW5i9o,51
 polynode/trading/V2_ORDER_FLOW.md,sha256=Ppd7iwZjtmVwok-fP4Ofo4UBQ9pIAg0t57RJ-OzqRHs,10926
 polynode/trading/__init__.py,sha256=sPv30j9eyvqjnUBxGAYaKpAPQZ2jTw3UwA4DZXYZ21s,923
 polynode/trading/clob_api.py,sha256=Sfb8XLN9MMzVE6jARNqEQxiD608OC_6Xjc7uiJbDQEc,7274
-polynode/trading/constants.py,sha256=aW8F9Q2W0TRNVX0JNh39k0qxbb03ijUAGbWjrJFjf_o,2513
+polynode/trading/constants.py,sha256=IEdrwC4bPjo4MoVlDKYqXphlmIKsoxO4f_s_pyZ3x08,2702
 polynode/trading/cosigner.py,sha256=Fww9OgaKdHQAHd8Kom1AJBtmMGC8FbNZxdFaFALNBY8,3058
 polynode/trading/eip712.py,sha256=PKLfMt58Diy419jiQXysnX1kSlU_QcWDRofGEb3u_JI,9744
-polynode/trading/escrow.py,sha256=bU_ohyOlx2r6KjBYxUNdjROvrmunWV1Ey99AuSOt9Z8,4590
-polynode/trading/onboarding.py,sha256=oXtFz1HF1vGvMnb5o44SwuADd2mdU5ws1v7n30rk6fg,15066
+polynode/trading/escrow.py,sha256=T2v5bv3wIyQTcFoxcHXlDBlzyeWDYbxRIqQamqlhaog,6513
+polynode/trading/onboarding.py,sha256=GdQh1aM9F0LuCL3uqNTguXX5Sxe1_0hSVdHR7kksKZ0,15777
 polynode/trading/position_management.py,sha256=z2pYls4ErhyRE6thQdOs45BF4llKvKNNruQgcMEFT_U,3827
 polynode/trading/privy.py,sha256=iiUQZsBqjj29C7oUiFFktoT2muZY06bcMzABKstFKqE,4523
 polynode/trading/relayer.py,sha256=adTo-aclWnaqrFtfWEOQ2Ye859CZMc9q_fsd3DePDGA,10542
 polynode/trading/signer.py,sha256=piifRquwnwFwrKLL24jsRQYMh_cdkz8wNz99Vx8_KTY,3413
 polynode/trading/sqlite_backend.py,sha256=zfo4WevuunWV-7i6Z3gQi_e7Tonw-7m1TsEd88O5I4w,9486
-polynode/trading/trader.py,sha256=MUc8DFyFpSoogVJHpSEe2AhVxqxHYZ6FiSw-mQ2I1hI,36882
+polynode/trading/trader.py,sha256=EEwF_U2DXVPRnENY5azk8FgzSx_zXns27apQQj9isus,37188
 polynode/trading/types.py,sha256=mo5zJRlfQLWuXwrkS9AaGqKWrt7FMf6bPGRE-0T62J0,5698
 polynode/types/__init__.py,sha256=0v_CByqG-zT1xucbT2So_77YDmsPj9u956at94nyrLM,280
 polynode/types/enums.py,sha256=2cx9l10A-LUeDNBJZn7l0XBTka2YfxRQcXW0s7s3_4k,1082
@@ -33,6 +33,6 @@ polynode/types/orderbook.py,sha256=MwD6P3poo3F70bONUZ5i3ajk1sgw39hHTOw6D0fP5_8,1
 polynode/types/rest.py,sha256=ftJKQZH0wBrR_l199rDMqnVS8cyt8YnCvo9cKIsTcCw,7012
 polynode/types/short_form.py,sha256=xfGklDi587u6K2aXaRWiwbxqkipW8BiEPeNIDT45v2Y,799
 polynode/types/ws.py,sha256=EzE9Vzrb6cILemfssmnqM8fbHt4USn3latpUHKatwk4,994
-polynode-0.9.1.dist-info/METADATA,sha256=t6KrXQDkV0FSLqZ522PZK__qczPvfuUvn2CKwgOHxx4,3777
-polynode-0.9.1.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-polynode-0.9.1.dist-info/RECORD,,
+polynode-0.9.2.dist-info/METADATA,sha256=-FqTxtI_g04JQ7AxM9kzp9RxfnF6dGNADA3CmfXORK8,3777
+polynode-0.9.2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+polynode-0.9.2.dist-info/RECORD,,