hyperquant 1.52__tar.gz → 1.54__tar.gz

{hyperquant-1.52 → hyperquant-1.54}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperquant
-Version: 1.52
+Version: 1.54
 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.52 → hyperquant-1.54}/pyproject.toml

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

{hyperquant-1.52 → hyperquant-1.54}/src/hyperquant/broker/polymarket.py

@@ -108,7 +108,10 @@ CONDITIONAL_TOKENS_SPLIT_ABI = [
     },
 ]
 DEFAULT_POLYGON_RPCS = (
-    # "https://polygon.llamarpc.com",
+    "https://1rpc.io/matic",
+    "https://polygon-bor-rpc.publicnode.com",
+    "https://polygon.drpc.org",
+    # Keep historical endpoints as fallback for users with API access.
     "https://polygon-rpc.com",
     "https://rpc.ankr.com/polygon",
 )
@@ -1846,14 +1849,22 @@ class Polymarket:
             if dry_run:
                 results.append({**item, "tx": None, "dry_run": True})
                 continue
-            tx_hash = await asyncio.to_thread(
-                self._claim_via_safe_sync,
-                candidates,
-                item["condition_id"],
-                item["index_sets"],
-                gas,
-                verbose,
-            )
+            try:
+                tx_hash = await asyncio.to_thread(
+                    self._claim_via_safe_sync,
+                    candidates,
+                    item["condition_id"],
+                    item["index_sets"],
+                    gas,
+                    verbose,
+                )
+            except Exception as exc:
+                raise RuntimeError(
+                    "claim_positions failed for "
+                    f"condition_id={item.get('condition_id')} "
+                    f"index_sets={item.get('index_sets')} "
+                    f"size={item.get('size')}: {exc}"
+                ) from exc
             result_row = {**item, "tx": tx_hash, "dry_run": False}
             if include_receipt:
                 try:
@@ -1976,22 +1987,7 @@ class Polymarket:
         last_error: Exception | None = None
         w3 = None
         rpc_used = None
-        for url in candidates:
-            try:
-                w3 = Web3(Web3.HTTPProvider(url, request_kwargs={"timeout": 30}))
-                with suppress(Exception):
-                    from web3.middleware import geth_poa_middleware, ExtraDataToPOAMiddleware
-                    try:
-                        w3.middleware_onion.inject(geth_poa_middleware, layer=0)
-                    except Exception:
-                        w3.middleware_onion.inject(ExtraDataToPOAMiddleware, layer=0)
-                rpc_used = url
-                break
-            except Exception as exc:
-                last_error = exc
-                continue
-        if w3 is None:
-            raise RuntimeError(f"All RPC endpoints failed: {candidates}") from last_error
+        safe_nonce = None
 
         pk_env = os.getenv("PK")
         if pk_env:
@@ -2004,23 +2000,11 @@ class Polymarket:
             raise RuntimeError("Safe/proxy wallet address未知, 请在 apis['polymarket'][2] 或构造函数 funder 设置")
 
         ctf_addr = self._contracts(self.chain_id, False)["conditional_tokens"]
-        ctf = w3.eth.contract(address=w3.to_checksum_address(ctf_addr), abi=CONDITIONAL_TOKENS_ABI)
-        safe = w3.eth.contract(address=w3.to_checksum_address(safe_addr), abi=SAFE_ABI)
 
         cond_bytes = bytes.fromhex(condition_id.replace("0x", ""))
         if len(cond_bytes) != 32:
             raise ValueError("condition_id must be 32-byte hex string")
 
-        redeem_calldata = ctf.encode_abi(
-            "redeemPositions",
-            args=[
-                w3.to_checksum_address(USDC_CONTRACT),
-                bytes(32),
-                cond_bytes,
-                index_sets,
-            ],
-        )
-
         safe_tx_gas = 0
         base_gas = 0
         gas_price = 0
@@ -2029,13 +2013,55 @@ class Polymarket:
         value = 0
         operation = 0  # CALL
 
