hyperquant 1.56__tar.gz → 1.58__tar.gz

{hyperquant-1.56 → hyperquant-1.58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperquant
-Version: 1.56
+Version: 1.58
 Summary: A minimal yet hyper-efficient backtesting framework for quantitative trading
 Project-URL: Homepage, https://github.com/yourusername/hyperquant
 Project-URL: Issues, https://github.com/yourusername/hyperquant/issues

{hyperquant-1.56 → hyperquant-1.58}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hyperquant"
-version = "1.56"
+version = "1.58"
 description = "A minimal yet hyper-efficient backtesting framework for quantitative trading"
 authors = [
     { name = "MissinA", email = "1421329142@qq.com" }

{hyperquant-1.56 → hyperquant-1.58}/src/hyperquant/broker/polymarket.py

@@ -8,7 +8,7 @@ from functools import lru_cache
 import os
 import time
 from typing import Any, Awaitable, Callable, Iterable, Iterator, Literal, Mapping, Sequence
-from urllib.parse import urlsplit, urlunsplit
+from urllib.parse import urlencode, urlsplit, urlunsplit
 
 import json
 
@@ -232,7 +232,8 @@ class Polymarket:
         private_key: str | None = None,
         chain_id: int | None = None,
         signature_type: int | None = None,
-        funder: str | None = None
+        funder: str | None = None,
+        forward_url: str | None = None, # geoblock转发
     ) -> None:
         # Logger (per-class, safe default)
         self.logger = logging.getLogger(f"{API_NAME}.{self.__class__.__name__}")
@@ -247,6 +248,7 @@ class Polymarket:
         self.client = client
         self.rest_api = (rest_api or DEFAULT_REST_ENDPOINT).rstrip("/")
         self.ws_public = ws_public or DEFAULT_WS_ENDPOINT
+        self.forward_url = forward_url
 
         self.chain_id = chain_id or 137
         # Default to POLY_GNOSIS_SAFE (2) to match common proxy flows used in examples/tests.
@@ -315,7 +317,7 @@ class Polymarket:
         concurrency: int = 5,
         callback: Callable[[dict[str, Any]], Awaitable[None] | None] | None = None,
     ) -> None:
-        """Mount forward execution for place_orders/cancel_orders."""
+        """Mount forward execution for order placement and cancellation endpoints."""
         cfg = {
             "mode": mode,
             "url": url,
@@ -802,13 +804,19 @@ class Polymarket:
 
     async def create_api_key(self, nonce: int | None = None) -> dict[str, Any]:
         params = {"nonce": nonce} if nonce is not None else None
-        data = await self._rest("POST", "/auth/api-key", params=params)
+        if self.forward_url:
+            data = await self._forward_l1_auth_request("POST", "/auth/api-key", params=params)
+        else:
+            data = await self._rest("POST", "/auth/api-key", params=params)
         self._store_api_creds(data)
         return data
 
     async def derive_api_key(self, nonce: int | None = None) -> dict[str, Any]:
         params = {"nonce": nonce} if nonce is not None else None
-        data = await self._rest("GET", "/auth/derive-api-key", params=params)
+        if self.forward_url:
+            data = await self._forward_l1_auth_request("GET", "/auth/derive-api-key", params=params)
+        else:
+            data = await self._rest("GET", "/auth/derive-api-key", params=params)
         self._store_api_creds(data)
         return data
 
@@ -1506,6 +1514,135 @@ class Polymarket:
             "Content-Type": "application/json",
         }
 
