@clonegod/ttd-sol-common 2.0.79 → 2.0.81

package/dist/quote/index.d.ts

@@ -1,5 +1,4 @@
 export * from './pricing';
-export * from './pool_subscription_registry';
 export * from './pool_event';
 export * from './chain_ops';
 export * from './abstract_dex_quote';

package/dist/quote/index.js

@@ -15,7 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./pricing"), exports);
-__exportStar(require("./pool_subscription_registry"), exports);
 __exportStar(require("./pool_event"), exports);
 __exportStar(require("./chain_ops"), exports);
 __exportStar(require("./abstract_dex_quote"), exports);

package/dist/quote/pool_subscription_registry.js

@@ -52,11 +52,18 @@ async function attachPoolSubscriptionLifecycle(appConfig, pools) {
             + '询价进程必须由 PM2/trade-mgt 以确定进程名启动，否则订阅会被 reconcile 当孤儿清除。');
     }
     await registerPoolSubscriptions(appConfig, pools, quote_app_id);
+    const heartbeatMs = Math.max(5000, parseInt(process.env.SUBSCRIPTION_HEARTBEAT_MS || '30000', 10) || 30000);
+    const heartbeat = setInterval(() => {
+        registerPoolSubscriptions(appConfig, pools, quote_app_id)
+            .catch(e => (0, dist_1.log_warn)(`[pool/subscriptions] heartbeat re-register failed: ${e.message}`));
+    }, heartbeatMs);
+    heartbeat.unref?.();
     let cleaned = false;
     const cleanup = async (sig) => {
         if (cleaned)
             return;
         cleaned = true;
+        clearInterval(heartbeat);
         (0, dist_1.log_info)(`[pool/subscriptions] ${sig} → unregister ${quote_app_id}`);
         await unregisterPoolSubscriptions(appConfig, quote_app_id);
         process.exit(0);

package/dist/trade/abstract_dex_trade.d.ts

@@ -0,0 +1,9 @@
+import { AbastrcatTrade, QuoteResultType, TradeContext } from '@clonegod/ttd-core/dist';
+import { TransactionInstruction } from '@solana/web3.js';
+import { SolTransactionBuilder } from './tx_builder';
+export declare abstract class AbstractSolDexTrade<Q extends QuoteResultType = QuoteResultType> extends AbastrcatTrade {
+    abstract txBuilder: SolTransactionBuilder;
+    protected abstract getQuoteResult(context: TradeContext): Promise<Q> | Q;
+    protected abstract createSwapInstructions(context: TradeContext, quote_result: Q): Promise<TransactionInstruction[]>;
+    execute(context: TradeContext): Promise<string>;
+}

package/dist/trade/abstract_dex_trade.js

@@ -0,0 +1,47 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AbstractSolDexTrade = void 0;
+const dist_1 = require("@clonegod/ttd-core/dist");
+const bs58_1 = __importDefault(require("bs58"));
+const trade_trace_1 = require("./trade_trace");
+const send_1 = require("./send");
+class AbstractSolDexTrade extends dist_1.AbastrcatTrade {
+    async execute(context) {
+        const pair = context.price_msg.pair;
+        const { order_msg, slippage_bps, order_trace_id } = context;
+        const direction = order_msg.aToB ? 'SELL' : 'BUY';
+        const trace = new trade_trace_1.TradeTrace(order_trace_id, pair, direction);
+        trace.set('order_id', order_msg.unique_order_msg_id);
+        trace.set('amount', order_msg.amount);
+        trace.set('slippage', `${slippage_bps / 100}%`);
+        let stage = 'quote';
+        try {
+            const quote_result = await this.getQuoteResult(context);
+            trace.mark('quote');
+            trace.set('exec_price', quote_result.price);
+            stage = 'encode';
+            const swapIxs = await this.createSwapInstructions(context, quote_result);
+            trace.mark('encode');
+            stage = 'build';
+            const { sol_swqos_only } = context.trade_runtime.settings.strategy;
+            const swapTx = this.txBuilder.buildTransactionForSwap(context, swapIxs);
+            trace.mark('build');
+            const txid = bs58_1.default.encode(swapTx.signature);
+            trace.set('txid', txid);
+            stage = 'send';
+            new send_1.TransactionSender().sendTransaction(context, swapTx, sol_swqos_only);
+            trace.mark('sent');
+            trace.flush();
+            return txid;
+        }
+        catch (err) {
+            trace.markError(stage, err instanceof Error ? err.message : String(err));
+            trace.flush();
+            throw err;
+        }
+    }
+}
+exports.AbstractSolDexTrade = AbstractSolDexTrade;

package/dist/trade/index.d.ts

@@ -1,3 +1,5 @@
+export * from './trade_trace';
+export * from './abstract_dex_trade';
 export * from './tx_result_check';
 export * from './tx_result_parse';
 export * from './tx_builder';

package/dist/trade/index.js

@@ -14,6 +14,8 @@ 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("./trade_trace"), exports);
+__exportStar(require("./abstract_dex_trade"), exports);
 __exportStar(require("./tx_result_check"), exports);
 __exportStar(require("./tx_result_parse"), exports);
 __exportStar(require("./tx_builder"), exports);

