@clonegod/ttd-core 3.1.37 → 3.1.38

package/dist/appconfig/EnvArgs.d.ts

@@ -31,7 +31,6 @@ export declare class EnvArgs {
     trade_log_report_cex_url: string;
     trade_log_report_cex_data_type: string;
     token_price_refresh_interval_seconds: number;
-    token_market_price_url: string;
     wallet_dir: string;
     encryption_key: string;
     providers_file_path: string;

package/dist/appconfig/env_registry.js

@@ -44,7 +44,6 @@ registerEnvVars({
     trade_analyze_url: { env: 'TRADE_ANALYZE_URL', type: 'string', default: '', desc: 'analyze HTTP 基址（旧 EnvArgs；未配则 analyze 上报走默认拼接）' },
     providers_file_path: { env: 'PROVIDERS_FILE_PATH', type: 'string', default: '', desc: 'stream-quote providers.json 绝对路径；留空则仅写 Redis' },
     token_price_refresh_interval_seconds: { env: 'TOKEN_PRICE_REFRESH_INTERVAL_SECONDS', type: 'number', default: 600, desc: 'TokenPriceSyncer 刷价周期(s)：market-data 通过 force_fetch 拉外部价（DefiLlama→Gecko→...）并直接批量写入 Redis + 发 TOKEN_CONFIG_CHANGE 事件的频率' },
-    token_market_price_url: { env: 'TOKEN_MARKET_PRICE_URL', type: 'string', default: '', desc: '【使用方: ttd-core estimate_token_amount】config-center 市价估算 HTTP 基址；为空则跳过远程回退' },
     fixed_symbol_address_file: { env: 'FIXED_SYMBOL_ADDRESS_FILE', type: 'string', default: '', desc: '固定 symbol/address 映射文件路径（覆盖默认按 CHAIN_ID 推断的路径）' },
     zh_pinyin_map_file: { env: 'ZH_PINYIN_MAP_FILE', type: 'string', default: '', desc: '中文拼音映射文件路径（覆盖默认路径）' },
     server_ip_list: { env: 'SERVER_IP_LIST', type: 'string', default: '', desc: '服务器可用 IP 列表（逗号分隔）；配置后优先使用；为空则从网卡探测并结合 IP_EXCLUDE_PREFIX 过滤' },

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import BN from 'bn.js';
 import Decimal from 'decimal.js';
 import fs from "fs";
-import { ArbCache, StandardPoolInfoType, StandardTokenInfoType, TokenPriceWithAmountType, TradeResponseType, UniqueOrderbookIdType, WalletInfoType } from '../types';
+import { StandardPoolInfoType, StandardTokenInfoType, TokenPriceWithAmountType, TradeResponseType, UniqueOrderbookIdType, WalletInfoType } from '../types';
 import * as redis from './redis';
 import * as cache from './cache';
 export * from './analyze';
@@ -9,7 +9,6 @@ export * from './appconfig';
 export * from './redis';
 export * from './cache';
 export * from './constants';
-export * from './market_price';
 export * from './pool';
 export * from './quote';
 export * from './token';
@@ -117,7 +116,6 @@ export declare enum OnChainDataSubscribeType {
 export declare enum CACHE_KEY_TYPE {
     CONFIG_TOKEN_LIST = "c:token",
     CONFIG_POOL_LIST = "c:pool",
-    CONFIG_PAIR_LIST = "c:pair",
     CONFIG_TRADE_SERVICE = "c:trade",
     QUOTE_PRICE = "q:price",
     ORDER_MESSAGE = "o:msg",
@@ -130,7 +128,8 @@ export declare enum LOCAL_EVENT_NAME {
     EVENT_WALLET_TRANSACTION = "EVENT_WALLET_TRANSACTION",
     EVENT_WALLET_TRANSACTION_NEW_TXID = "EVENT_WALLET_TRANSACTION_NEW_TXID"
 }
-export declare const format_symbol_name: (symbol: string) => string;
+export declare const clean_token_symbol: (symbol: string) => string;
+export declare const format_pair_symbol: (symbol: string) => string;
 export declare const format_unique_orderbook_id: (chain_id: CHAIN_ID, dex_id: DEX_ID, pool_id: string, fee_rate: number) => string;
 export declare const parse_unique_orderbook_id: (unique_orderbook_id: string) => UniqueOrderbookIdType;
 export declare const format_unique_order_msg_id: (group_id: string, price_id: string, order_trace_id: string) => string;
@@ -262,7 +261,6 @@ export declare const failed: (err: Error, error_code?: string, code?: number) =>
     msg: string;
     error_code: string;
 };
-export declare const estimate_amount_in_token: (arb_cache: ArbCache, token: StandardTokenInfoType, amount_in_usd: number, query_token_market_price_url?: string) => Promise<string>;
 export declare const calc_amount_in_token: (amount_in_usd: number, market_price: string, token_info: StandardTokenInfoType) => TokenPriceWithAmountType;
 export declare const get_input_out_token: (poolInfo: StandardPoolInfoType, aToB: boolean) => {
     inputToken: StandardTokenInfoType;

package/dist/index.js

@@ -48,8 +48,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DATE_TIME_FORMAT_NO_WHITESPACE = exports.DATE_TIME_FORMAT_DEFAULT = exports.to_json_str = exports.DecimalUtil = exports.generateRandomNumber = exports.LOG = exports._active_log_level = exports.LOG_LEVEL = exports.REDIS_EVENT_TYPE_TRADE_INSTANCE_CHANGE = exports.REDIS_EVENT_TYPE_ORDER = exports.REDIS_EVENT_TYPE_QUOTE = exports.REDIS_EVENT_TYPE_CONFIG_CHANGE = exports.REDIS_EVENT_CHANNEL = exports.get_new_block_channel_name = exports.get_tx_result_channel_name = exports.get_wallet_raw_tx_channel_name = exports.get_order_channel_name = exports.get_quote_channel_name = exports.get_config_channel_name = exports.get_cache_key = exports.getArbEventSubscriber = exports.getArbEventPublisher = exports.getArbCache = exports.getLoadingCache = exports.getRedisClient = exports.format_order_lock_key = exports.format_unique_order_msg_id = exports.parse_unique_orderbook_id = exports.format_unique_orderbook_id = exports.format_symbol_name = exports.LOCAL_EVENT_NAME = exports.CACHE_KEY_TYPE = exports.OnChainDataSubscribeType = exports.TradeErrorCodeType = exports.SystemErrorCodeType = exports.TRADE_TYPE = exports.GROUP_ID = exports.DEX_ID = exports.CHAIN_ID = exports.STREAMING_TRANSACTION_CONFIRMED = exports.TRANSACTION_STATE_FAILED = exports.TRANSACTION_STATE_SUCCESS = exports.TRANSACTION_STATE_PROCESSING = exports.QUOTE_AMOUNT_USD_MAX = exports.QUOTE_AMOUNT_USD_MIN = exports.REGEX_HEX_PREFIX = exports.PROCESSING = exports.NOT_FOUND = exports.SUCCESS = exports.FAILED = void 0;
-exports.inspect_arb_local_cache = exports.save_trade_execution_logs = exports.get_input_out_token_fix = exports.get_input_out_token = exports.calc_amount_in_token = exports.estimate_amount_in_token = exports.failed = exports.success = exports.home_dir = exports.postJSON = exports.deep_merge_object = exports.isArray = exports.isTrue = exports.deep_clone = exports.uuid = void 0;
+exports.DATE_TIME_FORMAT_DEFAULT = exports.to_json_str = exports.DecimalUtil = exports.generateRandomNumber = exports.LOG = exports._active_log_level = exports.LOG_LEVEL = exports.REDIS_EVENT_TYPE_TRADE_INSTANCE_CHANGE = exports.REDIS_EVENT_TYPE_ORDER = exports.REDIS_EVENT_TYPE_QUOTE = exports.REDIS_EVENT_TYPE_CONFIG_CHANGE = exports.REDIS_EVENT_CHANNEL = exports.get_new_block_channel_name = exports.get_tx_result_channel_name = exports.get_wallet_raw_tx_channel_name = exports.get_order_channel_name = exports.get_quote_channel_name = exports.get_config_channel_name = exports.get_cache_key = exports.getArbEventSubscriber = exports.getArbEventPublisher = exports.getArbCache = exports.getLoadingCache = exports.getRedisClient = exports.format_order_lock_key = exports.format_unique_order_msg_id = exports.parse_unique_orderbook_id = exports.format_unique_orderbook_id = exports.format_pair_symbol = exports.clean_token_symbol = exports.LOCAL_EVENT_NAME = exports.CACHE_KEY_TYPE = exports.OnChainDataSubscribeType = exports.TradeErrorCodeType = exports.SystemErrorCodeType = exports.TRADE_TYPE = exports.GROUP_ID = exports.DEX_ID = exports.CHAIN_ID = exports.STREAMING_TRANSACTION_CONFIRMED = exports.TRANSACTION_STATE_FAILED = exports.TRANSACTION_STATE_SUCCESS = exports.TRANSACTION_STATE_PROCESSING = exports.QUOTE_AMOUNT_USD_MAX = exports.QUOTE_AMOUNT_USD_MIN = exports.REGEX_HEX_PREFIX = exports.PROCESSING = exports.NOT_FOUND = exports.SUCCESS = exports.FAILED = void 0;
+exports.inspect_arb_local_cache = exports.save_trade_execution_logs = exports.get_input_out_token_fix = exports.get_input_out_token = exports.calc_amount_in_token = exports.failed = exports.success = exports.home_dir = exports.postJSON = exports.deep_merge_object = exports.isArray = exports.isTrue = exports.deep_clone = exports.uuid = exports.DATE_TIME_FORMAT_NO_WHITESPACE = void 0;
 exports._caller = _caller;
 exports.log_trace = log_trace;
 exports.log_debug = log_debug;
@@ -86,14 +86,12 @@ const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const redis = __importStar(require("./redis"));
 const cache = __importStar(require("./cache"));
-const market_price_1 = require("./market_price");
 const crypto_1 = require("./util/crypto");
 __exportStar(require("./analyze"), exports);
 __exportStar(require("./appconfig"), exports);
 __exportStar(require("./redis"), exports);
 __exportStar(require("./cache"), exports);
 __exportStar(require("./constants"), exports);
-__exportStar(require("./market_price"), exports);
 __exportStar(require("./pool"), exports);
 __exportStar(require("./quote"), exports);
 __exportStar(require("./token"), exports);
@@ -209,7 +207,6 @@ var CACHE_KEY_TYPE;
 (function (CACHE_KEY_TYPE) {
     CACHE_KEY_TYPE["CONFIG_TOKEN_LIST"] = "c:token";
     CACHE_KEY_TYPE["CONFIG_POOL_LIST"] = "c:pool";
-    CACHE_KEY_TYPE["CONFIG_PAIR_LIST"] = "c:pair";
     CACHE_KEY_TYPE["CONFIG_TRADE_SERVICE"] = "c:trade";
     CACHE_KEY_TYPE["QUOTE_PRICE"] = "q:price";
     CACHE_KEY_TYPE["ORDER_MESSAGE"] = "o:msg";
@@ -223,18 +220,24 @@ var LOCAL_EVENT_NAME;
     LOCAL_EVENT_NAME["EVENT_WALLET_TRANSACTION"] = "EVENT_WALLET_TRANSACTION";
     LOCAL_EVENT_NAME["EVENT_WALLET_TRANSACTION_NEW_TXID"] = "EVENT_WALLET_TRANSACTION_NEW_TXID";
 })(LOCAL_EVENT_NAME || (exports.LOCAL_EVENT_NAME = LOCAL_EVENT_NAME = {}));
-const format_symbol_name = (symbol) => {
-    return symbol.replace('USDC', 'USDT').replace('USD1', 'USDT')
-        .replace('WTRX', 'TRX')
-        .replace('$', '')
-        .replace('WSOL', 'SOL')
-        .replace('WBTC', 'BTC')
-        .replace('WETH', 'ETH')
-        .replace('WBNB', 'BNB')
-        .replace('WOKB', 'OKB')
+const clean_token_symbol = (symbol) => {
+    if (!symbol)
+        return symbol;
+    return symbol
+        .replace(/\$/g, '')
+        .replace(/\s+/g, '')
         .toUpperCase();
 };
-exports.format_symbol_name = format_symbol_name;
+exports.clean_token_symbol = clean_token_symbol;
+const format_pair_symbol = (symbol) => {
+    if (!symbol)
+        return symbol;
+    return (0, exports.clean_token_symbol)(symbol)
+        .replace('USDC', 'USDT').replace('USD1', 'USDT')
+        .replace('WTRX', 'TRX').replace('WSOL', 'SOL').replace('WBTC', 'BTC')
+        .replace('WETH', 'ETH').replace('WBNB', 'BNB').replace('WOKB', 'OKB');
+};
+exports.format_pair_symbol = format_pair_symbol;
 const format_unique_orderbook_id = (chain_id, dex_id, pool_id, fee_rate) => {
     return `${chain_id}_${dex_id}_${pool_id}_${fee_rate}`;
 };
@@ -776,10 +779,6 @@ const failed = (err, error_code = 'SYSTEM_ERROR', code = 500) => {
     };
 };
 exports.failed = failed;
-const estimate_amount_in_token = (arb_cache_1, token_1, amount_in_usd_1, ...args_1) => __awaiter(void 0, [arb_cache_1, token_1, amount_in_usd_1, ...args_1], void 0, function* (arb_cache, token, amount_in_usd, query_token_market_price_url = '') {
-    return yield market_price_1.EstimateAmountInToken.estimate_amount_in_token(arb_cache, token, amount_in_usd, query_token_market_price_url);
-});
-exports.estimate_amount_in_token = estimate_amount_in_token;
 const calc_amount_in_token = (amount_in_usd, market_price, token_info) => {
     if (isEmpty(market_price) || Number(market_price) === 0) {
         throw new Error(`calc_token_amount_out error! invalid argument! market_price=${market_price}`);

package/dist/market_price/estimate_token_amount.js

@@ -43,7 +43,7 @@ class EstimateAmountInToken {
             if (index_1.LOG.debug) {
                 (0, index_1.log_debug)('estimate_amount_in_token, start');
             }
-            let symbol = (0, index_1.format_symbol_name)(token.symbol);
+            let symbol = (0, index_1.clean_token_symbol)(token.symbol);
             let amountInToken;
             let token_info;
             try {

package/dist/quote/to_price_message.js

@@ -112,7 +112,7 @@ function normalize_pair_name(priceMessage) {
         pool_name = pool_name.split('/')[1] + '/' + pool_name.split('/')[0];
     }
     const dex_pair_names = pool_name.split('/');
-    let cex_base_token = (0, __1.format_symbol_name)(dex_pair_names[0]);
-    let cex_qutoe_token = (0, __1.format_symbol_name)(dex_pair_names[1]);
+    let cex_base_token = (0, __1.format_pair_symbol)(dex_pair_names[0]);
+    let cex_qutoe_token = (0, __1.format_pair_symbol)(dex_pair_names[1]);
     priceMessage.pair = cex_base_token.toUpperCase() + '/' + cex_qutoe_token.toUpperCase();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-core",
-    "version": "3.1.37",
+    "version": "3.1.38",
     "description": "Common types and utilities for trading systems - use `npm run push` to publish",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",