@clonegod/ttd-bsc-common 3.0.17 → 3.0.19

package/dist/trade/abstract_dex_trade.d.ts

@@ -21,7 +21,7 @@ export declare abstract class AbstractDexTrade extends AbastrcatTrade {
     protected chainConfig: EvmChainConfig;
     protected redisClient: SimpleRedisClient;
     protected tradeConfig: TradeConfig;
-    protected vaultInterface: ethers.utils.Interface;
+    protected vaultInterface: any;
     protected chainNameLower: string;
     constructor(appConfig: AppConfig);
     protected abstract initConfigs(): void;

package/dist/trade/abstract_dex_trade.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _a, _b, _c, _d, _e;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractDexTrade = void 0;
 exports.buildTradeConfig = buildTradeConfig;
@@ -21,8 +22,15 @@ const ttd_bsc_send_tx_1 = require("@clonegod/ttd-bsc-send-tx");
 const redis_1 = require("../redis");
 const trade_direction_1 = require("../utils/trade_direction");
 const decimal_js_1 = __importDefault(require("decimal.js"));
+const ethersCompat = {
+    Interface: ((_a = ethers_1.ethers.utils) === null || _a === void 0 ? void 0 : _a.Interface) || ethers_1.ethers.Interface,
+    id: ((_b = ethers_1.ethers.utils) === null || _b === void 0 ? void 0 : _b.id) || ethers_1.ethers.id,
+    formatUnits: ((_c = ethers_1.ethers.utils) === null || _c === void 0 ? void 0 : _c.formatUnits) || ethers_1.ethers.formatUnits,
+    parseUnits: ((_d = ethers_1.ethers.utils) === null || _d === void 0 ? void 0 : _d.parseUnits) || ethers_1.ethers.parseUnits,
+    keccak256: ((_e = ethers_1.ethers.utils) === null || _e === void 0 ? void 0 : _e.keccak256) || ethers_1.ethers.keccak256,
+};
 function buildTradeConfig() {
-    const vaultGroupId = process.env.TRADE_GROUP_ID;
+    const vaultGroupId = process.env.TRADE_GROUP_ID || process.env.VAULT_GROUP_ID;
     if (!vaultGroupId) {
         throw new Error('环境变量 TRADE_GROUP_ID 未配置');
     }
@@ -35,8 +43,8 @@ function buildTradeConfig() {
     return {
         vaultAddress: vaultWallet.public_key,
         executorIds: {
-            pancake: ethers_1.ethers.utils.id(pancakeIdName),
-            uniswap: ethers_1.ethers.utils.id(uniswapIdName),
+            pancake: ethersCompat.id(pancakeIdName),
+            uniswap: ethersCompat.id(uniswapIdName),
         },
     };
 }
@@ -50,7 +58,7 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
         this.initConfigs();
         this.chainNameLower = this.appConfig.env_args.chain_id.toLowerCase();
         this.redisClient = new redis_1.SimpleRedisClient(`${this.chainNameLower}:tx`);
-        this.vaultInterface = new ethers_1.ethers.utils.Interface(VAULT_ABI);
+        this.vaultInterface = new ethersCompat.Interface(VAULT_ABI);
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -81,7 +89,7 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
                 pair,
                 direction: isBuy ? 'BUY' : 'SELL',
                 input: `${amount} ${inputToken.symbol}`,
-                outputMin: `${ethers_1.ethers.utils.formatUnits(amountOutMin, outputToken.decimals)} ${outputToken.symbol}`,
+                outputMin: `${ethersCompat.formatUnits(amountOutMin, outputToken.decimals)} ${outputToken.symbol}`,
                 slippage: `${slippage_bps / 100}%`,
             });
             let maxAttempts = Math.min(Math.max(parseInt(process.env.NONCE_LOCK_MAX_RETRIES || '3'), 1), 3);
@@ -115,7 +123,7 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
                         to: this.tradeConfig.vaultAddress,
                         data: vaultCalldata,
                         gasLimit: this.chainConfig.gasOptions.gasLimit,
-                        gasPrice: ethers_1.ethers.utils.parseUnits(realGasPriceGwei, 'gwei'),
+                        gasPrice: ethersCompat.parseUnits(realGasPriceGwei, 'gwei'),
                         nonce,
                         chainId: this.chainConfig.chainId,
                         value: 0,
@@ -129,7 +137,7 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
                         caller.signTransaction(mainTx),
                         ...builderAddresses.map(addr => this.buildTipTransferTx(addr, transfer_amount_gwei, realGasPriceGwei, tipNonce, caller)),
                     ]);
-                    txid = ethers_1.ethers.utils.keccak256(signedMainTx);
+                    txid = ethersCompat.keccak256(signedMainTx);
                     const tipTxMap = new Map();
                     builderAddresses.forEach((addr, idx) => tipTxMap.set(addr, signedTips[idx]));
                     (0, ttd_core_1.log_info)(`交易已签名`, { txid, nonce, caller: caller.address, gasPriceGwei: realGasPriceGwei }, order_trace_id);
@@ -195,9 +203,9 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
             const tx_data = {
                 from: wallet.address,
                 to,
-                value: ethers_1.ethers.utils.parseUnits(real_transfer_amount_gwei, 'gwei'),
+                value: ethersCompat.parseUnits(real_transfer_amount_gwei, 'gwei'),
                 gasLimit: 42000,
-                gasPrice: ethers_1.ethers.utils.parseUnits(real_gas_price_gwei, 'gwei'),
+                gasPrice: ethersCompat.parseUnits(real_gas_price_gwei, 'gwei'),
                 nonce,
                 chainId: this.chainConfig.chainId
             };
@@ -205,7 +213,7 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
             (0, ttd_core_1.log_info)(`构建 tip 转账交易`, {
                 to, nonce,
                 tipGwei: real_transfer_amount_gwei,
-                txhash: ethers_1.ethers.utils.keccak256(signedTx)
+                txhash: ethersCompat.keccak256(signedTx)
             });
             return signedTx;
         });
@@ -229,7 +237,7 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
             expectedOut = inputAmount.mul(price);
         }
         const minOutput = expectedOut.mul(new decimal_js_1.default(1).sub(new decimal_js_1.default(slippage)));
-        return ethers_1.ethers.utils.parseUnits(minOutput.toFixed(outputToken.decimals), outputToken.decimals);
+        return ethersCompat.parseUnits(minOutput.toFixed(outputToken.decimals), outputToken.decimals);
     }
     extractNonceFromErrorMsg(errorMessage) {
         try {

package/dist/trade/check/base_tx_result_checker.js

@@ -44,7 +44,7 @@ class TradeResultSubscriber {
         this.ws = new ttd_core_1.WebSocketClient(wsUrl);
         this.ws.onOpen(() => {
             this.connected = true;
-            const groupIds = (process.env.TRADE_GROUP_ID || '').split(',').map(s => s.trim()).filter(Boolean);
+            const groupIds = (process.env.TRADE_GROUP_ID || process.env.VAULT_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) {

package/package.json

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