package/dist/trade/trade_trace.d.ts

@@ -0,0 +1,17 @@
+export declare class TradeTrace {
+    readonly orderId: string;
+    readonly pair: string;
+    readonly direction: string;
+    private startTime;
+    private marks;
+    private data;
+    private error;
+    constructor(orderId: string, pair?: string, direction?: string);
+    mark(name: string): void;
+    set(key: string, value: any): void;
+    markError(stage: string, message: string): void;
+    private buildTimeline;
+    getAbsoluteMarks(): Record<string, number>;
+    getStartTime(): number;
+    flush(): void;
+}

package/dist/trade/trade_trace.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TradeTrace = void 0;
+const ttd_core_1 = require("@clonegod/ttd-core");
+const logger = (0, ttd_core_1.createLogger)(__filename);
+class TradeTrace {
+    constructor(orderId, pair = '', direction = '') {
+        this.orderId = orderId;
+        this.pair = pair;
+        this.direction = direction;
+        this.marks = [];
+        this.data = {};
+        this.error = null;
+        this.startTime = Date.now();
+    }
+    mark(name) {
+        this.marks.push({ name, elapsed: Date.now() - this.startTime });
+    }
+    set(key, value) {
+        this.data[key] = value;
+    }
+    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`;
+    }
+    getAbsoluteMarks() {
+        const result = {};
+        for (const m of this.marks) {
+            result[m.name] = this.startTime + m.elapsed;
+        }
+        return result;
+    }
+    getStartTime() {
+        return this.startTime;
+    }
+    flush() {
+        const timeline = this.buildTimeline();
+        if (this.error) {
+            logger.error(`[TRADE FAILED] ${this.orderId} | ${this.pair} ${this.direction} | stage=${this.error.stage} | ${this.error.message}`, new Error(this.error.message));
+            logger.info(`[TRADE FAILED detail] ${this.orderId}`, {
+                timeline,
+                error_stage: this.error.stage,
+                ...this.data,
+            });
+        }
+        else {
+            logger.info(`[TRADE OK] ${this.orderId} | ${this.pair} ${this.direction}`, {
+                timeline,
+                ...this.data,
+            });
+        }
+    }
+}
+exports.TradeTrace = TradeTrace;

package/dist/trade/tx_result_check.js

@@ -237,6 +237,7 @@ class TransactionResultChecker extends dist_1.AbstractTransactionResultCheck {
             execution: trade_extra_info,
             c_id
         };
+        (0, dist_1.report_data_to_analyze)('TradeResultType', trade_result);
         return trade_result;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-sol-common",
-  "version": "2.0.79",
+  "version": "2.0.81",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/quote/index.ts

@@ -1,5 +1,4 @@
 export * from './pricing'
-export * from './pool_subscription_registry'
 export * from './pool_event'
 export * from './chain_ops'
 export * from './abstract_dex_quote'

package/src/trade/abstract_dex_trade.ts

@@ -0,0 +1,72 @@
+import { AbastrcatTrade, QuoteResultType, TradeContext } from '@clonegod/ttd-core/dist'
+import { TransactionInstruction } from '@solana/web3.js'
+import bs58 from 'bs58'
+import { TradeTrace } from './trade_trace'
+import { SolTransactionBuilder } from './tx_builder'
+import { TransactionSender } from './send'
+
+/**
+ * AbstractSolDexTrade —— Solana 交易执行基类（对齐 BSC/BASE 的 abstract_dex_trade）。
+ *
+ * 共享一套交易热路径 + TradeTrace 打点（一处维护，8 个 DEX 共用），DEX 只实现两个差异点：
+ *   - getQuoteResult：重新询价，拿 exec 用的 quote_result（可同步可异步）。
+ *   - createSwapInstructions：组装这笔 swap 的指令（内部自取 poolData / account / 0-RPC 组装）。
+ *
+ * 流程（SOL 模型，非 EVM）：recv → quote → encode → build(签名) → sent(Helius Sender 发出，fire-and-forget；
+ *   结果走 tx_result_check 异步回来)。无 nonce / caller。
+ *
+ * 输出对齐 BSC：成功 `[TRADE OK] <id> | pair dir { timeline: recv -> quote(Xms) -> encode -> build -> sent = N ms, ... }`，
+ *   失败 `[TRADE FAILED] ... stage=<阶段> | <错误>`。
+ */
+export abstract class AbstractSolDexTrade<Q extends QuoteResultType = QuoteResultType> extends AbastrcatTrade {
+    /** DEX 子类持有（构造时 new SolTransactionBuilder(appConfig)）；基类只调用 buildTransactionForSwap。 */
+    abstract txBuilder: SolTransactionBuilder
+
+    /** DEX 实现：重新询价（exec 用）。Q 允许 DEX 用自己的 quote_result 子类型（如 PumfunQuoteResultType）。 */
+    protected abstract getQuoteResult(context: TradeContext): Promise<Q> | Q
+    /** DEX 实现：组装 swap 指令（内部自取 poolData / 0-RPC）。返回指令数组。 */
+    protected abstract createSwapInstructions(context: TradeContext, quote_result: Q): Promise<TransactionInstruction[]>
+
+    async execute(context: TradeContext): Promise<string> {
+        const pair = context.price_msg.pair
+        const { order_msg, slippage_bps, order_trace_id } = context
+        const direction = order_msg.aToB ? 'SELL' : 'BUY'
+
+        const trace = new TradeTrace(order_trace_id, pair, direction)
+        trace.set('order_id', order_msg.unique_order_msg_id)
+        trace.set('amount', order_msg.amount)
+        trace.set('slippage', `${slippage_bps / 100}%`)
+
+        let stage = 'quote'
+        try {
+            const quote_result = await this.getQuoteResult(context)
+            trace.mark('quote')
+            trace.set('exec_price', quote_result.price)
+
+            stage = 'encode'
+            const swapIxs = await this.createSwapInstructions(context, quote_result)
+            trace.mark('encode')
+
+            // 构建交易（签名）
+            stage = 'build'
+            const { sol_swqos_only } = context.trade_runtime.settings.strategy
+            const swapTx = this.txBuilder.buildTransactionForSwap(context, swapIxs)
+            trace.mark('build')
+
+            const txid = bs58.encode(swapTx.signature)
+            trace.set('txid', txid)
+
+            // 发送：只走 Helius Sender（swqos + jito 路由由 Sender 负责），fire-and-forget
+            stage = 'send'
+            new TransactionSender().sendTransaction(context, swapTx, sol_swqos_only)
+            trace.mark('sent')
+
+            trace.flush()
+            return txid
+        } catch (err) {
+            trace.markError(stage, err instanceof Error ? err.message : String(err))
+            trace.flush()
+            throw err
+        }
+    }
+}

package/src/trade/index.ts

@@ -1,3 +1,5 @@
+export * from './trade_trace'
+export * from './abstract_dex_trade'
 export * from './tx_result_check'
 export * from './tx_result_parse'
 export * from './tx_builder'

package/src/trade/trade_trace.ts

@@ -0,0 +1,98 @@
+import { createLogger } from '@clonegod/ttd-core';
+
+const logger = createLogger(__filename);
+
+/**
+ * TradeTrace — 交易链路追踪（对齐 BSC/BASE ttd-{bsc,base}-common/trade/trade_trace.ts，逐字节一致）
+ *
+ * 在交易热路径中收集关键时间点和数据，交易完成后一次性输出结构化日志。
+ * 不改变现有 log_info 逻辑，只是额外收集数据。
+ *
+ * 用法：
+ *   const trace = new TradeTrace(order_trace_id, 'THREE/SOL', 'BUY');
+ *   trace.mark('encode');
+ *   trace.set('txid', '...');
+ *   trace.flush();  // 一次性输出
+ */
+export class TradeTrace {
+    private startTime: number;
+    private marks: Array<{ name: string; elapsed: number }> = [];
+    private data: Record<string, any> = {};
+    private error: { stage: string; message: string } | null = null;
+
+    constructor(
+        public readonly orderId: string,
+        public readonly pair: string = '',
+        public readonly direction: string = '',
+    ) {
+        this.startTime = Date.now();
+    }
+
+    /** 记录一个时间点 */
+    mark(name: string): void {
+        this.marks.push({ name, elapsed: Date.now() - this.startTime });
+    }
+
+    /** 记录键值数据 */
+    set(key: string, value: any): void {
+        this.data[key] = value;
+    }
+
+    /** 记录错误 */
+    markError(stage: string, message: string): void {
+        this.error = { stage, message };
+    }
+
+    /**
+     * 构建可视化 timeline 字符串：
+     *   recv -> quote(2ms) -> encode(2ms) -> build(11ms) -> sent(33ms) = 48ms
+     * 每段括号内是该阶段耗时（增量，非累计）
+     */
+    private buildTimeline(): string {
+        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`;
+    }
+
+    /** 返回各 mark 的绝对时间戳 (ms) */
+    getAbsoluteMarks(): Record<string, number> {
+        const result: Record<string, number> = {};
+        for (const m of this.marks) {
+            result[m.name] = this.startTime + m.elapsed;
+        }
+        return result;
+    }
+
+    /** 返回 trace 起始时间 (ms) */
+    getStartTime(): number {
+        return this.startTime;
+    }
+
+    /** 一次性输出结构化日志 */
+    flush(): void {
+        const timeline = this.buildTimeline();
+
+        if (this.error) {
+            logger.error(
+                `[TRADE FAILED] ${this.orderId} | ${this.pair} ${this.direction} | stage=${this.error.stage} | ${this.error.message}`,
+                new Error(this.error.message),
+            );
+            logger.info(`[TRADE FAILED detail] ${this.orderId}`, {
+                timeline,
+                error_stage: this.error.stage,
+                ...this.data,
+            });
+        } else {
+            logger.info(`[TRADE OK] ${this.orderId} | ${this.pair} ${this.direction}`, {
+                timeline,
+                ...this.data,
+            });
+        }
+    }
+}

