polycopy 0.2.5 → 0.2.7

package/dist/index.js

@@ -10,8 +10,8 @@ const viem = require("viem");
 const accounts = require("viem/accounts");
 const chains = require("viem/chains");
 const builderRelayerClient = require("@polymarket/builder-relayer-client");
+const EventEmitter = require("eventemitter3");
 const setPromiseInterval = require("set-promise-interval");
-const lodash = require("lodash");
 const child_process = require("child_process");
 const fs = require("fs");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
@@ -34,10 +34,10 @@ function _interopNamespace(e) {
 }
 const log4js__default = /* @__PURE__ */ _interopDefault(log4js);
 const path__namespace = /* @__PURE__ */ _interopNamespace(path);
+const EventEmitter__default = /* @__PURE__ */ _interopDefault(EventEmitter);
 const setPromiseInterval__default = /* @__PURE__ */ _interopDefault(setPromiseInterval);
 const fs__namespace = /* @__PURE__ */ _interopNamespace(fs);
 const LOG_FILE = path__namespace.join(processLock.LOGS_DIR, "polycopy.log");
-path__namespace.join(processLock.LOGS_DIR, "polycopy");
 log4js__default.default.configure({
   appenders: {
     file: {
@@ -61,7 +61,6 @@ log4js__default.default.configure({
   }
 });
 const log4jsLogger = log4js__default.default.getLogger("polycopy");
-const formatMessage = (message, args) => args.length > 0 ? `${message} ${args.join(" ")}` : message;
 class Logger {
   initialized = false;
   /**
@@ -74,31 +73,31 @@ class Logger {
 📁 日志目录: ${processLock.LOGS_DIR}`);
   }
   /**
-   * 输出信息日志（前后自动添加空行）
+   * 输出信息日志
    */
-  info(message, ...args) {
-    log4jsLogger.info(formatMessage(message, args));
+  info(...messages) {
+    log4jsLogger.info(messages[0], ...messages.slice(1));
   }
   /**
-   * 输出成功日志（前后自动添加空行）
+   * 输出成功日志
    */
-  success(message, ...args) {
-    log4jsLogger.info(`✅ ${formatMessage(message, args)}`);
+  success(...messages) {
+    log4jsLogger.info("✅", ...messages);
   }
   /**
-   * 输出警告日志（前后自动添加空行）
+   * 输出警告日志
    */
-  warning(message, ...args) {
-    log4jsLogger.warn(`⚠️  ${formatMessage(message, args)}`);
+  warning(...messages) {
+    log4jsLogger.warn("⚠️", ...messages);
   }
   /**
-   * 输出错误日志（前后自动添加空行）
+   * 输出错误日志
    */
-  error(message, ...args) {
-    log4jsLogger.error(`❌ ${formatMessage(message, args)}`);
+  error(...messages) {
+    log4jsLogger.error("❌", ...messages);
   }
   /**
-   * 输出章节标题（前后自动添加空行）
+   * 输出章节标题
    */
   section(title) {
     log4jsLogger.info(`=== ${title} ===`);
@@ -111,12 +110,6 @@ class Logger {
     const formatted = `${indentStr}${message}`;
     log4jsLogger.info(formatted);
   }
-  /**
-   * 输出普通文本（不添加空行，用于连续输出）
-   */
-  text(message, ...args) {
-    log4jsLogger.info(formatMessage(message, args));
-  }
   /**
    * 输出空行
    */
@@ -124,13 +117,16 @@ class Logger {
     console.log("");
   }
   /**
-   * 输出带前缀的信息（不添加空行）
+   * 输出带前缀的信息
    * 用于在同一组日志中输出多行信息
    */
   line(prefix, message, ...args) {
     const formatted = args.length > 0 ? `  ${prefix} ${message} ${args.join(" ")}` : `  ${prefix} ${message}`;
     log4jsLogger.info(formatted);
   }
+  lines(...messages) {
+    for (let msg of messages) this.info(msg);
+  }
   /**
    * 刷新日志输出（用于进程退出前）
    */
@@ -845,43 +841,147 @@ class ClobClientWrapper {
     return parseFloat(result.balance) / 1e6;
   }
 }
-const RPC_URL = "https://polygon-rpc.com";
 const CTF_ADDRESS = viem.getAddress("0x4d97dcd97ec945f40cf65f87097ace5ea0476045");
 const USDC_ADDRESS = viem.getAddress("0x2791bca1f2de4661ed88a30c99a7a9449aa84174");
-class RelayClientWrapper {
-  relayClient = null;
-  initialized = false;
-  /**
-   * 初始化 RelayClient
-   */
-  init(config) {
-    if (this.initialized) {
+const SUBMIT_ERROR_SYMBOL = "__SUBMIT_ERROR__";
+class RelayClient extends EventEmitter__default.default {
+  lastPostTime;
+  resetsTime;
+  postTimeout = null;
+  pendingTransactions = [];
+  options;
+  constructor(options) {
+    super();
+    this.options = {
+      batchSize: options.batchSize || 10,
+      postInterval: options.postInterval || 7.5 * 60 * 1e3,
+      maxRetry: 3,
+      ...options
+    };
+  }
+  testRequestLimit(error) {
+    const errorMsg = error instanceof Error ? error.message : String(error);
+    if (errorMsg.includes("429") || errorMsg.includes("Too Many Requests")) {
+      const match = errorMsg.match(/resets in (\d+) seconds/);
+      return match ? parseInt(match[1]) * 1e3 : 0;
+    }
+    return 0;
+  }
+  makePostData() {
+    const total = this.pendingTransactions.length;
+    const transactions = this.pendingTransactions.sort((a, b) => a.retryNum - b.retryNum).splice(0, this.options.batchSize);
+    if (transactions.length === 0) return null;
+    const postTransactions = [];
+    const postConditionIds = {
+      redeem: [],
+      merge: []
+    };
+    for (const { type, conditionId, transaction } of transactions) {
+      postConditionIds[type].push(conditionId);
+      postTransactions.push(transaction);
+    }
+    return {
+      total,
+      transactions,
+      postConditionIds,
+      postTransactions
+    };
+  }
+  exec() {
+    if (this.postTimeout || this.pendingTransactions.length === 0 || this.resetsTime) {
       return;
     }
-    const account = accounts.privateKeyToAccount(config.privateKey);
-    const walletClient = viem.createWalletClient({
-      account,
-      chain: chains.polygon,
-      transport: viem.http(RPC_URL)
-    });
-    const builderConfig = new builderSigningSdk.BuilderConfig({
-      localBuilderCreds: config.builderCreds
-    });
-    this.relayClient = new builderRelayerClient.RelayClient(
-      "https://relayer-v2.polymarket.com",
-      137,
-      walletClient,
-      builderConfig,
-      builderRelayerClient.RelayerTxType.SAFE
+    const now = Date.now();
+    const leftTime = this.lastPostTime ? Math.max(this.options.postInterval - (now - this.lastPostTime), 0) : 0;
+    logger.info(
+      "RelayClient",
+      "next post:",
+      new Date(now + leftTime).toLocaleString()
     );
-    this.initialized = true;
-    logger.success("RelayClient 初始化完成");
+    this.postTimeout = setTimeout(() => {
+      const postData = this.makePostData();
+      if (!postData) return;
+      const { total, transactions, postTransactions, postConditionIds } = postData;
+      logger.info(
+        "RelayClient",
+        "post transactions:",
+        `${transactions.length}/${total}`
+      );
+      logger.info(` - pending: ${this.pendingTransactions.length}`);
+      this.emit("post", postConditionIds);
+      const onPosted = (txHash, error) => {
+        this.lastPostTime = Date.now();
+        const postedRet = {
+          txHash,
+          error,
+          redeem: {
+            success: [],
+            failed: []
+          },
+          merge: {
+            success: [],
+            failed: []
+          }
+        };
+        const resolveTx = txHash ? (pt) => {
+          pt.resolve(txHash);
+          const success = postedRet[pt.type].success;
+          success.push(pt.conditionId);
+        } : (pt) => {
+          if (pt.retryNum >= this.options.maxRetry) {
+            pt.reject(error);
+            const failed = postedRet[pt.type].failed;
+            failed.push(pt.conditionId);
+          } else {
+            this.pendingTransactions.push(pt);
+          }
+        };
+        for (const pt of transactions) {
+          pt.retryNum++;
+          resolveTx(pt);
+        }
+        logger.info("RelayClient", "post transactions done:");
+        logger.info(
+          ` - redeem: [success: ${postedRet.redeem.success.length} failed: ${postedRet.redeem.failed.length}]`
+        );
+        logger.info(
+          ` - merge: [success: ${postedRet.merge.success.length} failed: ${postedRet.merge.failed.length}]`
+        );
+        logger.info(` - pending: ${this.pendingTransactions.length}`);
+        this.emit("posted", postedRet);
+      };
+      this.post(postTransactions).then((txHash) => onPosted(txHash)).catch((e) => {
+        const requestLimit = this.testRequestLimit(e);
+        if (requestLimit > 0) {
+          this.pendingTransactions.push(...transactions);
+          this.resetsTime = Date.now() + requestLimit;
+          this.emit("requestLimit", requestLimit);
+          setTimeout(() => {
+            this.resetsTime = void 0;
+            this.emit("resets");
+            this.exec();
+          }, requestLimit);
+        } else {
+          onPosted(null, e);
+        }
+      }).finally(() => {
+        this.postTimeout = null;
+        this.exec();
+      });
+    }, leftTime);
   }
-  /**
-   * 检查是否已初始化
-   */
-  isInitialized() {
-    return this.initialized;
+  async post(transactions) {
+    const response = await this.options.polyRelayClient.execute(
+      transactions,
+      `Polymarket execute batch (${transactions.length})`
+    );
+    const result = await response.wait();
+    if (!result) {
+      throw Error(
+        "Redeem 交易失败：wait() 返回空结果（可能被 revert 或 relayer 拒绝）"
+      );
+    }
+    return result.transactionHash;
   }
   buildRedeemTransaction(conditionId) {
     const calldata = viem.encodeFunctionData({
@@ -908,39 +1008,115 @@ class RelayClientWrapper {
       data: calldata
     };
   }
-  /**
-   * 批量执行 Redeem
-   * @param conditionIds 条件 ID 列表
-   * @returns 交易哈希
-   */
-  async redeemBatch(conditionIds) {
-    if (!this.relayClient || !this.initialized) {
-      throw new Error("RelayClient 未初始化");
+  buildMergeTransaction(conditionId, amount) {
+    const calldata = viem.encodeFunctionData({
+      abi: [
+        {
+          name: "mergePositions",
+          type: "function",
+          inputs: [
+            { name: "collateralToken", type: "address" },
+            { name: "parentCollectionId", type: "bytes32" },
+            { name: "conditionId", type: "bytes32" },
+            { name: "partition", type: "uint256[]" },
+            { name: "amount", type: "uint256" }
+          ],
+          outputs: [],
+          stateMutability: "nonpayable"
+        }
+      ],
+      functionName: "mergePositions",
+      args: [
+        USDC_ADDRESS,
+        // collateralToken: USDC
+        viem.zeroHash,
+        // parentCollectionId: Polymarket 场景下为 0
+        conditionId,
+        // conditionId: 市场条件 ID
+        [1n, 2n],
+        // partition: Yes(1) 和 No(2)
+        BigInt(amount)
+        // amount: 要合并的 full set 数量（注意是 USDC 的 6 位精度）
+      ]
+    });
+    return {
+      to: CTF_ADDRESS,
+      value: "0",
+      data: calldata
+    };
+  }
+  addTransaction(type, conditionId, transaction) {
+    return new Promise((resolve, reject) => {
+      this.pendingTransactions.push({
+        type,
+        conditionId,
+        transaction,
+        retryNum: 0,
+        reject,
+        resolve
+      });
+      this.exec();
+      logger.info("RelayClient", `add ${type} transaction:${conditionId}`);
+      logger.info(` - pending: ${this.pendingTransactions.length}`);
+    });
+  }
+  checkSubmit(conditionId) {
+    if (this.resetsTime) {
+      throw Error(
+        `request limit before: ${new Date(this.resetsTime).toLocaleString()}`,
+        { cause: SUBMIT_ERROR_SYMBOL }
+      );
+    }
+    if (this.pendingTransactions.some((pt) => pt.conditionId === conditionId)) {
+      throw Error("duplicate conditionId", { cause: SUBMIT_ERROR_SYMBOL });
     }
-    const transactions = conditionIds.map(
-      (conditionId) => this.buildRedeemTransaction(conditionId)
+  }
+  isSubmitError(error) {
+    return error?.cause === SUBMIT_ERROR_SYMBOL;
+  }
+  async submitRedeem(conditionId) {
+    this.checkSubmit(conditionId);
+    return this.addTransaction(
+      "redeem",
+      conditionId,
+      this.buildRedeemTransaction(conditionId)
     );
-    const response = await this.relayClient.execute(
-      transactions,
-      `Polymarket redeem positions (${transactions.length})`
+  }
+  async submitMerge(conditionId, amount) {
+    this.checkSubmit(conditionId);
+    return this.addTransaction(
+      "merge",
+      conditionId,
+      this.buildMergeTransaction(conditionId, amount)
     );
-    const result = await response.wait();
-    if (!result) {
-      throw new Error(
-        "Redeem 交易失败：wait() 返回空结果（可能被 revert 或 relayer 拒绝）"
-      );
-    }
-    return result.transactionHash;
   }
-  /**
-   * 执行 Redeem（兼容单个）
-   * @param conditionId 条件 ID
-   * @returns 交易哈希
-   */
-  async redeem(conditionId) {
-    return this.redeemBatch([conditionId]);
+  clear() {
+    if (this.postTimeout) {
+      clearTimeout(this.postTimeout);
+    }
   }
 }
+const RPC_URL = "https://polygon-rpc.com";
+function initRelayClient(config) {
+  const account = accounts.privateKeyToAccount(config.privateKey);
+  const walletClient = viem.createWalletClient({
+    account,
+    chain: chains.polygon,
+    transport: viem.http(RPC_URL)
+  });
+  const builderConfig = new builderSigningSdk.BuilderConfig({
+    localBuilderCreds: config.builderCreds
+  });
+  const polyRelayClient = new builderRelayerClient.RelayClient(
+    "https://relayer-v2.polymarket.com",
+    137,
+    walletClient,
+    builderConfig,
+    builderRelayerClient.RelayerTxType.SAFE
+  );
+  logger.success("RelayClient 初始化完成");
+  return new RelayClient({ polyRelayClient });
+}
 class AssetFilter {
   // endTime -> Set<assetId>
   traded = /* @__PURE__ */ new Map();
@@ -1079,42 +1255,80 @@ class OrderWatcher {
     return new Promise((resolve) => setTimeout(resolve, ms));
   }
 }
+function listenEvent(e, eventName, callback) {
+  e.addListener(eventName, callback);
+  return () => e.removeListener(eventName, callback);
+}
 const DATA_API_HOST = "https://data-api.polymarket.com";
-const AUTO_REDEEM_INTERVAL = 5 * 60 * 1e3;
-const MAX_BATCH_SIZE = 5;
-const MAX_MATCH_TIMES = 3;
-class Redeemer {
-  // conditionId -> RedeemRecord
-  records = /* @__PURE__ */ new Map();
-  running = false;
-  mainTimer;
-  restartTimer;
+const AUTO_REDEEM_INTERVAL = 60 * 1e3;
+class Redeemer extends EventEmitter__default.default {
   options;
+  running = false;
+  timer;
+  submitted = /* @__PURE__ */ new Map();
+  unListenRelayClient;
   constructor(options) {
+    super();
     this.options = options;
-  }
-  start(restart) {
-    if (this.running) return;
-    this.running = true;
-    this.mainTimer = setPromiseInterval__default.default(
-      this.autoRedeem.bind(this),
-      AUTO_REDEEM_INTERVAL
+    this.unListenRelayClient = this.listenRelayClient();
+  }
+  listenRelayClient() {
+    const { relayClient } = this.options;
+    const unListenPost = listenEvent(relayClient, "post", ({ redeem }) => {
+      logger.lines(
+        `post redeem（待确认）:`,
+        ...this.toMessages(this.mapSubmittedPositions(redeem))
+      );
+    });
+    const unListenPosted = listenEvent(
+      relayClient,
+      "posted",
+      ({ redeem, error }) => {
+        const failedPositions = this.mapSubmittedPositions(redeem.failed);
+        if (failedPositions.length > 0) {
+          const messages = [
+            `🔴 redeem 失败已放弃（重试超限）: ${failedPositions.length} 个`,
+            ...this.toMessages(failedPositions)
+          ];
+          logger.lines(...messages, error);
+          telegramService.info(messages.join("\n"));
+        }
+      }
     );
-    logger.success(restart ? "自动 redeem 已重启" : "自动 redeem 已启动");
-  }
-  stop() {
-    setPromiseInterval.clearPromiseInterval(this.mainTimer);
-    clearTimeout(this.restartTimer);
-    this.running = false;
-    logger.info("自动 redeem 已停止");
+    const unListenRequestLimit = listenEvent(
+      relayClient,
+      "requestLimit",
+      (requestLimit) => {
+        setPromiseInterval.clearPromiseInterval(this.timer);
+        const limitSeconds = requestLimit / 1e3;
+        logger.warning(`Redeem 限流，${limitSeconds} 秒后重试`);
+        telegramService.warning(`Redeem 限流，${limitSeconds} 秒后重试`);
+      }
+    );
+    const unListenResets = listenEvent(relayClient, "resets", () => {
+      this.running = false;
+      this.start();
+      telegramService.info("AutoRedeem 已重启");
+    });
+    return () => {
+      unListenPost();
+      unListenPosted();
+      unListenRequestLimit();
+      unListenResets();
+    };
   }
-  restart(delayMs) {
-    if (!this.running) return;
-    this.stop();
-    this.restartTimer = setTimeout(() => {
-      this.start(true);
-      telegramService.info("自动 redeem 已重启");
-    }, delayMs);
+  mapSubmittedPositions(conditions) {
+    const positions = [];
+    for (const cId of conditions) {
+      const position = this.submitted.get(cId);
+      if (position) {
+        positions.push(position);
+      } else {
+        logger.error("no submitted failed position", cId);
+        telegramService.error(`no submitted failed position: ${cId}`);
+      }
+    }
+    return positions;
   }
   /**
    * 获取可 Redeem 的仓位
@@ -1151,145 +1365,63 @@ class Redeemer {
     }
     return positions;
   }
-  testRequestLimit(errorMsg) {
-    if (errorMsg.includes("429") || errorMsg.includes("Too Many Requests")) {
-      const match = errorMsg.match(/resets in (\d+) seconds/);
-      return match ? parseInt(match[1]) : 0;
-    }
-    return 0;
-  }
-  toMessages(records, withExecInfo) {
-    return records.map(
-      ({ position, matchedCount, failedCount }) => ` - ${position.slug} ${position.outcome}: ${position.currentValue} USDC${withExecInfo ? ` (成功匹配: ${matchedCount} 失败重试: ${failedCount})` : ""}`
+  toMessages(positions) {
+    return positions.map(
+      (position) => ` - ${position.slug} ${position.outcome}: ${position.currentValue} USDC`
     );
   }
-  /**
-   * 执行一轮 Redeem
-   */
   async autoRedeem() {
     let redeemablePositions;
     try {
       redeemablePositions = await this.fetchRedeemablePositions();
     } catch (error) {
-      const errorMsg = error instanceof Error ? error.message : String(error);
-      logger.error(`自动 redeem: 获取仓位失败: ${errorMsg}`);
+      logger.error("自动 redeem: 获取仓位失败", error);
       return;
     }
-    let requestLimit = 0;
-    const pendingRedeems = [];
-    const failedRedeems = [];
-    const successRedeem = [];
     for (const position of redeemablePositions) {
-      let record = this.records.get(position.conditionId);
-      if (!record) {
-        record = {
-          position,
-          success: false,
-          failedCount: 0,
-          matchedCount: 0
-        };
-        this.records.set(position.conditionId, record);
-      }
-      record.position = position;
-      if (record.success) {
-        record.matchedCount++;
-        if (record.matchedCount === MAX_MATCH_TIMES) {
-          failedRedeems.push(record);
-        }
-      } else if (record.failedCount < MAX_MATCH_TIMES) {
-        const insertIndex = lodash.sortedIndexBy(
-          pendingRedeems,
-          record,
-          "failedCount"
-        );
-        pendingRedeems.splice(insertIndex, 0, record);
-      }
-    }
-    const execRedeems = pendingRedeems.splice(0, MAX_BATCH_SIZE);
-    if (execRedeems.length > 0) {
-      try {
-        const txHash = await this.options.redeemFn(
-          execRedeems.map(({ position }) => position.conditionId)
-        );
-        logger.info(`Redeem 已执行 (批量 ${execRedeems.length}): ${txHash}`);
-        for (const record of execRedeems) record.success = true;
-      } catch (error) {
-        const errorMsg = error instanceof Error ? error.message : String(error);
-        logger.error(
-          `Redeem 批量异常 (批量 ${execRedeems.length}): ${errorMsg}`
-        );
-        requestLimit = this.testRequestLimit(errorMsg);
-        if (requestLimit <= 0) {
-          for (const record of execRedeems) {
-            record.failedCount++;
-            if (record.failedCount >= MAX_MATCH_TIMES) {
-              failedRedeems.push(record);
-            }
+      const conditionId = position.conditionId;
+      if (!this.submitted.has(conditionId)) {
+        const relayClient = this.options.relayClient;
+        relayClient.submitRedeem(conditionId).catch((error) => {
+          if (relayClient.isSubmitError(error)) {
+            logger.error("submitRedeem failed:", conditionId, error);
+            telegramService.error(`submitRedeem failed: ${conditionId}`);
           }
-        }
+        });
       }
+      this.submitted.set(conditionId, position);
     }
-    for (const [conditionId, record] of this.records.entries()) {
+    const successPositions = [];
+    for (const [conditionId, position] of this.submitted.entries()) {
       if (!redeemablePositions.some((p) => p.conditionId === conditionId)) {
-        successRedeem.push(record);
-        this.records.delete(conditionId);
+        successPositions.push(position);
+        this.submitted.delete(conditionId);
       }
     }
-    const messages = [];
-    if (successRedeem.length > 0) {
-      messages.push(
-        "🟢 redeem 成功:",
-        ...this.toMessages(successRedeem, false)
-      );
-    }
-    if (failedRedeems.length > 0) {
-      messages.push(
-        "🔴 redeem 失败:",
-        ...this.toMessages(failedRedeems, false)
-      );
-    }
-    if (messages.length > 0) {
+    if (successPositions.length > 0) {
+      const messages = [
+        `🟢 redeem 成功: ${successPositions.length} 个`,
+        ...this.toMessages(successPositions)
+      ];
+      logger.lines(...messages);
       telegramService.info(messages.join("\n"));
     }
-    const logLines = [];
-    if (execRedeems.length > 0) {
-      logLines.push(
-        `redeem 本轮执行（待确认）: ${execRedeems.length} 个`,
-        ...this.toMessages(execRedeems),
-        ""
-      );
-    }
-    if (pendingRedeems.length > 0) {
-      logLines.push(
-        `redeem 本轮未执行（等待下轮）: ${pendingRedeems.length} 个`,
-        ...this.toMessages(pendingRedeems),
-        ""
-      );
-    }
-    if (successRedeem.length > 0) {
-      logLines.push(
-        `🟢 redeem 成功确认: ${successRedeem.length} 个`,
-        ...this.toMessages(successRedeem),
-        ""
-      );
-    }
-    if (failedRedeems.length > 0) {
-      logLines.push(
-        `🔴 redeem 失败已放弃（重试超限）: ${failedRedeems.length} 个`,
-        ...this.toMessages(failedRedeems),
-        ""
-      );
-    }
-    logLines.push(`redeem 待确认总数: ${this.records.size} 个`);
-    for (const log of logLines) logger.info(log);
-    if (successRedeem.length > 0) {
-      this.options.onRedeemSuccess?.();
-    }
-    if (requestLimit > 0) {
-      logger.warning(`Redeem 限流，${requestLimit} 秒后重试`);
-      telegramService.warning("Redeem 限流", `${requestLimit} 秒后重试`);
-      this.restart(requestLimit * 1e3);
-    }
+    logger.info(`redeem 待确认总数: ${this.submitted.size} 个`);
+    if (successPositions.length > 0) this.emit("redeemed");
+  }
+  start() {
+    if (this.running) return;
+    this.running = true;
+    this.timer = setPromiseInterval__default.default(
+      this.autoRedeem.bind(this),
+      AUTO_REDEEM_INTERVAL
+    );
+  }
+  stop() {
+    setPromiseInterval.clearPromiseInterval(this.timer);
+    this.unListenRelayClient();
+    this.running = false;
+    logger.info("自动 redeem 已停止");
   }
 }
 const POSITION_POLL_INTERVAL = 5e3;
@@ -1305,7 +1437,6 @@ class Trader {
   initialized = false;
   constructor() {
     this.client = new ClobClientWrapper();
-    this.relayClient = new RelayClientWrapper();
     this.assetFilter = new AssetFilter();
     this.balanceCache = new BalanceCache();
     this.orderWatcher = new OrderWatcher();
@@ -1328,7 +1459,7 @@ class Trader {
       builderCreds: config.polymarket.builderCreds
     });
     if (config.polymarket.builderCreds) {
-      this.relayClient.init({
+      this.relayClient = initRelayClient({
         privateKey: config.polymarket.privateKey,
         builderCreds: config.polymarket.builderCreds
       });
@@ -1345,13 +1476,13 @@ class Trader {
     if (!this.config?.polymarket?.builderCreds) {
       return;
     }
-    if (!this.redeemer) {
+    if (!this.redeemer && this.relayClient) {
       this.redeemer = new Redeemer({
         funderAddress: this.config.polymarket.funderAddress,
-        redeemFn: this.executeRedeemBatch.bind(this),
-        onRedeemSuccess: () => {
-          this.balanceCache.invalidate();
-        }
+        relayClient: this.relayClient
+      });
+      this.redeemer.addListener("redeemed", () => {
+        this.balanceCache.invalidate();
       });
       this.redeemer.start();
     }
@@ -1533,7 +1664,7 @@ class Trader {
    * 通知需要 Redeem 兜底
    */
   notifyRedeemFallback(assetId, expectedSize) {
-    if (!this.relayClient.isInitialized()) {
+    if (!this.relayClient) {
       const msg = "仓位同步超时且 Redeem 不可用";
       logger.warning(msg);
       telegramService.warning(
@@ -1563,19 +1694,11 @@ class Trader {
       telegramService.error("卖单提交失败", `错误: ${sellResult.errorMsg}`);
     }
   }
-  /**
-   * 批量执行 Redeem（供 Redeemer 调用）
-   */
-  async executeRedeemBatch(conditionIds) {
-    if (!this.relayClient.isInitialized()) {
-      throw new Error("RelayClient 未初始化");
-    }
-    return this.relayClient.redeemBatch(conditionIds);
-  }
   /**
    * 停止交易模块
    */
   async shutdown() {
+    this.relayClient?.clear();
     this.redeemer?.stop();
     logger.info("交易模块已停止");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polycopy",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "polycopy test",
   "main": "dist/index.js",
   "bin": {
@@ -20,7 +20,7 @@
     "@polymarket/clob-client": "^5.2.0",
     "fs-extra": "^11.3.3",
     "grammy": "^1.39.2",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "set-promise-interval": "^1.1.0",
     "viem": "^2.44.2",
     "log4js": "^6.9.1"