@clonegod/ttd-core 3.1.39 → 3.1.41

package/dist/alert/log_rules.js

@@ -28,7 +28,7 @@ function detectProvider(msg) {
 registerLogRules([
     { pattern: /redis.*(disconnect|connection.*lost|econnrefused|pubsub.*error|subscribe.*failed|exceeded max reconnect|连接失败)/i,
         code: 'INFRA_REDIS_DISCONNECT' },
-    { pattern: /econnrefused.*4000|config-center.*(down|unavailable)|(get|update|delete|post|check)\s+(pools|tokens|group|fixed-symbol|zh-pinyin).*error|init_.*client.*error/i,
+    { pattern: /econnrefused.*4000|config-center.*(down|unavailable)|(get|update|delete|post|check)\s+(pools|tokens|group|fixed-symbol).*error|init_.*client.*error/i,
         level: 'error', code: 'INFRA_CONFIG_CENTER_DOWN' },
     { pattern: /uncaught exception|unhandled rejection|startup failed|main error|create_trade_runtime error|arb_cache.*init.*error/i,
         level: 'error', code: 'INFRA_PROCESS_CRASH' },

package/dist/appconfig/EnvArgs.d.ts

@@ -35,7 +35,6 @@ export declare class EnvArgs {
     encryption_key: string;
     providers_file_path: string;
     fixed_symbol_address_file: string;
-    zh_pinyin_map_file: string;
     alert_analyze_host: string;
     alert_flush_size: number;
     alert_flush_ms: number;

package/dist/appconfig/env_registry.js

@@ -45,7 +45,6 @@ registerEnvVars({
     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 事件的频率' },
     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 过滤' },
     ip_exclude_prefix: { env: 'IP_EXCLUDE_PREFIX', type: 'string', default: '192.168', desc: 'IP 前缀排除列表（逗号分隔）' },
     alert_analyze_host: { env: 'ALERT_ANALYZE_HOST', type: 'string', default: '', desc: 'alert ingest 地址(IP)；为空则不上报' },

package/dist/cache/arb_cache.d.ts

@@ -29,16 +29,21 @@ export declare class ArbCache {
     refresh_local_cache_group_map(trade_config: TradeServiceConfigType): void;
     cache_token_list(): Promise<void>;
     update_token_list(input_token_list: StandardTokenInfoType[]): Promise<void>;
-    get_token_list(): Promise<StandardTokenInfoType[]>;
-    get_token_list_no_cache(): Promise<StandardTokenInfoType[]>;
+    get_token_list(force_load?: boolean): Promise<StandardTokenInfoType[]>;
     get_one_token_info_by_symbol(symbol: string): Promise<StandardTokenInfoType>;
     publish_token_change_event(): Promise<void>;
     cache_pool_list(): Promise<void>;
-    private scan_duplicate_address;
+    scan_duplicate_address(token_list: StandardTokenInfoType[]): void;
     resolve_duplicate_address(authoritative_mappings: Array<{
         address: string;
         symbol: string;
     }>): Promise<{
+        cleaned_redis_fields: Array<{
+            field: string;
+            address: string;
+            value_symbol: string;
+            kept_symbol: string;
+        }>;
         cleaned_tokens: Array<{
             address: string;
             dropped_symbols: string[];
@@ -60,13 +65,17 @@ export declare class ArbCache {
             symbol: string;
             reason: string;
         }>;
+        invalid_input: Array<{
+            address: string;
+            symbol: string;
+            reason: string;
+        }>;
     }>;
     set_pool_token_info(pool: StandardPoolInfoType, token_info_list: StandardTokenInfoType[]): boolean;
     set_pool_extra(pool: StandardPoolInfoType): void;
     update_pool_list(input_dex_pool_list: StandardDexPoolConfigType[]): Promise<void>;
     get_pool_list_by_pair(pair: string): Promise<StandardPoolInfoType[]>;
-    get_pool_list(): Promise<StandardPoolInfoType[]>;
-    get_pool_list_no_cache(): Promise<StandardPoolInfoType[]>;
+    get_pool_list(force_load?: boolean): Promise<StandardPoolInfoType[]>;
     get_one_pool_info(pool_address: string, refresh_cache_if_not_found?: boolean): Promise<StandardPoolInfoType>;
     publish_pool_change_event(): Promise<void>;
     get_one_pair(input_pair: string): Promise<StandardPairType>;

package/dist/cache/arb_cache.js

@@ -42,8 +42,8 @@ class ArbCache {
                 this.redis_event_publisher = (0, index_1.getArbEventPublisher)(this);
                 (0, index_1.mkdirSync)(path_1.default.join('config', this.chain_id).toLowerCase(), true);
                 yield Promise.all([
-                    this.get_token_list_no_cache(),
-                    this.get_pool_list_no_cache()
+                    this.get_token_list(true),
+                    this.get_pool_list(true)
                 ]);
                 if ((_a = (0, core_env_1.getCoreEnv)().app_name) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes('config-center')) {
                     yield this.init_configs();
@@ -91,12 +91,19 @@ class ArbCache {
         return path_1.default.join('config', chain_id, file_name);
     }
     refresh_local_cache_token_list(token_list) {
-        const prev_by_symbol = new Map(this.token_symbol_map);
+        const prev_by_id = new Map();
+        for (const t of this.token_address_map.values()) {
+            const id = t._id || (t.address || '').toLowerCase();
+            if (id)
+                prev_by_id.set(id, t);
+        }
         this.token_symbol_map.clear();
         this.token_address_map.clear();
         const merged = [];
         for (const fresh of token_list) {
-            const existing = prev_by_symbol.get(fresh.symbol);
+            if (!fresh._id)
+                fresh._id = (fresh.address || '').toLowerCase();
+            const existing = prev_by_id.get(fresh._id);
             let token_ref;
             if (existing) {
                 Object.assign(existing, fresh);
@@ -106,7 +113,7 @@ class ArbCache {
                 token_ref = fresh;
             }
             this.token_symbol_map.set(token_ref.symbol, token_ref);
-            this.token_address_map.set(token_ref.address, token_ref);
+            this.token_address_map.set(token_ref._id, token_ref);
             merged.push(token_ref);
         }
         this.token_list = merged;
@@ -114,28 +121,21 @@ class ArbCache {
         (0, index_1.log_trace)('refresh_local_cache_token_list, success', {
             token_list_len: this.token_list.length,
             token_symbol_map_size: this.token_symbol_map.size,
-            token_address_map_szie: this.token_address_map.size,
+            token_address_map_size: this.token_address_map.size,
         });
     }
     getTokenByAddress(address) {
-        var _a;
         if (!address)
             return undefined;
-        const exact = this.token_address_map.get(address);
-        if (exact)
-            return exact;
-        const lc = address.toLowerCase();
-        for (const m of this.token_address_map.values()) {
-            if (((_a = m.address) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === lc)
-                return m;
-        }
-        return undefined;
+        return this.token_address_map.get(address.toLowerCase());
     }
     refresh_local_cache_pool_list(pool_list) {
         this.pool_list = pool_list;
         this.pool_address_map.clear();
         for (let pool of pool_list) {
-            this.pool_address_map.set(pool.pool_address, pool);
+            if (!pool._id)
+                pool._id = (pool.pool_address || '').toLowerCase();
+            this.pool_address_map.set(pool._id, pool);
         }
         this.pool_list_cahce_last_update_time = (0, index_1.getCurDateTime)();
         (0, index_1.log_trace)('refresh_local_cache_pool_list, success', {
@@ -170,7 +170,10 @@ class ArbCache {
             }
             let config = (0, index_1.readFile)(filepath);
             let token_list = config.token_list.filter(e => e.enable);
-            this.scan_duplicate_address(token_list);
+            for (const t of token_list) {
+                if (!t._id)
+                    t._id = (t.address || '').toLowerCase();
+            }
             for (let token of token_list) {
                 let field = token.symbol;
                 let value = JSON.stringify(token);
@@ -196,18 +199,27 @@ class ArbCache {
                 throw new Error(`update_token_list failed, config file not exist! filepath=${filepath}`);
             }
             let config = (0, index_1.readFile)(filepath);
-            for (let token of input_token_list) {
-                let others = config.token_list.filter(e => e.symbol.toUpperCase() !== token.symbol.toUpperCase());
+            const input_symbols_upper = new Set();
+            const upserts = [];
+            const hdels = [];
+            for (const token of input_token_list) {
+                if (!token._id)
+                    token._id = (token.address || '').toLowerCase();
+                input_symbols_upper.add(token.symbol.toUpperCase());
                 if (token.enable) {
-                    others.push(token);
+                    upserts.push(token);
                 }
                 else {
                     (0, index_1.log_warn)(`update_token_list, token not enable, delete`, token);
-                    let field = token.symbol;
-                    yield this.loading_cache.hdel(this.chain_id, index_1.CACHE_KEY_TYPE.CONFIG_TOKEN_LIST, field);
+                    hdels.push(token.symbol);
                 }
-                others = others.sort((a, b) => a.symbol.localeCompare(b.symbol));
-                config.token_list = others;
+            }
+            const others = config.token_list.filter(e => !input_symbols_upper.has(e.symbol.toUpperCase()));
+            others.push(...upserts);
+            others.sort((a, b) => a.symbol.localeCompare(b.symbol));
+            config.token_list = others;
+            for (const field of hdels) {
+                yield this.loading_cache.hdel(this.chain_id, index_1.CACHE_KEY_TYPE.CONFIG_TOKEN_LIST, field);
             }
             (0, index_1.writeFile)(filepath, (0, index_1.to_json_str)(config));
             yield this.cache_token_list();
@@ -215,22 +227,16 @@ class ArbCache {
         });
     }
     get_token_list() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!(0, index_1.isEmpty)(this.token_list)) {
+        return __awaiter(this, arguments, void 0, function* (force_load = false) {
+            if (!force_load && !(0, index_1.isEmpty)(this.token_list)) {
                 return this.token_list;
             }
-            return yield this.get_token_list_no_cache();
-        });
-    }
-    get_token_list_no_cache() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let token_list = [];
-            let res = yield this.loading_cache.hget_all(this.chain_id, index_1.CACHE_KEY_TYPE.CONFIG_TOKEN_LIST);
-            let { key, value } = res;
-            for (let name of Object.keys(value)) {
-                token_list.push(JSON.parse(value[name]));
+            const res = yield this.loading_cache.hget_all(this.chain_id, index_1.CACHE_KEY_TYPE.CONFIG_TOKEN_LIST);
+            const token_list = [];
+            for (const name of Object.keys(res.value)) {
+                token_list.push(JSON.parse(res.value[name]));
             }
-            (0, index_1.log_warn)(`get_token_list_no_cache, key=${key}, token_list.len=${token_list.length}`);
+            (0, index_1.log_trace)(`[get_token_list] reload from redis, key=${res.key}, len=${token_list.length}`);
             this.refresh_local_cache_token_list(token_list);
             return token_list;
         });
@@ -272,6 +278,10 @@ class ArbCache {
             const skipped = [];
             for (let { dex_id, pool_list } of config.dex_list) {
                 pool_list = pool_list.filter(e => e.enable);
+                for (const p of pool_list) {
+                    if (!p._id)
+                        p._id = (p.pool_address || '').toLowerCase();
+                }
                 (0, index_1.log_trace)(`cache_pool_list`, { dex_id, pool_list_len: pool_list.length });
                 const valid_pools = [];
                 for (let pool of pool_list) {
@@ -309,12 +319,12 @@ class ArbCache {
         var _a;
         const by_addr = new Map();
         for (const t of token_list) {
-            const addr = (t.address || '').toLowerCase();
-            if (!addr)
+            const id = t._id || (t.address || '').toLowerCase();
+            if (!id)
                 continue;
-            if (!by_addr.has(addr))
-                by_addr.set(addr, []);
-            by_addr.get(addr).push(t);
+            if (!by_addr.has(id))
+                by_addr.set(id, []);
+            by_addr.get(id).push(t);
         }
         const fixed_by_addr = new Map();
         for (const f of (0, fixed_symbol_address_1.get_fixed_symbol_address)()) {
@@ -340,21 +350,67 @@ class ArbCache {
     }
     resolve_duplicate_address(authoritative_mappings) {
         return __awaiter(this, void 0, void 0, function* () {
-            const token_list = yield this.get_token_list();
+            const authMap = new Map();
+            const invalid_input = [];
+            for (const m of authoritative_mappings) {
+                const addr = (m.address || '').toLowerCase();
+                const sym = m.symbol || '';
+                if (!addr) {
+                    invalid_input.push({ address: addr, symbol: sym, reason: 'address 为空' });
+                    continue;
+                }
+                if (!/^[A-Z0-9]+$/.test(sym)) {
+                    invalid_input.push({ address: addr, symbol: sym, reason: 'symbol 非 [A-Z0-9]+' });
+                    continue;
+                }
+                authMap.set(addr, sym);
+            }
+            const cleaned_redis_fields = [];
+            const dropped_value_symbols = new Set();
+            const tokenHashRes = yield this.loading_cache.hget_all(this.chain_id, index_1.CACHE_KEY_TYPE.CONFIG_TOKEN_LIST);
+            const fields_by_addr = new Map();
+            for (const fieldName of Object.keys(tokenHashRes.value)) {
+                let v;
+                try {
+                    v = JSON.parse(tokenHashRes.value[fieldName]);
+                }
+                catch (_a) {
+                    continue;
+                }
+                const addr = (v.address || '').toLowerCase();
+                if (!addr)
+                    continue;
+                if (!fields_by_addr.has(addr))
+                    fields_by_addr.set(addr, []);
+                fields_by_addr.get(addr).push({ field: fieldName, v });
+            }
+            for (const [addr, authSym] of authMap) {
+                const fields = fields_by_addr.get(addr) || [];
+                for (const { field, v } of fields) {
+                    if (field === authSym && v.symbol === authSym)
+                        continue;
+                    yield this.loading_cache.hdel(this.chain_id, index_1.CACHE_KEY_TYPE.CONFIG_TOKEN_LIST, field);
+                    cleaned_redis_fields.push({ field, address: addr, value_symbol: v.symbol || '', kept_symbol: authSym });
+                    if (v.symbol)
+                        dropped_value_symbols.add(v.symbol);
+                    if (field !== v.symbol)
+                        dropped_value_symbols.add(field);
+                }
+            }
+            const token_list = yield this.get_token_list(true);
             const by_addr = new Map();
             for (const t of token_list) {
-                const addr = (t.address || '').toLowerCase();
-                if (!addr)
+                const id = t._id || (t.address || '').toLowerCase();
+                if (!id)
                     continue;
-                if (!by_addr.has(addr))
-                    by_addr.set(addr, []);
-                by_addr.get(addr).push(t);
+                if (!by_addr.has(id))
+                    by_addr.set(id, []);
+                by_addr.get(id).push(t);
             }
             const tokens_to_disable = [];
             const cleaned_tokens = [];
             const not_found = [];
-            for (const { address, symbol } of authoritative_mappings) {
-                const addr = (address || '').toLowerCase();
+            for (const [addr, symbol] of authMap) {
                 const tokens = by_addr.get(addr) || [];
                 if (tokens.length === 0) {
                     not_found.push({ address: addr, symbol, reason: `address 在 token-list 中未找到` });
@@ -370,6 +426,7 @@ class ArbCache {
                     continue;
                 for (const t of dropped) {
                     tokens_to_disable.push(Object.assign(Object.assign({}, t), { enable: false }));
+                    dropped_value_symbols.add(t.symbol);
                 }
                 cleaned_tokens.push({
                     address: addr,
@@ -382,13 +439,14 @@ class ArbCache {
             const skipped_trading_pools = [];
             if (dropped_symbols.size > 0) {
                 const pool_list = yield this.get_pool_list();
-                const trade_pool_set = new Set((yield this.get_all_trade_pools()).map(p => p.pool_address));
+                const trade_pool_set = new Set((yield this.get_all_trade_pools()).map(p => p._id || (p.pool_address || '').toLowerCase()));
                 const pools_to_disable_by_dex = new Map();
                 for (const p of pool_list) {
                     const [t0, t1] = (p.pool_name || '').split('/');
                     if (!dropped_symbols.has(t0) && !dropped_symbols.has(t1))
                         continue;
-                    if (trade_pool_set.has(p.pool_address)) {
+                    const pid = p._id || (p.pool_address || '').toLowerCase();
+                    if (trade_pool_set.has(pid)) {
                         skipped_trading_pools.push({
                             pool_address: p.pool_address,
                             pool_name: p.pool_name,
@@ -413,8 +471,8 @@ class ArbCache {
             if (tokens_to_disable.length > 0) {
                 yield this.update_token_list(tokens_to_disable);
             }
-            (0, index_1.log_warn)(`[resolve-duplicate] 完成: disabled ${tokens_to_disable.length} 个 symbol, 删 ${cleaned_pools.length} 个 pool, 跳过交易中 pool ${skipped_trading_pools.length} 个, 映射 not_found ${not_found.length} 个`);
-            return { cleaned_tokens, cleaned_pools, skipped_trading_pools, not_found };
+            (0, index_1.log_warn)(`[resolve-duplicate] 完成: redis stale field ${cleaned_redis_fields.length}, file disabled ${tokens_to_disable.length} 个 symbol, 删 ${cleaned_pools.length} 个 pool, 跳过交易中 pool ${skipped_trading_pools.length} 个, not_found ${not_found.length}, invalid_input ${invalid_input.length}`);
+            return { cleaned_redis_fields, cleaned_tokens, cleaned_pools, skipped_trading_pools, not_found, invalid_input };
         });
     }
     set_pool_token_info(pool, token_info_list) {
@@ -496,43 +554,45 @@ class ArbCache {
         });
     }
     get_pool_list() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!(0, index_1.isEmpty)(this.pool_list)) {
+        return __awaiter(this, arguments, void 0, function* (force_load = false) {
+            if (!force_load && !(0, index_1.isEmpty)(this.pool_list)) {
                 return this.pool_list;
             }
-            (0, index_1.log_warn)(`get_pool_list, local cache is empty, try get_pool_list_no_cache...`);
-            return yield this.get_pool_list_no_cache();
-        });
-    }
-    get_pool_list_no_cache() {
-        return __awaiter(this, void 0, void 0, function* () {
             try {
-                let res = yield this.loading_cache.hget_all(this.chain_id, index_1.CACHE_KEY_TYPE.CONFIG_POOL_LIST);
-                let { key, value } = res;
-                let pool_list = [];
-                for (let name of Object.keys(value)) {
-                    pool_list.push(JSON.parse(value[name]));
+                const res = yield this.loading_cache.hget_all(this.chain_id, index_1.CACHE_KEY_TYPE.CONFIG_POOL_LIST);
+                const pool_list = [];
+                for (const name of Object.keys(res.value)) {
+                    pool_list.push(JSON.parse(res.value[name]));
                 }
-                (0, index_1.log_warn)(`get_pool_list_no_cache, key=${key}, pool_list.len=${pool_list.length}`);
+                (0, index_1.log_trace)(`[get_pool_list] reload from redis, key=${res.key}, len=${pool_list.length}`);
                 this.refresh_local_cache_pool_list(pool_list);
                 return pool_list;
             }
             catch (err) {
-                (0, index_1.log_error)('get_pool_list_no_cache error!!!', err);
-                throw new Error(`get_pool_list_no_cache error! err=${err.message}`);
+                (0, index_1.log_error)('get_pool_list reload error!!!', err);
+                throw new Error(`get_pool_list error! err=${err.message}`);
             }
         });
     }
     get_one_pool_info(pool_address_1) {
         return __awaiter(this, arguments, void 0, function* (pool_address, refresh_cache_if_not_found = true) {
-            let pool_info = null;
-            if (this.pool_address_map.has(pool_address)) {
-                pool_info = this.pool_address_map.get(pool_address);
-            }
+            const target = (pool_address || '').toLowerCase();
+            let pool_info = this.pool_address_map.get(target) || null;
             if (!pool_info && refresh_cache_if_not_found) {
-                (0, index_1.log_warn)(`get_one_pool_info, from local pool_address_map got: ${pool_info}, try get_pool_list_no_cache...`);
-                let pool_list = yield this.get_pool_list_no_cache();
-                pool_info = pool_list.find(e => e.pool_address === pool_address);
+                for (const field of [pool_address, target]) {
+                    if (!field)
+                        continue;
+                    const res = yield this.loading_cache.hget(this.chain_id, index_1.CACHE_KEY_TYPE.CONFIG_POOL_LIST, field);
+                    if (res === null || res === void 0 ? void 0 : res.value) {
+                        pool_info = JSON.parse(res.value);
+                        break;
+                    }
+                }
+                if (!pool_info) {
+                    (0, index_1.log_warn)(`get_one_pool_info, hget miss, try full reload`);
+                    const pool_list = yield this.get_pool_list(true);
+                    pool_info = pool_list.find(e => (e._id || (e.pool_address || '').toLowerCase()) === target);
+                }
             }
             if (!pool_info) {
                 throw new Error(`get_one_pool_info failed, not exist! pool_address=${pool_address}`);

package/dist/cache/arb_event_sub.js

@@ -89,7 +89,7 @@ class ArbEventSubscriber {
     on_config_token_change_event(message) {
         return __awaiter(this, void 0, void 0, function* () {
             (0, index_1.log_debug)(`on_config_token_change_event, refresh local token cache, start`, { message });
-            yield this.arb_cache.get_token_list_no_cache();
+            yield this.arb_cache.get_token_list(true);
             (0, index_1.log_debug)(`on_config_token_change_event, refresh local token cache, success`);
             return true;
         });
@@ -97,7 +97,7 @@ class ArbEventSubscriber {
     on_config_pool_change_event(message) {
         return __awaiter(this, void 0, void 0, function* () {
             (0, index_1.log_debug)(`on_config_pool_change_event, refresh local pool cache, start`, { message });
-            yield this.arb_cache.get_pool_list_no_cache();
+            yield this.arb_cache.get_pool_list(true);
             (0, index_1.log_debug)(`on_config_pool_change_event, refresh local pool cache, success`);
             return true;
         });

package/dist/index.d.ts

@@ -128,7 +128,7 @@ 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 clean_token_symbol: (symbol: string) => string;
+export declare const format_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;

package/dist/index.js

@@ -48,7 +48,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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.format_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;
@@ -220,19 +220,17 @@ 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 clean_token_symbol = (symbol) => {
+const format_token_symbol = (symbol) => {
     if (!symbol)
-        return symbol;
-    return symbol
-        .replace(/\$/g, '')
-        .replace(/\s+/g, '')
-        .toUpperCase();
+        return '';
+    const cleaned = symbol.replace(/[^A-Za-z0-9]/g, '').toUpperCase();
+    return /^[A-Z0-9]+$/.test(cleaned) ? cleaned : '';
 };
-exports.clean_token_symbol = clean_token_symbol;
+exports.format_token_symbol = format_token_symbol;
 const format_pair_symbol = (symbol) => {
     if (!symbol)
         return symbol;
-    return (0, exports.clean_token_symbol)(symbol)
+    return (0, exports.format_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');

package/dist/pool/cache_pool_config.d.ts

@@ -1,2 +1,2 @@
 import { CHAIN_ID, DEX_ID, FormattedPoolInfo, FormattedTokenInfo } from "../index";
-export declare const cache_pool_config: (chain_id: CHAIN_ID, valid_tokens_map: Map<string, FormattedTokenInfo[]>, sol_pools_cache: Map<DEX_ID, FormattedPoolInfo[]>) => Promise<void>;
+export declare const cache_pool_config: (chain_id: CHAIN_ID, tokens_map: Map<string, FormattedTokenInfo>, pools_map: Map<DEX_ID, FormattedPoolInfo[]>) => Promise<void>;

package/dist/pool/cache_pool_config.js

@@ -18,7 +18,7 @@ const core_env_1 = require("../appconfig/core_env");
 const index_1 = require("../index");
 const service_ports_1 = require("../constants/service_ports");
 const is_not_arb_token_1 = require("../token/is_not_arb_token");
-const cache_pool_config = (chain_id, valid_tokens_map, sol_pools_cache) => __awaiter(void 0, void 0, void 0, function* () {
+const cache_pool_config = (chain_id, tokens_map, pools_map) => __awaiter(void 0, void 0, void 0, function* () {
     (0, index_1.log_info)(`cache_pool_config start`);
     let count = 0;
     let skip_pool_list = [];
@@ -26,15 +26,17 @@ const cache_pool_config = (chain_id, valid_tokens_map, sol_pools_cache) => __awa
     const ccBase = `http://${(genv.config_center_host || '127.0.0.1').trim()}:${service_ports_1.SERVICE_PORT.CONFIG_CENTER_HTTP}/${chain_id}/config`;
     const config_pool_url = `${ccBase}/pools`;
     const body = [];
-    for (const [dex_id, pool_list] of sol_pools_cache) {
+    for (const [dex_id, pool_list] of pools_map) {
         const valid_pool_list = [];
         for (const pool of pool_list) {
-            const is_contains_unkown_symbol = !valid_tokens_map.has(pool.tokenA.symbol) || !valid_tokens_map.has(pool.tokenB.symbol);
-            if (is_contains_unkown_symbol || (0, is_not_arb_token_1.is_not_arb_token)(pool.pool_name)) {
+            const tokenAExists = tokens_map.has(pool.tokenA._id);
+            const tokenBExists = tokens_map.has(pool.tokenB._id);
+            if (!tokenAExists || !tokenBExists || (0, is_not_arb_token_1.is_not_arb_token)(pool.pool_name)) {
                 skip_pool_list.push(pool);
                 continue;
             }
             valid_pool_list.push({
+                _id: (pool.pool_address || '').toLowerCase(),
                 program_id: pool.program_id,
                 authority: pool.authority,
                 subscribe_type: 'grpc',
@@ -42,7 +44,6 @@ const cache_pool_config = (chain_id, valid_tokens_map, sol_pools_cache) => __awa
                 dex_id,
                 pool_name: pool.pool_name,
                 pool_address: pool.pool_address,
-                pool_address_hex: '',
                 tokenA: null,
                 tokenB: null,
                 vaultA: pool.vaultA,

package/dist/pool/types.d.ts

@@ -1,5 +1,6 @@
 import { FormattedTokenInfo } from "../token/types";
 export interface FormattedPoolInfo {
+    _id: string;
     pair: string;
     quote_token: string;
     chain_id: string;

package/dist/quote/to_price_message.js

@@ -72,17 +72,17 @@ function to_price_message(appConfig_1, quote_amount_usd_1, tx_price_1, quote_ask
             unique_orderbook_id,
             is_reverse_token,
             tokenA: {
+                _id: tokenA._id || (tokenA.address || '').toLowerCase(),
                 symbol: tokenA.symbol,
                 address: tokenA.address,
-                address_hex: tokenA.address_hex,
                 decimals: tokenA.decimals,
                 name: tokenA.name,
                 enable: true,
             },
             tokenB: {
+                _id: tokenB._id || (tokenB.address || '').toLowerCase(),
                 symbol: tokenB.symbol,
                 address: tokenB.address,
-                address_hex: tokenB.address_hex,
                 decimals: tokenB.decimals,
                 name: tokenB.name,
                 enable: true,

package/dist/token/cache_token_config.d.ts

@@ -1,2 +1,2 @@
 import { CHAIN_ID, FormattedTokenInfo } from "../index";
-export declare const cache_token_config: (chain_id: CHAIN_ID, valid_tokens_map: Map<string, FormattedTokenInfo[]>) => Promise<void>;
+export declare const cache_token_config: (chain_id: CHAIN_ID, tokens_map: Map<string, FormattedTokenInfo>) => Promise<void>;

package/dist/token/cache_token_config.js

@@ -18,20 +18,22 @@ const core_env_1 = require("../appconfig/core_env");
 const index_1 = require("../index");
 const service_ports_1 = require("../constants/service_ports");
 const is_not_arb_token_1 = require("./is_not_arb_token");
-const cache_token_config = (chain_id, valid_tokens_map) => __awaiter(void 0, void 0, void 0, function* () {
+const cache_token_config = (chain_id, tokens_map) => __awaiter(void 0, void 0, void 0, function* () {
     (0, index_1.log_info)(`cache_token_config start`);
     const genv = (0, core_env_1.getCoreEnv)();
     const ccBase = `http://${(genv.config_center_host || '127.0.0.1').trim()}:${service_ports_1.SERVICE_PORT.CONFIG_CENTER_HTTP}/${chain_id}/config`;
     const config_token_url = `${ccBase}/tokens`;
     const valid_tokens = [];
-    for (const [, value] of valid_tokens_map) {
-        if (!value || value.length !== 1)
+    for (const token of tokens_map.values()) {
+        if (!(token === null || token === void 0 ? void 0 : token.symbol) || !token.address)
             continue;
-        const token = value[0];
-        const std_token = {
+        if ((0, is_not_arb_token_1.is_not_arb_token)(token.symbol))
+            continue;
+        valid_tokens.push({
+            _id: (token.address || '').toLowerCase(),
             symbol: token.symbol,
+            raw_symbol: token.raw_symbol,
             address: token.address,
-            address_hex: '',
             decimals: token.decimals,
             name: token.name,
             is_token2022: token.is_token_2022,
@@ -39,10 +41,7 @@ const cache_token_config = (chain_id, valid_tokens_map) => __awaiter(void 0, voi
             update_time: (0, index_1.getCurDateTime)(),
             alias: (0, index_1.get_token_symbol_alias)(token.address),
             enable: true,
-        };
-        if ((0, is_not_arb_token_1.is_not_arb_token)(std_token.symbol))
-            continue;
-        valid_tokens.push(std_token);
+        });
     }
     if (valid_tokens.length > 0) {
         const res = (yield axios_1.default.post(config_token_url, valid_tokens, {

package/dist/token/index.d.ts

@@ -4,4 +4,3 @@ export * from './is_not_arb_token';
 export * from './price';
 export * from './token_util';
 export * from './types';
-export * from './zh_pinyin_map';

package/dist/token/index.js

@@ -20,4 +20,3 @@ __exportStar(require("./is_not_arb_token"), exports);
 __exportStar(require("./price"), exports);
 __exportStar(require("./token_util"), exports);
 __exportStar(require("./types"), exports);
-__exportStar(require("./zh_pinyin_map"), exports);

package/dist/token/price/token_price_syncer.d.ts

@@ -20,6 +20,9 @@ export declare class TokenPriceSyncer {
     constructor(opts: TokenPriceSyncerOpts);
     start(): Promise<void>;
     stop(): void;
+    private _is_running;
+    get is_running(): boolean;
     runOnce(): Promise<void>;
+    private _runOnceInner;
     private loadTradeTokensFromCache;
 }

package/dist/token/price/token_price_syncer.js

@@ -15,6 +15,7 @@ class TokenPriceSyncer {
     constructor(opts) {
         this.timer = null;
         this.trade_token_map = new Map();
+        this._is_running = false;
         this.opts = opts;
     }
     start() {
@@ -36,7 +37,23 @@ class TokenPriceSyncer {
             this.timer = null;
         }
     }
+    get is_running() { return this._is_running; }
     runOnce() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._is_running) {
+                (0, __1.log_warn)(`[TokenPriceSyncer] previous run still in flight, skip this tick`);
+                return;
+            }
+            this._is_running = true;
+            try {
+                yield this._runOnceInner();
+            }
+            finally {
+                this._is_running = false;
+            }
+        });
+    }
+    _runOnceInner() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             yield this.loadTradeTokensFromCache();

package/dist/token/token_util.d.ts

@@ -1,3 +1,2 @@
-export declare const formate_token_symbol: (symbol: string) => string;
 export declare const is_valid_symbol: (symbol: string) => boolean;
 export declare function get_token_symbol_alias(token_address: string): string;

package/dist/token/token_util.js

@@ -1,26 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.is_valid_symbol = exports.formate_token_symbol = void 0;
+exports.is_valid_symbol = void 0;
 exports.get_token_symbol_alias = get_token_symbol_alias;
 const __1 = require("..");
-const formate_token_symbol = (symbol) => {
-    return symbol.toUpperCase()
-        .replace('$', '')
-        .replace('WSOL', 'SOL')
-        .replace('WBTC', 'BTC')
-        .replace('WETH', 'ETH').replace('WHETH', 'ETH')
-        .replace('WBNB', 'BNB')
-        .replace('WTRX', 'TRX')
-        .replace('WAVAX', 'AVAX')
-        .replace('WOKB', 'OKB')
-        .trim();
-};
-exports.formate_token_symbol = formate_token_symbol;
 const is_valid_symbol = (symbol) => {
-    return !(0, __1.isEmpty)(symbol) && /^[a-zA-Z0-9_.+-]+$/.test(symbol);
+    return !(0, __1.isEmpty)(symbol) && /^[A-Z0-9]+$/.test(symbol);
 };
 exports.is_valid_symbol = is_valid_symbol;
 function get_token_symbol_alias(token_address) {
-    let token = (0, __1.get_fixed_symbol_address)().find(e => e.address === token_address);
+    const lc = (token_address || '').toLowerCase();
+    let token = (0, __1.get_fixed_symbol_address)().find(e => (e.address || '').toLowerCase() === lc);
     return (token === null || token === void 0 ? void 0 : token.alias) || '';
 }

package/dist/token/types.d.ts

@@ -11,16 +11,14 @@ export interface TokenFixedSymbolAddress {
     address: string;
     is_token2022?: boolean;
 }
-export interface ZhPinyinRow {
-    zh: string;
-    pinyin: string;
-}
 export interface FormattedTokenInfo {
     chainId: number;
+    _id: string;
     address: string;
     programId: string;
     logoURI: string;
     symbol: string;
+    raw_symbol?: string;
     name: string;
     decimals: number;
     is_token_2022: boolean;

package/package.json

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

package/types/index.d.ts

@@ -9,9 +9,18 @@ export interface StandardTokenConfigType {
 }
 
 export interface StandardTokenInfoType {
+    /**
+     * 内部对比/Map key 专用：address.toLowerCase()
+     * 任何 token 比较、Map 索引、fixed_symbol 匹配都用这个；
+     * 链上调用（RPC / tx encoding）必须用 `address` 原值。
+     */
+    _id: string
+    /** 标准化后的 symbol：格式 [A-Z0-9]+，所有缓存/查询/比较都用这个字段 */
     symbol: string
+    /** 原始来源 symbol（Gecko / on-chain ERC20）：用于排查问题、UI 显示，不参与匹配 */
+    raw_symbol?: string
+    /** 链上原始地址（Tron/Solana 区分大小写，必须保留原值） */
     address: string
-    address_hex: string
     decimals: number
     name: string
     is_token2022?: boolean
@@ -37,6 +46,11 @@ export interface StandardDexPoolConfigType {
 }
 
 export interface StandardPoolInfoType {
+    /**
+     * 内部对比/Map key 专用：pool_address.toLowerCase()
+     * 任何 pool 比较、Map 索引都用这个；链上交互必须用 `pool_address` 原值。
+     */
+    _id: string
     program_id?: string // Raydium Liquidity Pool V4
     authority?: string  // Vault owner
     subscribe_type?: string // ws, grpc
@@ -44,7 +58,6 @@ export interface StandardPoolInfoType {
     dex_id: string
     pool_name: string
     pool_address: string
-    pool_address_hex: string
     tokenA: StandardTokenInfoType
     tokenB: StandardTokenInfoType
     vaultA?: string