-        try:
-            safe_nonce = safe.functions.nonce().call()
-        except Web3RPCError as exc:
-            # 速率限制等错误直接抛出，便于调用层切换 RPC
-            raise RuntimeError(f"获取 Safe nonce 失败 (rpc={rpc_used}): {exc}") from exc
-        except Exception as exc:
-            raise RuntimeError("无法获取 Safe nonce, 请确认 funder 地址为有效 Safe") from exc
+        ctf = None
+        safe = None
+        redeem_calldata = None
+        for url in candidates:
+            try:
+                w3_candidate = Web3(Web3.HTTPProvider(url, request_kwargs={"timeout": 30}))
+                with suppress(Exception):
+                    from web3.middleware import geth_poa_middleware, ExtraDataToPOAMiddleware
+                    try:
+                        w3_candidate.middleware_onion.inject(geth_poa_middleware, layer=0)
+                    except Exception:
+                        w3_candidate.middleware_onion.inject(ExtraDataToPOAMiddleware, layer=0)
+
+                ctf_candidate = w3_candidate.eth.contract(
+                    address=w3_candidate.to_checksum_address(ctf_addr),
+                    abi=CONDITIONAL_TOKENS_ABI,
+                )
+                safe_candidate = w3_candidate.eth.contract(
+                    address=w3_candidate.to_checksum_address(safe_addr),
+                    abi=SAFE_ABI,
+                )
+                redeem_calldata_candidate = ctf_candidate.encode_abi(
+                    "redeemPositions",
+                    args=[
+                        w3_candidate.to_checksum_address(USDC_CONTRACT),
+                        bytes(32),
+                        cond_bytes,
+                        index_sets,
+                    ],
+                )
+                nonce_candidate = safe_candidate.functions.nonce().call()
+
+                w3 = w3_candidate
+                rpc_used = url
+                ctf = ctf_candidate
+                safe = safe_candidate
+                redeem_calldata = redeem_calldata_candidate
+                safe_nonce = nonce_candidate
+                break
+            except Exception as exc:
+                last_error = exc
+                if verbose:
+                    print(f"[claim] rpc nonce probe failed: {url} -> {exc}")
+                continue
+
+        if w3 is None or safe is None or ctf is None or redeem_calldata is None or safe_nonce is None:
+            raise RuntimeError(
+                f"无法获取 Safe nonce (tried rpc={candidates}); last_error={last_error}"
+            ) from last_error
 
         try:
             safe_tx_hash = safe.functions.getTransactionHash(
@@ -2065,43 +2091,71 @@ class Polymarket:
         try:
             acct = _A.from_key(private_key)
             sender = acct.address
-            # 使用 pending 避免重复使用已在 mempool 的 nonce 触发 replacement underpriced
-            nonce = w3.eth.get_transaction_count(sender)
-            gas_price_chain = w3.eth.gas_price
         except Exception as exc:
-            raise RuntimeError("获取 sender nonce/gas_price 失败") from exc
-
-        tx = safe.functions.execTransaction(
-            w3.to_checksum_address(ctf_addr),
-            value,
-            redeem_calldata,
-            operation,
-            safe_tx_gas,
-            base_gas,
-            gas_price,
-            w3.to_checksum_address(gas_token),
-            w3.to_checksum_address(refund_receiver),
-            sig_bytes,
-        ).build_transaction(
-            {
-                "from": sender,
-                "nonce": nonce,
-                "gas": gas,
-                "gasPrice": gas_price_chain,
-            }
-        )
+            raise RuntimeError("获取 sender 地址失败") from exc
 
-        signed_tx = w3.eth.account.sign_transaction(tx, private_key)
         send_errors: list[str] = []
         for attempt in range(3):
             try:
+                nonce = w3.eth.get_transaction_count(sender, "pending")
+                gas_price_chain = int(w3.eth.gas_price)
+                if attempt > 0:
+                    # retry 时小幅提价，减少卡在同价位的概率
+                    gas_price_chain = int(gas_price_chain * (1.0 + 0.10 * attempt))
+
+                exec_tx = safe.functions.execTransaction(
+                    w3.to_checksum_address(ctf_addr),
+                    value,
+                    redeem_calldata,
+                    operation,
+                    safe_tx_gas,
+                    base_gas,
+                    gas_price,
+                    w3.to_checksum_address(gas_token),
+                    w3.to_checksum_address(refund_receiver),
+                    sig_bytes,
+                )
+                try:
+                    simulated = exec_tx.call({"from": sender})
+                except Exception as sim_exc:
+                    simulated = None
+                    if verbose:
+                        print(f"[claim] preflight call error (continue): {sim_exc}")
+                if simulated is False:
+                    err = (
+                        f"Safe preflight failed (execTransaction call returned false): "
+                        f"safe_nonce={safe_nonce} sender_nonce={nonce}"
+                    )
+                    send_errors.append(err)
+                    if verbose:
+                        print(f"Safe redeem attempt {attempt+1} failed: {err}")
+                    break
+
+                tx = exec_tx.build_transaction(
+                    {
+                        "from": sender,
+                        "nonce": nonce,
+                        "gas": gas,
+                        "gasPrice": gas_price_chain,
+                    }
+                )
+
+                signed_tx = w3.eth.account.sign_transaction(tx, private_key)
                 raw_tx = getattr(signed_tx, "rawTransaction", None) or getattr(signed_tx, "raw_transaction", None)
                 if raw_tx is None:  # pragma: no cover
                     raise AttributeError("Signed transaction missing rawTransaction/raw_transaction")
                 tx_hash = w3.eth.send_raw_transaction(raw_tx)
                 receipt = w3.eth.wait_for_transaction_receipt(tx_hash, poll_latency=2, timeout=180)
                 if receipt.get("status") != 1:
-                    raise RuntimeError(f"Safe redeemPositions failed status!=1: {tx_hash.hex()}")
+                    err = (
+                        f"Safe redeemPositions reverted on-chain: tx={tx_hash.hex()} "
+                        f"safe_nonce={safe_nonce} sender_nonce={nonce}"
+                    )
+                    send_errors.append(err)
+                    if verbose:
+                        print(f"Safe redeem attempt {attempt+1} failed: {err}")
+                    # 已经上链并回执失败，继续重试通常只会制造 nonce 噪音
+                    break
                 if verbose:
                     print(
                         {
@@ -2162,10 +2216,13 @@ class Polymarket:
             hourly_match = await _try_slug(hourly_slug)
             if hourly_match:
                 return hourly_match
-            
-        if '5m' in base_slug:
+                    
+        if '-15m-' in base_slug or base_slug.endswith('-15m'):
+            interval = 15 * 60
+        elif '-5m-' in base_slug or base_slug.endswith('-5m'):
             interval = 5 * 60
 
+
         now_ts = int(datetime.now(UTC).timestamp())
         base_ts = (now_ts // interval) * interval
 

{hyperquant-1.52 → hyperquant-1.54}/uv.lock

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