@clonegod/ttd-bsc-common 3.1.22 → 3.1.24

package/dist/config/bsc_dex_env_args.d.ts

@@ -0,0 +1,5 @@
+import { BscEnvArgs } from './bsc_env_args';
+export declare class BscDexEnvArgs extends BscEnvArgs {
+    constructor();
+    print(moduleName?: string): void;
+}

package/dist/config/bsc_dex_env_args.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BscDexEnvArgs = void 0;
+const dist_1 = require("@clonegod/ttd-core/dist");
+const bsc_env_args_1 = require("./bsc_env_args");
+class BscDexEnvArgs extends bsc_env_args_1.BscEnvArgs {
+    constructor() {
+        super();
+        const cfg = this._cfg;
+        this.app_name = (cfg.app_name || '').toLowerCase();
+        this.chain_id = (cfg.chain_id || '').toUpperCase();
+        this.dex_id = (cfg.dex_id || '').toUpperCase();
+        this.server_id = cfg.server_id ?? '';
+        this.redis_host = cfg.redis_host;
+        this.redis_port = String(cfg.redis_port);
+        this.rpc_endpoint = cfg.rpc_endpoint;
+        this.ws_endpoint = cfg.ws_endpoint;
+        this.group_id = cfg.group_id ?? '';
+        this.trade_group_id = cfg.trade_group_id;
+        this.quote_pair = cfg.quote_pair;
+        this.quote_pool_address = cfg.quote_pool_address;
+        this.quote_pool_name = cfg.quote_pool_name;
+        this.quote_pool_fee_rate = cfg.quote_pool_fee_rate;
+        this.quote_amount_usd = cfg.quote_amount_usd;
+        this.wallet_dir = cfg.wallet_dir;
+        this.encryption_key = cfg.encryption_key ?? '';
+        this.server_ip_list = cfg.server_ip_list ?? '';
+        this.ip_exclude_prefix = cfg.ip_exclude_prefix ?? '';
+        this.alert_analyze_host = cfg.alert_analyze_host ?? '';
+        this.alert_flush_size = cfg.alert_flush_size;
+        this.alert_flush_ms = cfg.alert_flush_ms;
+        this.alert_dedup_window_ms = cfg.alert_dedup_window_ms;
+        this.namespace = cfg.namespace ?? '';
+        this.trade_analyze_host = cfg.trade_analyze_host ?? '';
+        this.gas_price_gwei = cfg.gas_price_gwei;
+        this.gas_limit = cfg.gas_limit;
+        this.tip_amount_gwei = cfg.tip_amount_gwei;
+        this.pancake_executor_id = cfg.pancake_executor_id;
+        this.uniswap_executor_id = cfg.uniswap_executor_id;
+        this.caller_select_strategy = cfg.caller_select_strategy;
+        this.send_tx_blockrazor_bundle = cfg.send_tx_blockrazor_bundle;
+        this.send_tx_48club_bundle = cfg.send_tx_48club_bundle;
+        this.send_tx_48club_bundle_ws = cfg.send_tx_48club_bundle_ws;
+        this.send_tx_blox_bundle_ws = cfg.send_tx_blox_bundle_ws;
+        this.send_tx_ws_host = cfg.send_tx_ws_host;
+        this.stream_quote_ws_host = cfg.stream_quote_ws_host;
+        this.min_quote_interval_ms = cfg.min_quote_interval_ms;
+        this.skip_price_feed_yynode = cfg.skip_price_feed_yynode;
+        this.push_price_feed = cfg.push_price_feed;
+        this.trade_parse_fetch_block_time = cfg.trade_parse_fetch_block_time;
+        this.tick_cache_neighboring_words = cfg.tick_cache_neighboring_words;
+        this.tick_cache_ttl = cfg.tick_cache_ttl;
+        this.tick_cache_min_update_interval = cfg.tick_cache_min_update_interval;
+    }
+    print(moduleName) {
+        (0, dist_1.printEnvConfig)(moduleName || this.app_name || 'bsc-dex', this);
+    }
+}
+exports.BscDexEnvArgs = BscDexEnvArgs;

