@clonegod/ttd-bsc-common 3.0.15 → 3.0.17

package/dist/trade/abstract_dex_trade.js

@@ -22,14 +22,18 @@ const redis_1 = require("../redis");
 const trade_direction_1 = require("../utils/trade_direction");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 function buildTradeConfig() {
-    const vaultAddress = process.env.VAULT_ADDRESS;
-    if (!vaultAddress) {
-        throw new Error('环境变量 VAULT_ADDRESS 未配置');
+    const vaultGroupId = process.env.TRADE_GROUP_ID;
+    if (!vaultGroupId) {
+        throw new Error('环境变量 TRADE_GROUP_ID 未配置');
+    }
+    const vaultWallet = (0, ttd_core_1.load_wallet)(vaultGroupId, true);
+    if (!vaultWallet.public_key) {
+        throw new Error(`load_wallet(${vaultGroupId}) 未返回 public_key`);
     }
     const pancakeIdName = process.env.PANCAKE_EXECUTOR_ID || 'PANCAKE';
     const uniswapIdName = process.env.UNISWAP_EXECUTOR_ID || 'UNISWAP';
     return {
-        vaultAddress,
+        vaultAddress: vaultWallet.public_key,
         executorIds: {
             pancake: ethers_1.ethers.utils.id(pancakeIdName),
             uniswap: ethers_1.ethers.utils.id(uniswapIdName),

package/dist/trade/check/base_tx_result_checker.js

@@ -44,9 +44,12 @@ class TradeResultSubscriber {
         this.ws = new ttd_core_1.WebSocketClient(wsUrl);
         this.ws.onOpen(() => {
             this.connected = true;
-            const addresses = (process.env.VAULT_ADDRESS || '').split(',').map(a => a.trim()).filter(Boolean);
-            for (const addr of addresses) {
-                this.ws.send(JSON.stringify({ address: addr }));
+            const groupIds = (process.env.TRADE_GROUP_ID || '').split(',').map(s => s.trim()).filter(Boolean);
+            for (const gid of groupIds) {
+                const w = (0, ttd_core_1.load_wallet)(gid, true);
+                if (w.public_key) {
+                    this.ws.send(JSON.stringify({ address: w.public_key }));
+                }
             }
             (0, ttd_core_1.log_info)(`TradeResultSubscriber connected: ${wsUrl}`);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-bsc-common",
-  "version": "3.0.15",
+  "version": "3.0.17",
   "description": "BSC common library",
   "license": "UNLICENSED",
   "main": "dist/index.js",