@clonegod/ttd-core 3.1.111 → 3.1.113

package/dist/cache/arb_cache.js

@@ -908,7 +908,7 @@ class ArbCache {
             console.log(`=================================================================================`);
             console.log(`|                              TRADE GROUP RUNTIME                              |`);
             console.log(`=================================================================================`);
-            console.dir(_trade_runtime, { depth: 4 });
+            console.dir(_trade_runtime, { depth: process.env.LOG_DEPTH ? Number(process.env.LOG_DEPTH) : null });
             (0, index_1.log_trace)(`create_trade_runtime, end`);
             return trade_runtime;
         });

package/dist/index.d.ts

@@ -18,7 +18,7 @@ export * from './chains';
 export * from './log_bus';
 export * from './ws';
 export * from './util';
-export type { StandardTokenConfigType, StandardTokenInfoType, StandardPoolConfigType, StandardDexPoolConfigType, StandardPoolInfoType, StandardPairType, TradeServiceConfigType, TradeGroupType, TradePairType, TradePairDexPoolsType, TradeSettingsType, RpcInfoType, TradeStrategyType, TradeCommandLineArgs, TradeRuntimeType, TradeProcessInstanceType, TokenPriceWithAmountType, QuoteResultType, PriceMessageType, QuoteSourceType, UniqueOrderbookIdType, PriceType, QuoteTimeInfoType, OrderbookPriceType, Ladder, OrderMessageType, OrderSubmitResultType, OrderSubmitResponseType, StandardSwapDetailType, TokenBalChangeType, TokenBalanceChangeType, TradeResponseType, TradeResultType, TradeResultBalanceChangeType, TradeExecutionInfoType, TradeTimeFlowType, TradeBroadcastType, TradeGasFeeType, ServerInfoType, SendTxLogType, WalletInfoType, WalletTokenBalanceInfoType, RedisConfigChangeEventMessageType, RedisOrderEventMessageType, RedisQuoteEventMessageType, PreTradeEventType, ProviderComparisonType, ProviderArrivalType, OnTradeType, OnTradePriceType, OnTradeDepthType, OnTradeExecutionType, OnTradeResultType, AnalyzeDepthLevelType, AnalyzeTierLevelType, AnalyzeTokenAmountType, PostTradeType, AnalyzeQuoteSnapshotType, AnalyzePoolEventType, AnalyzeEventSummaryType, AnalyzeSameBlockType, } from '../types';
+export type { StandardTokenConfigType, StandardTokenInfoType, StandardPoolConfigType, StandardDexPoolConfigType, StandardPoolInfoType, PoolTokenTaxType, PoolTokenTaxRowType, StandardPairType, TradeServiceConfigType, TradeGroupType, TradePairType, TradePairDexPoolsType, TradeSettingsType, RpcInfoType, TradeStrategyType, TradeCommandLineArgs, TradeRuntimeType, TradeProcessInstanceType, TokenPriceWithAmountType, QuoteResultType, PriceMessageType, QuoteSourceType, UniqueOrderbookIdType, PriceType, QuoteTimeInfoType, OrderbookPriceType, Ladder, OrderMessageType, OrderSubmitResultType, OrderSubmitResponseType, StandardSwapDetailType, TokenBalChangeType, TokenBalanceChangeType, TradeResponseType, TradeResultType, TradeResultBalanceChangeType, TradeExecutionInfoType, TradeTimeFlowType, TradeBroadcastType, TradeGasFeeType, ServerInfoType, SendTxLogType, WalletInfoType, WalletTokenBalanceInfoType, RedisConfigChangeEventMessageType, RedisOrderEventMessageType, RedisQuoteEventMessageType, PreTradeEventType, ProviderComparisonType, ProviderArrivalType, OnTradeType, OnTradePriceType, OnTradeDepthType, OnTradeExecutionType, OnTradeResultType, AnalyzeDepthLevelType, AnalyzeTierLevelType, AnalyzeTokenAmountType, PostTradeType, AnalyzeQuoteSnapshotType, AnalyzePoolEventType, AnalyzeEventSummaryType, AnalyzeSameBlockType, } from '../types';
 export declare const FAILED = "FAILED";
 export declare const SUCCESS = "SUCCESS";
 export declare const NOT_FOUND = "NOT_FOUND";