package/dist/config/bsc_env_args.js

@@ -75,73 +75,6 @@ const constants_1 = require("../common/constants");
 class BscEnvArgs extends ttd_core_1.EnvArgs {
     constructor() {
         super();
-        this.gas_price_gwei = this._cfg.gas_price_gwei;
-        this.gas_limit = this._cfg.gas_limit;
-        this.tip_amount_gwei = this._cfg.tip_amount_gwei;
-        this.pancake_executor_id = this._cfg.pancake_executor_id;
-        this.uniswap_executor_id = this._cfg.uniswap_executor_id;
-        this.caller_select_strategy = this._cfg.caller_select_strategy;
-        this.send_tx_blockrazor_bundle = this._cfg.send_tx_blockrazor_bundle;
-        this.send_tx_48club_bundle = this._cfg.send_tx_48club_bundle;
-        this.send_tx_48club_bundle_ws = this._cfg.send_tx_48club_bundle_ws;
-        this.send_tx_blox_bundle_ws = this._cfg.send_tx_blox_bundle_ws;
-        this.stream_quote_ws_host = this._cfg.stream_quote_ws_host;
-        this.min_quote_interval_ms = this._cfg.min_quote_interval_ms;
-        this.skip_price_feed_yynode = this._cfg.skip_price_feed_yynode;
-        this.push_price_feed = this._cfg.push_price_feed;
-        this.trade_parse_fetch_block_time = this._cfg.trade_parse_fetch_block_time;
-        this.tick_cache_neighboring_words = this._cfg.tick_cache_neighboring_words;
-        this.tick_cache_ttl = this._cfg.tick_cache_ttl;
-        this.tick_cache_min_update_interval = this._cfg.tick_cache_min_update_interval;
-        this.ws_push_enable = this._cfg.ws_push_enable;
-        this.print_event_data = this._cfg.print_event_data;
-        this.pool_sync_interval_ms = this._cfg.pool_sync_interval_ms;
-        this.redis_sync_pool_enable = this._cfg.redis_sync_pool_enable;
-        this.redis_url = this._cfg.redis_url;
-        this.skip_pool_list = this._cfg.skip_pool_list;
-        this.price_feed_skip_dup = this._cfg.price_feed_skip_dup;
-        this.trade_analyze_port = this._cfg.trade_analyze_port;
-        this.log_max_size_mb = this._cfg.log_max_size_mb;
-        this.log_check_interval_min = this._cfg.log_check_interval_min;
-        this.log_dir = this._cfg.log_dir;
-        this.chain_name = this._cfg.chain_name;
-        this.caller_balance_check_interval = this._cfg.caller_balance_check_interval;
-        this.caller_balance_low_threshold = this._cfg.caller_balance_low_threshold;
-        this.caller_balance_empty_threshold = this._cfg.caller_balance_empty_threshold;
-        this.send_tx_ws_host = this._cfg.send_tx_ws_host;
-        this.send_tx_48club_ws = this._cfg.send_tx_48club_ws;
-        this.send_tx_bloxroute_ws = this._cfg.send_tx_bloxroute_ws;
-        this.send_tx_default_rpc = this._cfg.send_tx_default_rpc;
-        this.send_tx_blockrazor_private = this._cfg.send_tx_blockrazor_private;
-        this.send_tx_48club_private = this._cfg.send_tx_48club_private;
-        this.bsc_rpc_endpoint = this._cfg.bsc_rpc_endpoint;
-        this.bloxroute_ws_url = this._cfg.bloxroute_ws_url;
-        this.blox_auth_key = this._cfg.blox_auth_key;
-        this._48club_ws_url = this._cfg._48club_ws_url;
-        this._48club_rpc_url = this._cfg._48club_rpc_url;
-        this._48club_sp_wallet_id = this._cfg._48club_sp_wallet_id;
-        this.blockrazor_rpc_url = this._cfg.blockrazor_rpc_url;
-        this.blockrazor_auth_token = this._cfg.blockrazor_auth_token;
-        this.gecko_network = (this._cfg.gecko_network || this.chain_id || 'bsc').toLowerCase();
-        this.chain_id_num = this._cfg.chain_id_num;
-        this.native_token_symbol = this._cfg.native_token_symbol;
-        this.native_token_address = this._cfg.native_token_address;
-        this.wrapped_native_address = this._cfg.wrapped_native_address;
-        this.sync_pool_interval_ms = this._cfg.sync_pool_interval_ms;
-        this.fetch_api_wait_ms = this._cfg.fetch_api_wait_ms;
-        this.fetch_min_tvl = this._cfg.fetch_min_tvl;
-        this.fetch_min_vol = this._cfg.fetch_min_vol;
-        this.pool_default_tvl = this._cfg.pool_default_tvl;
-        this.fetch_max_page_no = this._cfg.fetch_max_page_no;
-        this.token_batch_size = this._cfg.token_batch_size;
-        this.fetch_on_startup = this._cfg.fetch_on_startup;
-        this.vault_mgt_rpc_url = this._cfg.vault_mgt_rpc_url;
-        this.vault_mgt_chain_id = this._cfg.vault_mgt_chain_id;
-        this.vault_mgt_chain_name = this._cfg.vault_mgt_chain_name;
-        this.vault_mgt_vault_groups = this._cfg.vault_mgt_vault_groups;
-        this.vault_mgt_native_symbol = this._cfg.vault_mgt_native_symbol;
-        this.vault_mgt_wrapped_native_address = this._cfg.vault_mgt_wrapped_native_address;
-        this.vault_mgt_fund_caller_max = this._cfg.vault_mgt_fund_caller_max;
     }
 }
 exports.BscEnvArgs = BscEnvArgs;