package/src/trade/tx_result_check.ts

@@ -1,5 +1,5 @@
 import { OrderMessageType, PriceMessageType, StandardPoolInfoType, StandardSwapDetailType, TradeBroadcastType, TradeResultBalanceChangeType, TradeResultType, TradeTimeFlowType } from "@clonegod/ttd-core"
-import { AbstractTransactionResultCheck, getServerInfo, isEmpty, LOCAL_EVENT_NAME, log_error, log_info, log_warn, TradeContext, TRANSACTION_STATE_FAILED, TRANSACTION_STATE_PROCESSING, TRANSACTION_STATE_SUCCESS } from "@clonegod/ttd-core/dist"
+import { AbstractTransactionResultCheck, getServerInfo, isEmpty, LOCAL_EVENT_NAME, log_error, log_info, log_warn, report_data_to_analyze, TradeContext, TRANSACTION_STATE_FAILED, TRANSACTION_STATE_PROCESSING, TRANSACTION_STATE_SUCCESS } from "@clonegod/ttd-core/dist"
 import { Connection, ParsedTransactionWithMeta, PublicKey } from "@solana/web3.js"
 import { EventEmitter } from 'events'
 import { COMMITMENT_LEVEL } from "../common"
@@ -339,6 +339,10 @@ export class TransactionResultChecker extends AbstractTransactionResultCheck {
             c_id
         }
 