package/dist/pool/cache_pool_config.js

@@ -19,6 +19,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 pool_token_taxes_1 = require("./pool_token_taxes");
 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;
@@ -26,6 +27,19 @@ const cache_pool_config = (chain_id, tokens_map, pools_map) => __awaiter(void 0,
     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_pool_url = `${ccBase}/pools`;
+    const taxByPool = new Map();
+    for (const row of (0, pool_token_taxes_1.get_pool_token_taxes)()) {
+        const key = row.pool_address.toLowerCase();
+        if (!taxByPool.has(key))
+            taxByPool.set(key, []);
+        taxByPool.get(key).push({
+            token_address: row.token_address.toLowerCase(),
+            buy_tax_bps: row.buy_tax_bps,
+            sell_tax_bps: row.sell_tax_bps,
+            note: row.note,
+        });
+    }
+    const stamped_tax_pools = [];
     const body = [];
     for (const [dex_id, pool_list] of pools_map) {
         const valid_pool_list = [];
@@ -36,6 +50,9 @@ const cache_pool_config = (chain_id, tokens_map, pools_map) => __awaiter(void 0,
                 skip_pool_list.push(pool);
                 continue;
             }
+            const token_taxes = taxByPool.get(pool.pool_address.toLowerCase());
+            if (token_taxes)
+                stamped_tax_pools.push(`${pool.pool_name}(${pool.pool_address})`);
             valid_pool_list.push({
                 _id: pool._id,
                 program_id: pool.program_id,
@@ -61,6 +78,7 @@ const cache_pool_config = (chain_id, tokens_map, pools_map) => __awaiter(void 0,
                 vol_24h: pool.vol_24h,
                 update_time: (0, index_1.getCurDateTime)(),
                 is_trade_native_token: pool.is_trade_native_token,
+                token_taxes,
                 enable: true,
             });
             count = count + 1;
@@ -75,6 +93,9 @@ const cache_pool_config = (chain_id, tokens_map, pools_map) => __awaiter(void 0,
         })).data;
         (0, index_1.log_trace)('cache_pool_config, res', res);
     }