+    def _build_l1_signed_headers(self, *, nonce: int = 0) -> dict[str, str]:
+        from eth_account import Account as _A
+        try:
+            from eth_account.messages import encode_typed_data as _enc
+        except ImportError:
+            from eth_account.messages import encode_structured_data as _enc
+
+        private_key, _, signer_addr = self._get_signing_context()
+        timestamp = int(time.time())
+        typed_data = {
+            "types": {
+                "EIP712Domain": [
+                    {"name": "name", "type": "string"},
+                    {"name": "version", "type": "string"},
+                    {"name": "chainId", "type": "uint256"},
+                ],
+                "ClobAuth": [
+                    {"name": "address", "type": "address"},
+                    {"name": "timestamp", "type": "string"},
+                    {"name": "nonce", "type": "uint256"},
+                    {"name": "message", "type": "string"},
+                ],
+            },
+            "domain": {
+                "name": "ClobAuthDomain",
+                "version": "1",
+                "chainId": int(self.chain_id),
+            },
+            "primaryType": "ClobAuth",
+            "message": {
+                "address": signer_addr,
+                "timestamp": str(timestamp),
+                "nonce": int(nonce),
+                "message": "This message attests that I control the given wallet",
+            },
+        }
+        encoded = _enc(full_message=typed_data)
+        signature = _A.sign_message(encoded, private_key).signature.hex()
+        if not signature.startswith("0x"):
+            signature = f"0x{signature}"
+        return {
+            "POLY_ADDRESS": signer_addr,
+            "POLY_SIGNATURE": signature,
+            "POLY_TIMESTAMP": str(timestamp),
+            "POLY_NONCE": str(int(nonce)),
+            "Content-Type": "application/json",
+        }
+
+    async def _forward_l1_auth_request(
+        self,
+        method: str,
+        path: str,
+        *,
+        params: Mapping[str, Any] | None = None,
+    ) -> dict[str, Any]:
+        session: aiohttp.ClientSession = getattr(self.client, "_session", None)
+        if session is None:
+            raise RuntimeError("pybotters client session missing")
+        if not self.forward_url:
+            raise RuntimeError("forward_url is required for forward auth request")
+
+        nonce = 0
+        if params and "nonce" in params:
+            try:
+                nonce = int(params["nonce"])
+            except (TypeError, ValueError):
+                nonce = 0
+
+        query = urlencode(dict(params), doseq=True) if params else ""
+        url = f"{self.rest_api.rstrip('/')}{path}"
+        if query:
+            url = f"{url}?{query}"
+        req = {
+            "method": method.upper(),
+            "url": url,
+            "headers": self._build_l1_signed_headers(nonce=nonce),
+            "body": None,
+        }
+
+        endpoint = self._normalize_forward_batch_url(self.forward_url)
+        async with session.post(endpoint, json={"requests": [req]}) as resp:
+            if resp.status >= 400:
+                text = await resp.text()
+                raise RuntimeError(f"Forward auth request failed: {resp.status} {text}")
+            payload = await resp.json(content_type=None)
+
+        first: Any
+        if isinstance(payload, list):
+            first = payload[0] if payload else {}
+        elif isinstance(payload, dict):
+            for key in ("responses", "results", "data"):
+                value = payload.get(key)
+                if isinstance(value, list):
+                    first = value[0] if value else {}
+                    break
+            else:
+                first = payload
+        else:
+            raise RuntimeError(f"Unexpected forward response: {payload!r}")
+
+        def _parse_maybe_json(data: Any) -> Any:
+            if isinstance(data, str):
+                text = data.strip()
+                try:
+                    return json.loads(text)
+                except Exception:
+                    return text
+            return data
+
+        if isinstance(first, dict):
+            # worker forwarder shape: { ok, status, bodyPreview }
+            if first.get("ok") is False or int(first.get("status", 200)) >= 400:
+                detail = _parse_maybe_json(first.get("bodyPreview") or first.get("body") or first)
+                raise RuntimeError(
+                    f"Forward upstream auth failed: status={first.get('status')} detail={detail!r}"
+                )
+
+            body = _parse_maybe_json(first.get("body"))
+            if isinstance(body, dict):
+                return body
+
+            preview = _parse_maybe_json(first.get("bodyPreview"))
+            if isinstance(preview, dict):
+                return preview
+
+            if all(k in first for k in ("apiKey", "secret", "passphrase")):
+                return first
+        raise RuntimeError(f"Forward response missing auth body: {payload!r}")
+
     async def _submit_forward_requests(self, requests_payload: Sequence[Mapping[str, Any]]) -> Any:
         cfg = self._forward_orders_cfg
         if not cfg:
@@ -1549,6 +1686,33 @@ class Polymarket:
             "count": len(requests_payload),
         }
 
