@clonegod/ttd-bsc-common 3.0.31 → 3.0.33

package/dist/redis/redis_client.d.ts

@@ -17,6 +17,7 @@ export declare class SimpleRedisClient {
     hgetvalue(key: string, field: string): Promise<any>;
     hkeys(key: string): Promise<any>;
     hgetall(key: string): Promise<any>;
+    hmget(key: string, fields: string[]): Promise<(string | null)[]>;
     lrange(key: string, start?: number, stop?: number): Promise<string[]>;
     del(key: string, field?: string): Promise<any>;
 }

package/dist/redis/redis_client.js

@@ -136,6 +136,12 @@ class SimpleRedisClient {
             return yield redisClient.hGetAll(key);
         });
     }
+    hmget(key, fields) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const redisClient = yield this.getRedisClient();
+            return yield redisClient.hmGet(key, fields);
+        });
+    }
     lrange(key_1) {
         return __awaiter(this, arguments, void 0, function* (key, start = 0, stop = -1) {
             const redisClient = yield this.getRedisClient();

package/dist/send-tx/types.d.ts

@@ -1,4 +1,4 @@
 import { TradeTrace } from '../trade/trade_trace';
 export interface ITransactionSender {
-    sendTransaction(signedMainTx: string, eoa_tip_transaction: (eoa_address: string) => Promise<string>, order_trace_id: string, pair?: string, only_bundle?: boolean, trace?: Pick<TradeTrace, 'mark' | 'markProvider'>): Promise<string[]>;
+    sendTransaction(signedMainTx: string, tipTxMap: Map<string, string>, order_trace_id: string, pair?: string, only_bundle?: boolean, trace?: Pick<TradeTrace, 'mark'>): Promise<string[]>;
 }

package/dist/trade/abstract_dex_trade.d.ts

@@ -36,6 +36,6 @@ export declare abstract class AbstractDexTrade extends AbastrcatTrade {
         inputToken: any;
         outputToken: any;
     };
-    protected calculateAmountOutMin(context: TradeContext, inputToken: any, outputToken: any): ethers.BigNumber;
+    protected calculateAmountOutMin(context: TradeContext, _inputToken: any, outputToken: any): ethers.BigNumber;
     private extractNonceFromErrorMsg;
 }

package/dist/trade/abstract_dex_trade.js

@@ -57,6 +57,7 @@ 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");
+const fast_signer_1 = require("../utils/fast_signer");
 const trade_trace_1 = require("./trade_trace");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 function buildTradeConfig() {
@@ -93,6 +94,7 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
     init(transactionSender) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            (0, fast_signer_1.patchEthersV5Signer)();
             this.provider = new ethers_compat_1.ethersCompat.JsonRpcProvider(this.chainConfig.rpcEndpoint);
             if (transactionSender) {
                 this.transactionSender = transactionSender;
@@ -125,6 +127,7 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
             const direction = isBuy ? 'BUY' : 'SELL';
             const { inputToken, outputToken } = this.determineInputOutputTokens(order_msg, pool_info);
             const amountOutMin = this.calculateAmountOutMin(context, inputToken, outputToken);
+            context._precomputed = { inputToken, outputToken, amountOutMin };
             const trace = new trade_trace_1.TradeTrace(order_trace_id, pair, direction);
             trace.set('input', `${amount} ${inputToken.symbol}`);
             trace.set('outputMin', `${ethers_compat_1.ethersCompat.formatUnits(amountOutMin, outputToken.decimals)} ${outputToken.symbol}`);
@@ -188,10 +191,7 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
                     trace.set('gas', realGasPriceGwei);
                     trace.set('tip', transfer_amount_gwei);
                     const only_bundle = order_msg.is_dex_maker;
-                    const eoa_tip_transaction = (eoa_address) => __awaiter(this, void 0, void 0, function* () {
-                        return tipTxMap.get(eoa_address) || (yield this.buildTipTransferTx(eoa_address, transfer_amount_gwei, realGasPriceGwei, tipNonce, caller));
-                    });
-                    yield this.transactionSender.sendTransaction(signedMainTx, eoa_tip_transaction, order_trace_id, pair, only_bundle, trace);
+                    yield this.transactionSender.sendTransaction(signedMainTx, tipTxMap, order_trace_id, pair, only_bundle, trace);
                     trace.mark('sent');
                     trace.flush();
                     try {
@@ -276,7 +276,7 @@ class AbstractDexTrade extends ttd_core_1.AbastrcatTrade {
         const { inputToken, outputToken } = (0, trade_direction_1.resolveTradeDirection)(pool_info, order_msg.isBuy);
         return { inputToken, outputToken };
     }
-    calculateAmountOutMin(context, inputToken, outputToken) {
+    calculateAmountOutMin(context, _inputToken, outputToken) {
         const { price_msg, slippage_bps, order_msg } = context;
         const { isBuy } = order_msg;
         const slippage = slippage_bps / 10000;

package/dist/trade/caller_manager.d.ts

@@ -25,6 +25,4 @@ export declare class CallerManager {
     private getLastUsedRedisKey;
     private getNonce;
     private setNonce;
-    private getCallersSortedByLRU;
-    private updateLastUsed;
 }

package/dist/trade/caller_manager.js

@@ -71,10 +71,31 @@ class CallerManager {
     }
     acquireCaller() {
         return __awaiter(this, void 0, void 0, function* () {
-            const sortedCallers = yield this.getCallersSortedByLRU();
-            const caller = sortedCallers[0];
-            const nonce = yield this.getNonce(caller.address);
-            yield this.updateLastUsed(caller.address);
+            const addresses = this.callers.map(w => w.address.toLowerCase());
+            const lastUsedKey = this.getLastUsedRedisKey();
+            const nonceKey = this.getNonceRedisKey();
+            const [lastUsedData, nonceValues] = yield Promise.all([
+                this.redis.hgetall(lastUsedKey),
+                this.redis.hmget(nonceKey, addresses),
+            ]);
+            let selectedIdx = 0;
+            let minLastUsed = Number.MAX_SAFE_INTEGER;
+            for (let i = 0; i < this.callers.length; i++) {
+                const redisTs = parseInt((lastUsedData === null || lastUsedData === void 0 ? void 0 : lastUsedData[addresses[i]]) || '0', 10);
+                if (redisTs < minLastUsed) {
+                    minLastUsed = redisTs;
+                    selectedIdx = i;
+                }
+            }
+            const caller = this.callers[selectedIdx];
+            const callerAddr = addresses[selectedIdx];
+            const nonceStr = nonceValues[selectedIdx];
+            if (nonceStr === null || nonceStr === undefined) {
+                throw new Error(`Caller ${caller.address} nonce not found in Redis, stream-trade may not be running`);
+            }
+            const nonce = parseInt(nonceStr, 10);
+            this.redis.hsetValue(lastUsedKey, callerAddr, String(Date.now()), 24 * 60 * 60)
+                .catch(err => logger.warn(`updateLastUsed failed: ${err.message}`));
             return { wallet: caller, nonce };
         });
     }
@@ -124,30 +145,5 @@ class CallerManager {
             yield this.redis.hsetValue(nonceKey, address.toLowerCase(), String(nonce), 24 * 60 * 60);
         });
     }
-    getCallersSortedByLRU() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lastUsedKey = this.getLastUsedRedisKey();
-            const lastUsedData = yield this.redis.hgetall(lastUsedKey);
-            const callersWithTime = this.callers.map(caller => {
-                let lastUsedAt = 0;
-                const data = lastUsedData === null || lastUsedData === void 0 ? void 0 : lastUsedData[caller.address.toLowerCase()];
-                if (data) {
-                    try {
-                        lastUsedAt = parseInt(data, 10) || 0;
-                    }
-                    catch (_a) { }
-                }
-                return { caller, lastUsedAt };
-            });
-            callersWithTime.sort((a, b) => a.lastUsedAt - b.lastUsedAt);
-            return callersWithTime.map(item => item.caller);
-        });
-    }
-    updateLastUsed(address) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const lastUsedKey = this.getLastUsedRedisKey();
-            yield this.redis.hsetValue(lastUsedKey, address.toLowerCase(), String(Date.now()), 24 * 60 * 60);
-        });
-    }
 }
 exports.CallerManager = CallerManager;

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

