@clonegod/ttd-bsc-common 3.0.27 → 3.0.29

package/dist/trade/abstract_dex_trade.d.ts

@@ -28,6 +28,7 @@ export declare abstract class AbstractDexTrade extends AbastrcatTrade {
     abstract encodeTradeData(context: TradeContext): TradeCalldata;
     init(transactionSender?: ITransactionSender): Promise<void>;
     execute(context: TradeContext): Promise<string>;
+    private scanCallerFiles;
     protected getGasPriceGwei(context: TradeContext): string;
     protected getBuilderTipAmoutGwei(context: TradeContext): string;
     protected buildTipTransferTx(to: string, transfer_amount_gwei: string, gas_price_gwei: string, nonce: number, wallet: ethers.Wallet): Promise<string>;

package/dist/trade/abstract_dex_trade.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -15,8 +48,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractDexTrade = void 0;
 exports.buildTradeConfig = buildTradeConfig;
 const ttd_core_1 = require("@clonegod/ttd-core");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
 const caller_manager_1 = require("./caller_manager");
 const send_tx_1 = require("../send-tx");
+const base_tx_result_checker_1 = require("./check/base_tx_result_checker");
 const redis_1 = require("../redis");
 const trade_direction_1 = require("../utils/trade_direction");
 const ethers_compat_1 = require("../utils/ethers_compat");
@@ -54,12 +90,19 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
     }
     init(transactionSender) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             this.provider = new ethers_compat_1.ethersCompat.JsonRpcProvider(this.chainConfig.rpcEndpoint);
             if (transactionSender) {
                 this.transactionSender = transactionSender;
             }
-            const defaultCallerId = `${this.chainNameLower.toUpperCase()}-CALLER`;
-            const callerGroupIds = (process.env.CALLER_GROUP_IDS || defaultCallerId).trim().split(',').filter(Boolean);
+            const groupId = (_b = (_a = this.appConfig.trade_runtime) === null || _a === void 0 ? void 0 : _a.group) === null || _b === void 0 ? void 0 : _b.id;
+            if (!groupId) {
+                throw new Error('trade_runtime.group.id 未初始化，请确保 init_trade_runtime() 已调用');
+            }
+            const callerGroupIds = this.scanCallerFiles(groupId);
+            if (callerGroupIds.length === 0) {
+                throw new Error(`未找到分组 ${groupId} 的 Caller 钱包文件（${groupId}-CALLER-*.json）`);
+            }
             this.callerManager = new caller_manager_1.CallerManager({
                 chainName: this.chainNameLower,
                 provider: this.provider,
@@ -114,7 +157,6 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
                     const transfer_amount_gwei = this.getBuilderTipAmoutGwei(context);
                     context.ui_tip_amount = new decimal_js_1.default(transfer_amount_gwei).div(Math.pow(10, 9)).toNumber();
                     const mainTx = {
-                        type: 0,
                         to: this.tradeConfig.vaultAddress,
                         data: vaultCalldata,
                         gasLimit: this.chainConfig.gasOptions.gasLimit,
@@ -148,6 +190,10 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
                         pair, direction: isBuy ? 'BUY' : 'SELL',
                         txid, attempt: i, caller: caller.address
                     }, order_trace_id);
+                    try {
+                        base_tx_result_checker_1.TradeResultSubscriber.getInstance().sendNonceWatch(caller.address, txid);
+                    }
+                    catch (_b) { }
                     return txid;
                 }
                 catch (error) {
@@ -180,6 +226,14 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
             return txid;
         });
     }
+    scanCallerFiles(groupId) {
+        const walletDir = process.env.WALLET_DIR || path.join((0, ttd_core_1.home_dir)(), 'data', 'keypairs');
+        const prefix = `${groupId}-CALLER-`;
+        const files = fs.readdirSync(walletDir)
+            .filter(f => f.startsWith(prefix) && f.endsWith('.json'))
+            .sort();
+        return files.map(f => f.replace('.json', ''));
+    }
     getGasPriceGwei(context) {
         let { evm_gas_price_gwei } = context.trade_runtime.settings.strategy;
         if (!evm_gas_price_gwei || evm_gas_price_gwei <= 0) {
@@ -199,8 +253,6 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
             const real_transfer_amount_gwei = Math.min(Number(transfer_amount_gwei), this.chainConfig.gasOptions.maxTipAmountGwei).toString();
             const real_gas_price_gwei = Math.min(Number(gas_price_gwei), this.chainConfig.gasOptions.maxGasPriceGwei).toString();
             const tx_data = {
-                type: 0,
-                from: wallet.address,
                 to,
                 value: ethers_compat_1.ethersCompat.parseUnits(real_transfer_amount_gwei, 'gwei'),
                 gasLimit: 21000,

package/dist/trade/check/base_tx_result_checker.d.ts

@@ -1,6 +1,17 @@
 import { EnvArgs } from '@clonegod/ttd-core';
 import { AbstractTransactionResultCheck } from "@clonegod/ttd-core/dist/trade";
 import { EventEmitter } from 'events';
+export declare class TradeResultSubscriber {
+    private static instance;
+    private ws;
+    private connected;
+    private listeners;
+    static getInstance(): TradeResultSubscriber;
+    listen(txHash: string, callback: (receipt: any) => void, timeoutMs?: number): void;
+    remove(txHash: string): void;
+    sendNonceWatch(caller: string, txHash: string): void;
+    private ensureConnected;
+}
 export declare abstract class BaseTxResultChecker extends AbstractTransactionResultCheck {
     protected provider: any;
     constructor(env_args: EnvArgs, event_emitter: EventEmitter);

package/dist/trade/check/base_tx_result_checker.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseTxResultChecker = void 0;
+exports.BaseTxResultChecker = exports.TradeResultSubscriber = void 0;
 const ttd_core_1 = require("@clonegod/ttd-core");
 const trade_1 = require("@clonegod/ttd-core/dist/trade");
 const ethers_compat_1 = require("../../utils/ethers_compat");
@@ -36,6 +36,12 @@ class TradeResultSubscriber {
     remove(txHash) {
         this.listeners.delete(txHash.toLowerCase());
     }
+    sendNonceWatch(caller, txHash) {
+        this.ensureConnected();
+        if (this.ws && this.connected) {
+            this.ws.send(JSON.stringify({ type: 'nonceWatch', caller, txHash }));
+        }
+    }
     ensureConnected() {
         if (this.ws && this.connected)
             return;
@@ -69,6 +75,7 @@ class TradeResultSubscriber {
         this.ws.connect();
     }
 }
+exports.TradeResultSubscriber = TradeResultSubscriber;
 TradeResultSubscriber.instance = null;
 class BaseTxResultChecker extends trade_1.AbstractTransactionResultCheck {
     constructor(env_args, event_emitter) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-bsc-common",
-  "version": "3.0.27",
+  "version": "3.0.29",
   "description": "BSC common library",
   "license": "UNLICENSED",
   "main": "dist/index.js",
@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@clonegod/ttd-core": "3.0.8",
+    "@clonegod/ttd-bsc-send-tx": "2.0.3",
     "axios": "^1.12.0",
     "dotenv": "^16.4.7",
     "ethers": "^5.8.0"