+        // 对齐 core AbstractTransactionResultCheck.map_swap_result_to_tx_result：本方法是 core 的覆盖拷贝，
+        // 之前漏掉了 core 末尾这行上报 → analyze 交易列表一直空。analyze 按 txid 去重，重复上报幂等。
+        report_data_to_analyze('TradeResultType', trade_result)
+
         return trade_result
     }
 

package/src/quote/pool_subscription_registry.ts

@@ -1,87 +0,0 @@
-import { AppConfig, HttpUtil, log_info, log_warn, SERVICE_PORT, StandardPoolInfoType } from '@clonegod/ttd-core/dist'
-import { resolveGrpcProvider } from '../grpc/grpc_provider_registry'
-
-/**
- * 按需订阅 —— 生产端（询价进程调用）。对齐 BSC/BASE/SUI：询价进程通过 config-center 声明所需池子，
- * config-center 写 `${chain}:pool:subscriptions` Hash + 广播 `:change`，stream-quote 消费后订阅 Helius。
- *
- * Solana 适配（与 BSC 的差异）：
- *  - **单 Helius provider，且对齐 SUI 由运维在 analyze Config/RPC 页配（type=grpc, endpoint=laserstream URL, auth_token=API key）**。
- *    本 helper **不自动种 provider**；register 用 `resolveGrpcProvider` 解析出 analyze 配的 provider id（无配 fail-loud）。
- *  - **base58 地址大小写敏感**：依赖 config-center `lower()` 已改为 0x 感知（非 0x 原样保留），不破坏地址。
- */
-
-function configCenterBase(appConfig: AppConfig): string {
-    const chain = appConfig.env_args.chain_id // SOLANA
-    let host = String(appConfig.env_args.config_center_host || '127.0.0.1').trim()
-    // host 可能含端口(127.0.0.1:4000)或不含(127.0.0.1)；不含则补 CONFIG_CENTER_HTTP
-    if (!host.includes(':')) host = `${host}:${SERVICE_PORT.CONFIG_CENTER_HTTP}`
-    return `http://${host}/${chain}/config`
-}
-
-/** 注册一批池子订阅（每池 POST config-center /quote/register），provider_ids 用 analyze 配的 grpc provider。 */
-export async function registerPoolSubscriptions(
-    appConfig: AppConfig,
-    pools: StandardPoolInfoType[],
-    quote_app_id: string,
-): Promise<void> {
-    // provider 由运维在 analyze Config/RPC 配（type=grpc）；解析其 id 供 register 引用，无配 fail-loud
-    const provider = await resolveGrpcProvider(appConfig.arb_cache.redis_cmd, appConfig.env_args.chain_id)
-    const provider_ids = [provider.id]
-
-    const base = configCenterBase(appConfig)
-    let ok = 0
-    for (const p of pools) {
-        try {
-            await HttpUtil.post(`${base}/quote/register`, {
-                pool_address: p.pool_address,
-                provider_ids,
-                quote_app_id,
-                pair: p.pair,
-                dex_id: p.dex_id,
-                pool_name: p.pool_name,
-                fee_rate: p.fee_rate,
-            })
-            ok++
-        } catch (e: any) {
-            log_warn(`[pool/subscriptions] register ${p.pool_address} failed: ${e.message}`)
-        }
-    }
-    log_info(`[pool/subscriptions] registered ${ok}/${pools.length} pools by ${quote_app_id} → provider=${provider.id}`)
-}
-
-/** 注销本进程注册的所有池子订阅（按 quote_app_id）。 */
-export async function unregisterPoolSubscriptions(appConfig: AppConfig, quote_app_id: string): Promise<void> {
-    try {
-        await HttpUtil.post(`${configCenterBase(appConfig)}/quote/unregister`, { quote_app_id })
-        log_info(`[pool/subscriptions] unregistered all pools by ${quote_app_id}`)
-    } catch (e: any) {
-        log_warn(`[pool/subscriptions] unregister failed: ${e.message}`)
-    }
-}
-
-/**
- * 询价进程启动后调用一次：确保 helius provider + 注册全部池子 + 装退出时自动 unregister。
- * quote_app_id **必须 = PM2 进程名**（pm2 注入 process.env.name），与 trade-mgt register/reconcile 用的 app_id 一致。
- * 否则 trade-mgt 的 60s reconcile 按 PM2 进程名核对，会把本进程自注册的订阅当"孤儿"注销 → 订阅消失、收不到事件。
- * **取不到则 fail-loud（绝不兜底）**：塌成 'sol-quote' 这类 PM2 里不存在的名字 = 必被 reconcile 清掉，等于没注册还掩盖问题。
- */
-export async function attachPoolSubscriptionLifecycle(appConfig: AppConfig, pools: StandardPoolInfoType[]): Promise<void> {
-    const quote_app_id = process.env.name || String(appConfig.env_args.app_name || '')
-    if (!quote_app_id) {
-        throw new Error('[pool/subscriptions] 无法确定 quote_app_id：process.env.name(PM2 进程名) 与 APP_NAME 均为空。'
-            + '询价进程必须由 PM2/trade-mgt 以确定进程名启动，否则订阅会被 reconcile 当孤儿清除。')
-    }
-    await registerPoolSubscriptions(appConfig, pools, quote_app_id)
-
-    let cleaned = false
-    const cleanup = async (sig: string) => {
-        if (cleaned) return
-        cleaned = true
-        log_info(`[pool/subscriptions] ${sig} → unregister ${quote_app_id}`)
-        await unregisterPoolSubscriptions(appConfig, quote_app_id)
-        process.exit(0)
-    }
-    process.on('SIGINT', () => void cleanup('SIGINT'))
-    process.on('SIGTERM', () => void cleanup('SIGTERM'))
-}