+    if (taxByPool.size > 0) {
+        (0, index_1.log_info)(`cache_pool_config token_taxes: 配置 ${taxByPool.size} 个池子, 本轮盖章 ${stamped_tax_pools.length} 个: ${stamped_tax_pools.join(', ')}`);
+    }
     (0, index_1.log_info)(`cache_pool_config finished! sync pool count:${count}, skip: ${skip_pool_list.length}`);
     skip_pool_list.sort((a, b) => a.pair.localeCompare(b.pair));
     (0, index_1.writeFile)(`dist/${chain_id.toLowerCase()}_skip_pool_list.json`, JSON.stringify({

package/dist/pool/index.d.ts

@@ -1,3 +1,4 @@
 export * from './types';
 export * from './pool_util';
 export * from './cache_pool_config';
+export * from './pool_token_taxes';

package/dist/pool/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types"), exports);
 __exportStar(require("./pool_util"), exports);
 __exportStar(require("./cache_pool_config"), exports);
+__exportStar(require("./pool_token_taxes"), exports);

package/dist/pool/pool_token_taxes.d.ts

@@ -0,0 +1,3 @@
+import { PoolTokenTaxRowType } from '../../types';
+export declare const get_pool_token_taxes: () => PoolTokenTaxRowType[];
+export declare function assertPoolTokenTaxRows(data: any, source: string): void;

package/dist/pool/pool_token_taxes.js

@@ -0,0 +1,52 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.get_pool_token_taxes = void 0;
+exports.assertPoolTokenTaxRows = assertPoolTokenTaxRows;
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const core_env_1 = require("../appconfig/core_env");
+const index_1 = require("../index");
+let _first_load_logged = false;
+function getPoolTokenTaxesFilePath(chainId) {
+    return path_1.default.join(os_1.default.homedir(), 'data', 'onchain_data', chainId.toLowerCase(), 'pool_token_taxes.json');
+}
+const get_pool_token_taxes = () => {
+    const coreEnv = (0, core_env_1.getCoreEnv)();
+    const chain_id = coreEnv.chain_id;
+    if (!chain_id) {
+        return [];
+    }
+    const filepath = getPoolTokenTaxesFilePath(chain_id);
+    if (!fs_1.default.existsSync(filepath)) {
+        return [];
+    }
+    const data = JSON.parse(fs_1.default.readFileSync(filepath, 'utf-8'));
+    assertPoolTokenTaxRows(data, filepath);
+    if (!_first_load_logged) {
+        _first_load_logged = true;
+        (0, index_1.log_info)(`[pool_token_taxes] loaded ${data.length} entries from ${filepath}`);
+    }
+    return data;
+};
+exports.get_pool_token_taxes = get_pool_token_taxes;
+function assertPoolTokenTaxRows(data, source) {
+    if (!Array.isArray(data)) {
+        throw new Error(`[pool_token_taxes] ${source}: 必须是 JSON 数组`);
+    }
+    const bad = [];
+    for (const row of data) {
+        const okAddr = (v) => typeof v === 'string' && v.trim().length > 0;
+        const okBps = (v) => Number.isInteger(v) && v >= 0 && v <= 9999;
+        if (!okAddr(row === null || row === void 0 ? void 0 : row.pool_address) || !okAddr(row === null || row === void 0 ? void 0 : row.token_address) || !okBps(row === null || row === void 0 ? void 0 : row.buy_tax_bps) || !okBps(row === null || row === void 0 ? void 0 : row.sell_tax_bps)) {
+            bad.push(JSON.stringify(row));
+        }
+    }
+    if (bad.length > 0) {
+        throw new Error(`[pool_token_taxes] ${source}: ${bad.length} 行非法（要求 pool_address/token_address 非空、` +
+            `buy_tax_bps/sell_tax_bps 为 0~9999 整数）: ${bad.slice(0, 5).join('; ')}`);
+    }
+}

package/dist/trade/abstract_tx_check.js

@@ -149,6 +149,9 @@ class AbstractTransactionResultCheck {
             execution: trade_extra_info,
             c_id
         };
+        const analyzeExtra = swap_result.analyze_extra;
+        if (analyzeExtra && typeof analyzeExtra === 'object')
+            Object.assign(trade_result, analyzeExtra);
         (0, analyze_1.report_data_to_analyze)('TradeResultType', trade_result);
         return trade_result;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clonegod/ttd-core",
-    "version": "3.1.111",
+    "version": "3.1.113",
     "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

@@ -47,6 +47,25 @@ export interface StandardDexPoolConfigType {
     pool_list: StandardPoolInfoType[]
 }
 
+/**
+ * 池子维度 token 转账税（fee-on-transfer，如 flap.sh 税币 MarsCoin）。
+ * 税挂池子维度而非 token 维度：同一 token 可能只在部分池收税
+ * （MARS 只在 V2 主池收 3%，V3 池免税）。
+ *   buy_tax_bps  = 池子转出该 token 时按转账金额收（用户买入实收打折）
+ *   sell_tax_bps = 该 token 转入池子时收（池子实收打折）
+ */
+export interface PoolTokenTaxType {
+    token_address: string
+    buy_tax_bps: number
+    sell_tax_bps: number
+    note?: string
+}
+
+/** pool_token_taxes.json 文件行：税配置表（UI 维护），market-data 同步时按 pool_address 盖章进 poolInfo */
+export interface PoolTokenTaxRowType extends PoolTokenTaxType {
+    pool_address: string
+}
+
 export interface StandardPoolInfoType {
     /**
      * 内部对比/Map key 专用：pool_address.toLowerCase()
@@ -78,6 +97,8 @@ export interface StandardPoolInfoType {
     vol_24h?: string|number
     update_time?: string
     is_trade_native_token?: boolean // POOL 是否交易的链原生代币（BNB）
+    /** token 转账税（fee-on-transfer）；无税池子不带该字段。来源：pool_token_taxes.json（UI 配置），market-data 同步时盖章 */
+    token_taxes?: PoolTokenTaxType[]
 }