@@ -10,6 +10,10 @@ export declare class TradeResultSubscriber {
     listen(txHash: string, callback: (receipt: any) => void, timeoutMs?: number): void;
     remove(txHash: string): void;
     sendNonceWatch(caller: string, txHash: string): void;
+    private cachedSubscriptions;
+    private cachedClientName;
+    private getSubscriptions;
+    private getClientName;
     private ensureConnected;
 }
 export declare abstract class BaseTxResultChecker extends AbstractTransactionResultCheck {

package/dist/trade/check/base_tx_result_checker.js

@@ -19,6 +19,8 @@ class TradeResultSubscriber {
         this.ws = null;
         this.connected = false;
         this.listeners = new Map();
+        this.cachedSubscriptions = null;
+        this.cachedClientName = null;
     }
     static getInstance() {
         if (!TradeResultSubscriber.instance) {
@@ -43,26 +45,43 @@ class TradeResultSubscriber {
             this.ws.send(JSON.stringify({ type: 'nonceWatch', caller, txHash }));
         }
     }
+    getSubscriptions() {
+        if (this.cachedSubscriptions)
+            return this.cachedSubscriptions;
+        const groupIds = (process.env.TRADE_GROUP_ID || process.env.VAULT_GROUP_ID || '').split(',').map(s => s.trim()).filter(Boolean);
+        const subs = [];
+        for (const gid of groupIds) {
+            const w = (0, ttd_core_1.load_wallet)(gid, true);
+            if (w.public_key) {
+                subs.push({ address: w.public_key, groupId: gid });
+            }
+        }
+        this.cachedSubscriptions = subs;
+        return subs;
+    }
+    getClientName() {
+        if (this.cachedClientName)
+            return this.cachedClientName;
+        this.cachedClientName = process.env.APP_NAME
+            || process.env.name
+            || (process.env.pm_id ? `pm2-${process.env.pm_id}` : null)
+            || `pid-${process.pid}`;
+        return this.cachedClientName;
+    }
     ensureConnected() {
-        if (this.ws && this.connected)
+        if (this.ws)
             return;
         const host = process.env.STREAM_TRADE_WS_HOST || '127.0.0.1';
         const wsUrl = `ws://${host}:${ttd_core_1.SERVICE_PORT.STREAM_TRADE_WS}`;
         this.ws = new ttd_core_1.WebSocketClient(wsUrl);
-        const clientName = process.env.APP_NAME
-            || process.env.name
-            || (process.env.pm_id ? `pm2-${process.env.pm_id}` : null)
-            || `pid-${process.pid}`;
         this.ws.onOpen(() => {
             this.connected = true;
-            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) {
-                    this.ws.send(JSON.stringify({ address: w.public_key, groupId: gid, clientName }));
-                }
+            const subs = this.getSubscriptions();
+            const clientName = this.getClientName();
+            for (const { address, groupId } of subs) {
+                this.ws.send(JSON.stringify({ address, groupId, clientName }));
             }
-            logger.info(`TradeResultSubscriber connected: ${wsUrl}`);
+            logger.info(`TradeResultSubscriber connected: ${wsUrl}, subscribed=${subs.length}`);
         });
         this.ws.onMessage((msg) => {
             if (msg.type !== 'TradeResult' || !msg.data)

package/dist/trade/trade_trace.d.ts

@@ -5,12 +5,11 @@ export declare class TradeTrace {
     private startTime;
     private marks;
     private data;
-    private providers;
     private error;
     constructor(orderId: string, pair?: string, direction?: string);
     mark(name: string): void;
     set(key: string, value: any): void;
-    markProvider(name: string, ok: boolean, error?: string): void;
     markError(stage: string, message: string): void;
+    private buildTimeline;
     flush(): void;
 }

package/dist/trade/trade_trace.js

@@ -10,7 +10,6 @@ class TradeTrace {
         this.direction = direction;
         this.marks = [];
         this.data = {};
-        this.providers = [];
         this.error = null;
         this.startTime = Date.now();
     }
@@ -20,23 +19,28 @@ class TradeTrace {
     set(key, value) {
         this.data[key] = value;
     }
-    markProvider(name, ok, error) {
-        this.providers.push({ name, ok, elapsed: Date.now() - this.startTime, error });
-    }
     markError(stage, message) {
         this.error = { stage, message };
     }
+    buildTimeline() {
+        if (this.marks.length === 0)
+            return 'recv';
+        let prev = 0;
+        const parts = this.marks.map(m => {
+            const delta = m.elapsed - prev;
+            prev = m.elapsed;
+            return `${m.name}(${delta}ms)`;
+        });
+        const total = this.marks[this.marks.length - 1].elapsed;
+        return `recv -> ${parts.join(' -> ')} = ${total}ms`;
+    }
     flush() {
-        const total = Date.now() - this.startTime;
-        const timeline = this.marks.map(m => `${m.name}=${m.elapsed}ms`).join(' | ');
-        const providerStatus = this.providers
-            .map(p => `${p.name}=${p.ok ? '✓' : '✗'}${p.ok ? '' : '(' + (p.error || 'err') + ')'}`)
-            .join(' ');
+        const timeline = this.buildTimeline();
         if (this.error) {
-            logger.info(`[TRADE FAILED] ${this.orderId} | ${this.pair} ${this.direction}`, Object.assign({ timeline, error_stage: this.error.stage, error: this.error.message, total_ms: total }, this.data));
+            logger.info(`[TRADE FAILED] ${this.orderId} | ${this.pair} ${this.direction}`, Object.assign({ timeline, error_stage: this.error.stage, error: this.error.message }, this.data));
         }
         else {
-            logger.info(`[TRADE OK] ${this.orderId} | ${this.pair} ${this.direction}`, Object.assign({ timeline, providers: providerStatus, total_ms: total }, this.data));
+            logger.info(`[TRADE OK] ${this.orderId} | ${this.pair} ${this.direction}`, Object.assign({ timeline }, this.data));
         }
     }
 }

package/dist/utils/fast_signer.d.ts

@@ -0,0 +1 @@
+export declare function patchEthersV5Signer(): boolean;

package/dist/utils/fast_signer.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.patchEthersV5Signer = patchEthersV5Signer;
+let patched = false;
+function patchEthersV5Signer() {
+    if (patched)
+        return true;
+    let secp;
+    try {
+        secp = require('secp256k1');
+    }
+    catch (err) {
+        console.warn('[fast_signer] secp256k1 native module not found, skipping patch', err);
+        return false;
+    }
+    let SigningKey;
+    let arrayify;
+    let hexZeroPad;
+    let splitSignature;
+    try {
+        const signingKeyModule = require('@ethersproject/signing-key');
+        const bytesModule = require('@ethersproject/bytes');
+        SigningKey = signingKeyModule.SigningKey;
+        arrayify = bytesModule.arrayify;
+        hexZeroPad = bytesModule.hexZeroPad;
+        splitSignature = bytesModule.splitSignature;
+    }
+    catch (err) {
+        console.warn('[fast_signer] @ethersproject/signing-key not found, skipping patch', err);
+        return false;
+    }
+    const originalSignDigest = SigningKey.prototype.signDigest;
+    SigningKey.prototype.signDigest = function (digest) {
+        const privKeyBytes = arrayify(this.privateKey);
+        const digestBytes = arrayify(digest);
+        if (digestBytes.length !== 32) {
+            return originalSignDigest.call(this, digest);
+        }
+        try {
+            const { signature, recid } = secp.ecdsaSign(digestBytes, privKeyBytes);
+            const r = hexZeroPad('0x' + Buffer.from(signature.slice(0, 32)).toString('hex'), 32);
+            const s = hexZeroPad('0x' + Buffer.from(signature.slice(32, 64)).toString('hex'), 32);
+            return splitSignature({ recoveryParam: recid, r, s });
+        }
+        catch (err) {
+            console.warn('[fast_signer] native sign failed, fallback to elliptic.js', err);
+            return originalSignDigest.call(this, digest);
+        }
+    };
+    patched = true;
+    console.log('[fast_signer] ethers v5 SigningKey patched with native secp256k1');
+    return true;
+}

package/dist/utils/index.d.ts

@@ -3,6 +3,7 @@ export * from './gas_helper';
 export * from './trade_direction';
 export * from './pool_filter';
 export * from './ethers_compat';
+export * from './fast_signer';
 export declare const sleep: (ms: number) => Promise<void>;
 export declare const formatPrice: (price: number, precision?: number) => string;
 export declare const formatUnits: (value: any, decimals: number) => Decimal;

package/dist/utils/index.js

@@ -24,6 +24,7 @@ __exportStar(require("./gas_helper"), exports);
 __exportStar(require("./trade_direction"), exports);
 __exportStar(require("./pool_filter"), exports);
 __exportStar(require("./ethers_compat"), exports);
+__exportStar(require("./fast_signer"), exports);
 const sleep = (ms) => {
     return new Promise(resolve => setTimeout(resolve, ms));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-bsc-common",
-  "version": "3.0.31",
+  "version": "3.0.33",
   "description": "BSC common library",
   "license": "UNLICENSED",
   "main": "dist/index.js",
@@ -14,14 +14,16 @@
     "push": "npm run build && npm publish"
   },
   "dependencies": {
-    "@clonegod/ttd-core": "3.0.11",
+    "@clonegod/ttd-core": "3.0.12",
     "@clonegod/ttd-bsc-send-tx": "2.0.3",
     "axios": "^1.12.0",
     "dotenv": "^16.4.7",
-    "ethers": "^5.8.0"
+    "ethers": "^5.8.0",
+    "secp256k1": "^5.0.1"
   },
   "devDependencies": {
     "@types/node": "^22.14.0",
+    "@types/secp256k1": "^4.0.6",
     "typescript": "^5.8.2"
   },
   "overrides": {},