+    def _build_forward_signed_request(
+        self,
+        *,
+        method: str,
+        path: str,
+        payload: Any,
+        signer_addr: str,
+        api_key: str,
+        api_secret: str,
+        api_passphrase: str,
+    ) -> dict[str, Any]:
+        headers = self._build_l2_signed_headers(
+            signer_addr=signer_addr,
+            api_key=api_key,
+            api_secret=api_secret,
+            api_passphrase=api_passphrase,
+            method=method,
+            path=path,
+            payload=payload,
+        )
+        return {
+            "method": method.upper(),
+            "url": f"{self.rest_api.rstrip('/')}{path}",
+            "headers": headers,
+            "body": payload,
+        }
+
     async def post_orders(
         self,
         orders: Iterable[tuple[Mapping[str, Any], str]],
@@ -1679,7 +1843,35 @@ class Polymarket:
         """
         {'not_canceled': {}, 'canceled': ['0xb3507e9fda9541c3e038afcb4f24b96efcfa667d46cf5e9e52c41620711818df', '0x4b9c3ee4dee8653f15f716653e8ac83f0a086a38597e6ec4b72be2389c79b8b4']}
         """
-        return await self._signed_request_via_session("DELETE", "/order", {"orderID": order_id})
+        payload = {"orderID": order_id}
+        if self._forward_orders_cfg:
+            session: aiohttp.ClientSession = getattr(self.client, "_session", None)
+            if session is None:
+                raise RuntimeError("pybotters client session missing")
+            creds = getattr(session, "_polymarket_api_creds", None)
+            if not creds:
+                raise RuntimeError("Polymarket API creds missing; call create_or_derive_api_creds")
+            api_key = creds.get("api_key")
+            api_secret = creds.get("api_secret")
+            api_passphrase = creds.get("api_passphrase")
+            if not (api_key and api_secret and api_passphrase):
+                raise RuntimeError("Polymarket API creds incomplete")
+
+            _, _, signer_addr = self._get_signing_context()
+            requests_payload = [
+                self._build_forward_signed_request(
+                    method="DELETE",
+                    path="/order",
+                    payload=payload,
+                    signer_addr=signer_addr,
+                    api_key=api_key,
+                    api_secret=api_secret,
+                    api_passphrase=api_passphrase,
+                )
+            ]
+            return await self._submit_forward_requests(requests_payload)
+
+        return await self._signed_request_via_session("DELETE", "/order", payload)
 
     async def cancel_orders(
         self,
@@ -1703,22 +1895,16 @@ class Polymarket:
                 raise RuntimeError("Polymarket API creds incomplete")
 
             _, _, signer_addr = self._get_signing_context()
-            headers = self._build_l2_signed_headers(
-                signer_addr=signer_addr,
-                api_key=api_key,
-                api_secret=api_secret,
-                api_passphrase=api_passphrase,
-                method="DELETE",
-                path="/orders",
-                payload=payload,
-            )
             requests_payload = [
-                {
-                    "method": "DELETE",
-                    "url": f"{self.rest_api.rstrip('/')}/orders",
-                    "headers": headers,
-                    "body": payload,
-                }
+                self._build_forward_signed_request(
+                    method="DELETE",
+                    path="/orders",
+                    payload=payload,
+                    signer_addr=signer_addr,
+                    api_key=api_key,
+                    api_secret=api_secret,
+                    api_passphrase=api_passphrase,
+                )
             ]
             return await self._submit_forward_requests(requests_payload)
 
@@ -1728,10 +1914,65 @@ class Polymarket:
         """
         {'not_canceled': {}, 'canceled': ['0xb3507e9fda9541c3e038afcb4f24b96efcfa667d46cf5e9e52c41620711818df', '0x4b9c3ee4dee8653f15f716653e8ac83f0a086a38597e6ec4b72be2389c79b8b4']}
         """
-        return await self._signed_request_via_session("DELETE", "/cancel-all", None)
+        payload = None
+        if self._forward_orders_cfg:
+            session: aiohttp.ClientSession = getattr(self.client, "_session", None)
+            if session is None:
+                raise RuntimeError("pybotters client session missing")
+            creds = getattr(session, "_polymarket_api_creds", None)
+            if not creds:
+                raise RuntimeError("Polymarket API creds missing; call create_or_derive_api_creds")
+            api_key = creds.get("api_key")
+            api_secret = creds.get("api_secret")
+            api_passphrase = creds.get("api_passphrase")
+            if not (api_key and api_secret and api_passphrase):
+                raise RuntimeError("Polymarket API creds incomplete")
+
+            _, _, signer_addr = self._get_signing_context()
+            requests_payload = [
+                self._build_forward_signed_request(
+                    method="DELETE",
+                    path="/cancel-all",
+                    payload=payload,
+                    signer_addr=signer_addr,
+                    api_key=api_key,
+                    api_secret=api_secret,
+                    api_passphrase=api_passphrase,
+                )
+            ]
+            return await self._submit_forward_requests(requests_payload)
+
+        return await self._signed_request_via_session("DELETE", "/cancel-all", payload)
 
     async def cancel_market_orders(self, market: str = "", asset_id: str = "") -> Any:
         body = {"market": market, "asset_id": asset_id}
+        if self._forward_orders_cfg:
+            session: aiohttp.ClientSession = getattr(self.client, "_session", None)
+            if session is None:
+                raise RuntimeError("pybotters client session missing")
+            creds = getattr(session, "_polymarket_api_creds", None)
+            if not creds:
+                raise RuntimeError("Polymarket API creds missing; call create_or_derive_api_creds")
+            api_key = creds.get("api_key")
+            api_secret = creds.get("api_secret")
+            api_passphrase = creds.get("api_passphrase")
+            if not (api_key and api_secret and api_passphrase):
+                raise RuntimeError("Polymarket API creds incomplete")
+
+            _, _, signer_addr = self._get_signing_context()
+            requests_payload = [
+                self._build_forward_signed_request(
+                    method="DELETE",
+                    path="/cancel-market-orders",
+                    payload=body,
+                    signer_addr=signer_addr,
+                    api_key=api_key,
+                    api_secret=api_secret,
+                    api_passphrase=api_passphrase,
+                )
+            ]
+            return await self._submit_forward_requests(requests_payload)
+
         return await self._signed_request_via_session("DELETE", "/cancel-market-orders", body)
 
     async def get_order(self, order_id: str) -> Any:
@@ -2711,10 +2952,7 @@ class Polymarket:
         self.auth = True
 
     @staticmethod
-    def load_poly_api():
-        from dotenv import load_dotenv
-
-        load_dotenv()
+    def load_poly_api() -> list[Any]:
         pk = os.getenv("PK")
         api_key = os.getenv("CLOB_API_KEY")
         api_secret = os.getenv("CLOB_API_SECRET")

{hyperquant-1.56 → hyperquant-1.58}/uv.lock

@@ -694,7 +694,7 @@ wheels = [
 
 [[package]]
 name = "hyperquant"
-version = "1.55"
+version = "1.57"
 source = { editable = "." }
 dependencies = [
     { name = "aiohttp" },