package/dist/config/index.d.ts

@@ -1,2 +1,3 @@
 export * from './bsc_env_args';
+export * from './bsc_dex_env_args';
 export * from './BscQuoteAppConfig';

package/dist/config/index.js

@@ -15,4 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./bsc_env_args"), exports);
+__exportStar(require("./bsc_dex_env_args"), exports);
 __exportStar(require("./BscQuoteAppConfig"), exports);

package/dist/quote/pricing/index.d.ts

@@ -1,4 +1,3 @@
-export * from './token_price_cache';
 export * from './pool';
 export * from './sdk_token_factory';
 export * from './pool_state_initializer';

package/dist/quote/pricing/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./token_price_cache"), exports);
 __exportStar(require("./pool"), exports);
 __exportStar(require("./sdk_token_factory"), exports);
 __exportStar(require("./pool_state_initializer"), exports);

package/dist/quote/pricing/token_price_cache.d.ts

@@ -1,6 +1,4 @@
 export declare class TokenPriceCache {
-    private tokenPriceCache;
-    private readonly PRICE_CACHE_TIMEOUT_MILLS;
     constructor();
     getTokenPrice(tokenAddress: string): Promise<{
         price: string;

package/dist/quote/pricing/token_price_cache.js

@@ -3,27 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TokenPriceCache = void 0;
 const ttd_core_1 = require("@clonegod/ttd-core");
 class TokenPriceCache {
-    constructor() {
-        this.tokenPriceCache = new Map();
-        this.PRICE_CACHE_TIMEOUT_MILLS = parseInt(process.env.PRICE_CACHE_TIMEOUT_MILLS || Number(1000 * 60 * 60 * 1).toString());
-        (0, ttd_core_1.log_info)(`代币价格缓存超时时间: ${this.PRICE_CACHE_TIMEOUT_MILLS} ms`);
-    }
+    constructor() { }
     async getTokenPrice(tokenAddress) {
-        tokenAddress = tokenAddress.toLowerCase();
-        const now = Date.now();
-        const cachedData = this.tokenPriceCache.get(tokenAddress);
-        if (cachedData && (now - cachedData.timestamp) < this.PRICE_CACHE_TIMEOUT_MILLS) {
-            (0, ttd_core_1.log_debug)(`use cached token price: ${tokenAddress}, price: ${cachedData.price}`, '');
-            return cachedData;
-        }
-        const priceMap = await (0, ttd_core_1.get_bsc_token_price_info)([tokenAddress]);
-        const tokenPrice = priceMap.get(tokenAddress);
-        if (!tokenPrice || !tokenPrice.price || Number(tokenPrice.price) <= 0) {
-            throw new Error(`无法获取代币 ${tokenAddress} 的有效USD价格`);
+        const addr = tokenAddress.toLowerCase();
+        const priceMap = await (0, ttd_core_1.get_bsc_token_price_info)([addr]);
+        const tp = priceMap.get(addr);
+        if (!tp?.price || Number(tp.price) <= 0) {
+            throw new Error(`无法获取代币 ${addr} 的有效USD价格`);
         }
-        const newPrice = { price: tokenPrice.price, timestamp: now };
-        this.tokenPriceCache.set(tokenAddress, newPrice);
-        return newPrice;
+        return { price: tp.price, timestamp: Date.now() };
     }
 }
 exports.TokenPriceCache = TokenPriceCache;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-bsc-common",
-  "version": "3.1.22",
+  "version": "3.1.24",
   "description": "BSC common library",
   "license": "UNLICENSED",
   "main": "dist/index.js",
@@ -14,7 +14,7 @@
     "push": "npm run build && npm publish"
   },
   "dependencies": {
-    "@clonegod/ttd-core": "3.1.21",
+    "@clonegod/ttd-core": "3.1.25",
     "axios": "1.15.0",
     "dotenv": "^16.4.7",
     "ethers": "^5.8.0",

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

@@ -1,28 +0,0 @@
-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 cachedSubscriptions;
-    private cachedClientName;
-    private getSubscriptions;
-    private getClientName;
-    private ensureConnected;
-}
-export declare abstract class BaseTxResultChecker extends AbstractTransactionResultCheck {
-    protected provider: any;
-    constructor(env_args: EnvArgs, event_emitter: EventEmitter);
-    protected abstract createParser(): {
-        parseTransaction(txReceipt: any, poolInfo: any): Promise<any>;
-    };
-    check_tx_result_interval(): Promise<void>;
-    on_subscibe_transaction(): Promise<void>;
-    private processTransactionResult;
-}

package/dist/trade/check/base_tx_result_checker.js

@@ -1,169 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseTxResultChecker = exports.TradeResultSubscriber = void 0;
-const ttd_core_1 = require("@clonegod/ttd-core");
-const logger = (0, ttd_core_1.createLogger)(__filename);
-const trade_1 = require("@clonegod/ttd-core/dist/trade");
-const ethers_compat_1 = require("../../utils/ethers_compat");
-class TradeResultSubscriber {
-    constructor() {
-        this.ws = null;
-        this.connected = false;
-        this.listeners = new Map();
-        this.cachedSubscriptions = null;
-        this.cachedClientName = null;
-    }
-    static getInstance() {
-        if (!TradeResultSubscriber.instance) {
-            TradeResultSubscriber.instance = new TradeResultSubscriber();
-        }
-        return TradeResultSubscriber.instance;
-    }
-    listen(txHash, callback, timeoutMs = 30000) {
-        const key = txHash.toLowerCase();
-        this.listeners.set(key, callback);
-        setTimeout(() => {
-            this.listeners.delete(key);
-        }, timeoutMs);
-        this.ensureConnected();
-    }
-    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 }));
-        }
-    }
-    getSubscriptions() {
-        if (this.cachedSubscriptions)
-            return this.cachedSubscriptions;
-        const groupIds = ((0, ttd_core_1.getCoreEnv)()?.trade_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)
-            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);
-        this.ws.onOpen(() => {
-            this.connected = true;
-            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}, subscribed=${subs.length}`);
-        });
-        this.ws.onMessage((msg) => {
-            if (msg.type !== 'TradeResult' || !msg.data)
-                return;
-            const { txHash, receipt } = msg.data;
-            if (!txHash || !receipt)
-                return;
-            const key = txHash.toLowerCase();
-            const callback = this.listeners.get(key);
-            if (callback) {
-                this.listeners.delete(key);
-                callback(receipt);
-            }
-        });
-        this.ws.connect();
-    }
-}
-exports.TradeResultSubscriber = TradeResultSubscriber;
-TradeResultSubscriber.instance = null;
-class BaseTxResultChecker extends trade_1.AbstractTransactionResultCheck {
-    constructor(env_args, event_emitter) {
-        super(env_args, event_emitter);
-        this.provider = new ethers_compat_1.ethersCompat.JsonRpcProvider(this.env_args.rpc_endpoint);
-    }
-    async check_tx_result_interval() {
-        const check_start_time = Date.now();
-        const check_interval = parseInt(process.env.CHECK_TX_RESULT_INTERVAL_MILLS || '3000');
-        const check_timeout = parseInt(process.env.CHECK_TX_RESULT_TIMEOUT_MILLS || '15000');
-        if (check_interval >= check_timeout)
-            return;
-        const intervalId = setInterval(async () => {
-            this.check_count += 1;
-            logger.info(`check transaction start: seq=[${this.check_count}], txhash=${this.txid}, trace_id=${this.trace_id}`);
-            try {
-                if (Date.now() - check_start_time < check_timeout) {
-                    let txReceipt = await this.provider.getTransactionReceipt(this.txid);
-                    if (!txReceipt)
-                        return;
-                    logger.info(`Received transaction result via polling: ${this.txid}`);
-                    clearInterval(intervalId);
-                    await this.processTransactionResult(txReceipt, 'interval');
-                }
-                else {
-                    clearInterval(intervalId);
-                }
-            }
-            catch (err) {
-                clearInterval(intervalId);
-                logger.error('parse transaction error!', err);
-            }
-        }, check_interval);
-        this.intervalId = intervalId;
-    }
-    async on_subscibe_transaction() {
-        logger.info(`Subscribing trade result, txid=${this.txid}`);
-        TradeResultSubscriber.getInstance().listen(this.txid, (receipt) => {
-            logger.info(`Received transaction result via stream-trade: ${this.txid}`);
-            this.processTransactionResult(receipt, 'websocket')
-                .catch(err => logger.error(`Error processing trade result: ${this.txid}`, err));
-        });
-    }
-    async processTransactionResult(txReceipt, source) {
-        if (ttd_core_1.LOG.debug) {
-            (0, ttd_core_1.writeFile)(`./dist/tx_receipt_${this.txid}_${source}.json`, JSON.stringify(txReceipt, null, 2));
-        }
-        if (this.trade_result_already_processed) {
-            logger.info(`trade_result_already_processed, ignore result from ${source}`);
-            return;
-        }
-        const parser = this.createParser();
-        const swap_detail = await parser.parseTransaction(txReceipt, this.pool_info);
-        let trade_result = this.map_swap_result_to_tx_result(swap_detail);
-        this.trade_result_already_processed = true;
-        if (this.intervalId) {
-            clearInterval(this.intervalId);
-            this.intervalId = null;
-        }
-        if (trade_result.success) {
-            this.event_emitter.emit(ttd_core_1.TRANSACTION_STATE_SUCCESS, trade_result);
-        }
-        else {
-            this.event_emitter.emit(ttd_core_1.TRANSACTION_STATE_FAILED, trade_result);
-        }
-        if (source === 'interval') {
-            console.log('--------------------- Transaction Result from Polling ---------------------');
-        }
-        else {
-            console.log('===================== Transaction Result from stream-trade =====================');
-        }
-        console.log(JSON.stringify(trade_result, null, 2));
-        console.log('-----------------------------------------------------------------------------');
-    }
-}
-exports.BaseTxResultChecker = BaseTxResultChecker;