@clonegod/ttd-sol-common 2.0.40 → 2.0.42

package/dist/config/SolanaTradeAppConfig.d.ts

@@ -3,6 +3,7 @@ import { Connection, Keypair } from "@solana/web3.js";
 export declare class SolanaTradeAppConfig extends AbstractTradeAppConfig {
     connection: Connection;
     keypair: Keypair;
+    private ws_client;
     constructor();
     init(): Promise<void>;
     subscribe_wallet_raw_txn_event(): void;

package/dist/config/SolanaTradeAppConfig.js

@@ -5,6 +5,7 @@ const dist_1 = require("@clonegod/ttd-core/dist");
 class SolanaTradeAppConfig extends dist_1.AbstractTradeAppConfig {
     constructor() {
         super();
+        this.ws_client = null;
     }
     async init() {
         await super.init();
@@ -12,6 +13,19 @@ class SolanaTradeAppConfig extends dist_1.AbstractTradeAppConfig {
         (0, dist_1.log_info)('SolanaTradeAppConfig init ...');
     }
     subscribe_wallet_raw_txn_event() {
+        if (this.is_already_subscribe_wallet_raw_txn) {
+            if (this.ws_client && this.ws_client.isConnected()) {
+                return;
+            }
+            else {
+                (0, dist_1.log_info)('subscribe_wallet_raw_txn_event was subscribed but connection lost, reconnecting...');
+                if (this.ws_client) {
+                    this.ws_client.disconnect();
+                    this.ws_client = null;
+                }
+            }
+        }
+        this.is_already_subscribe_wallet_raw_txn = true;
         const transactionHandler = async (messageStr) => {
             let messageObj = messageStr;
             if (typeof messageStr === 'string') {
@@ -22,9 +36,11 @@ class SolanaTradeAppConfig extends dist_1.AbstractTradeAppConfig {
             this.emit(dist_1.LOCAL_EVENT_NAME.EVENT_WALLET_TRANSACTION + '#' + tx_id, messageObj);
         };
         const ws_port = process.env.STREAM_WS_TRADE_PORT || 10002;
-        const ws = new dist_1.WebSocketClient(`ws://127.0.0.1:${ws_port}`);
-        ws.onMessage(transactionHandler);
-        ws.connect();
+        const ws_url = `ws://127.0.0.1:${ws_port}`;
+        this.ws_client = new dist_1.WebSocketClient(ws_url);
+        this.ws_client.onMessage(transactionHandler);
+        this.ws_client.connect();
+        (0, dist_1.log_info)(`subscribe_wallet_raw_txn_event, WebSocket connecting to ${ws_url}`);
     }
 }
 exports.SolanaTradeAppConfig = SolanaTradeAppConfig;

package/dist/trade/tx_result_check.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionResultChecker = void 0;
 const dist_1 = require("@clonegod/ttd-core/dist");
 const web3_js_1 = require("@solana/web3.js");
-const tx_result_parse_1 = require("./tx_result_parse");
 const common_1 = require("../common");
+const tx_result_parse_1 = require("./tx_result_parse");
 class TransactionResultChecker extends dist_1.AbstractTransactionResultCheck {
     constructor(env_args, event_emitter) {
         super(env_args, event_emitter);
@@ -36,23 +36,49 @@ class TransactionResultChecker extends dist_1.AbstractTransactionResultCheck {
     }
     on_subscibe_transaction() {
         this.event_emitter.once(dist_1.LOCAL_EVENT_NAME.EVENT_WALLET_TRANSACTION + '#' + this.txid, (message) => {
+            var _a, _b, _c;
             try {
                 this.trade_result_already_processed = true;
                 let messageObj = message;
                 if (typeof message === 'string') {
                     messageObj = JSON.parse(message);
                 }
-                const result = messageObj.params.result;
-                const _txid = result.signature;
-                const slot = result.slot;
-                (0, dist_1.log_info)('check txid:', { _txid, txid: this.txid, slot });
-                result.transaction.transaction.signatures = [_txid];
+                let result;
+                let _txid;
+                let slot;
+                let transactionData;
+                let meta;
+                let version;
+                if (messageObj.transaction && messageObj.transaction.signature) {
+                    _txid = messageObj.transaction.signature;
+                    slot = messageObj.slot;
+                    transactionData = messageObj.transaction.transaction;
+                    meta = messageObj.transaction.meta;
+                    version = messageObj.transaction.version !== undefined ? messageObj.transaction.version : 0;
+                }
+                else if (messageObj.params && messageObj.params.result) {
+                    result = messageObj.params.result;
+                    _txid = result.signature;
+                    slot = result.slot;
+                    transactionData = (_a = result.transaction) === null || _a === void 0 ? void 0 : _a.transaction;
+                    meta = (_b = result.transaction) === null || _b === void 0 ? void 0 : _b.meta;
+                    version = ((_c = result.transaction) === null || _c === void 0 ? void 0 : _c.version) !== undefined ? result.transaction.version : 0;
+                }
+                else {
+                    (0, dist_1.log_error)('Invalid message format: unrecognized structure', new Error(JSON.stringify(messageObj)));
+                    return;
+                }
+                if (_txid !== this.txid) {
+                    (0, dist_1.log_error)('[tx_result_check] txid mismatch!', new Error(JSON.stringify({ _txid, txid: this.txid, slot })));
+                    return;
+                }
+                transactionData.signatures = [_txid];
                 let tx_result = {
-                    slot,
-                    transaction: result.transaction.transaction,
-                    meta: result.transaction.meta,
-                    blockTime: Date.now() / 1000,
-                    version: result.transaction.version
+                    slot: slot,
+                    transaction: transactionData,
+                    meta: meta || null,
+                    blockTime: messageObj.blockTime || (Date.now() / 1000),
+                    version: (typeof version === 'number' && version === 0) ? 0 : version
                 };
                 let swap_result = this.transactionParser.parse_transaction_data(tx_result, this.pool_info);
                 let trade_result = this.map_swap_result_to_tx_result(swap_result);
@@ -67,7 +93,7 @@ class TransactionResultChecker extends dist_1.AbstractTransactionResultCheck {
                 console.log('---------------------------------------------------->');
             }
             catch (err) {
-                (0, dist_1.log_error)('parse geyser stream message error!', err);
+                (0, dist_1.log_error)('parse stream transaction message error!', err);
                 return;
             }
         });

package/package.json

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

package/src/config/SolanaTradeAppConfig.ts

@@ -7,6 +7,9 @@ export class SolanaTradeAppConfig extends AbstractTradeAppConfig {
     public connection: Connection;
     public keypair: Keypair;
     
+    // WebSocket 客户端实例，用于订阅交易结果
+    private ws_client: WebSocketClient | null = null;
+    
     constructor() {
         super();
     }
@@ -19,6 +22,22 @@ export class SolanaTradeAppConfig extends AbstractTradeAppConfig {
 
     // 订阅 Wallet 在链上发生的tx data
     subscribe_wallet_raw_txn_event(): void {
+        // 检查是否已经订阅
+        if(this.is_already_subscribe_wallet_raw_txn) {
+            // 如果已订阅，检查连接状态
+            if(this.ws_client && this.ws_client.isConnected()) {
+                return;
+            } else {
+                // 连接已断开，需要重新连接
+                log_info('subscribe_wallet_raw_txn_event was subscribed but connection lost, reconnecting...');
+                if(this.ws_client) {
+                    this.ws_client.disconnect();
+                    this.ws_client = null;
+                }
+            }
+        }
+        this.is_already_subscribe_wallet_raw_txn = true;
+
         // 定义处理函数，便于后续移除
         const transactionHandler = async (messageStr: any) => {
             let messageObj = messageStr
@@ -34,9 +53,12 @@ export class SolanaTradeAppConfig extends AbstractTradeAppConfig {
         };
 
         const ws_port = process.env.STREAM_WS_TRADE_PORT || 10002;
-        const ws = new WebSocketClient(`ws://127.0.0.1:${ws_port}`)
-        ws.onMessage(transactionHandler);
-        ws.connect();
+        const ws_url = `ws://127.0.0.1:${ws_port}`;
+        this.ws_client = new WebSocketClient(ws_url)
+        this.ws_client.onMessage(transactionHandler);
+        this.ws_client.connect();
+
+        log_info(`subscribe_wallet_raw_txn_event, WebSocket connecting to ${ws_url}`);
 
         // 不断开连接
         // setTimeout(() => { ws.disconnect(); }, 6000);

package/src/trade/tx_result_check.ts

@@ -1,9 +1,9 @@
 import { OrderMessageType, PriceMessageType, StandardPoolInfoType, StandardSwapDetailType, TradeBroadcastType, TradeResultBalanceChangeType, TradeResultType, TradeTimeFlowType } from "@clonegod/ttd-core"
-import { AbstractTransactionResultCheck, getServerInfo, isEmpty, LOCAL_EVENT_NAME, LOG, log_debug, 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, 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 { TransactionResultParser } from "./tx_result_parse"
 import { COMMITMENT_LEVEL } from "../common"
+import { TransactionResultParser } from "./tx_result_parse"
 
 
 
@@ -88,20 +88,57 @@ export class TransactionResultChecker extends AbstractTransactionResultCheck {
                     messageObj = JSON.parse(message)
                 }
 
-                const result = messageObj.params.result
-                const _txid = result.signature // Extract the signature
-                const slot = result.slot
-                log_info('check txid:', { _txid, txid: this.txid, slot})
+                // 支持两种消息格式：
+                // 1. 原始格式 (decodedTransaction): { slot, transaction: { signature, index, transaction, meta, version } }
+                // 2. 转换后格式: { params: { result: { signature, slot, transaction: { transaction, meta, version } } } }
+                
+                let result: any
+                let _txid: string
+                let slot: number
+                let transactionData: any
+                let meta: any
+                let version: number
+
+                // 检查是否为转换后的格式 (params.result)
+                
+                // 基于 laser_stream 推送的 transaction 格式
+                if (messageObj.transaction && messageObj.transaction.signature) {
+                    _txid = messageObj.transaction.signature
+                    slot = messageObj.slot
+                    transactionData = messageObj.transaction.transaction
+                    meta = messageObj.transaction.meta
+                    version = messageObj.transaction.version !== undefined ? messageObj.transaction.version : 0
+                } 
+                // 基于 geyser ws 推送的 transaction 格式 ？
+                else if (messageObj.params && messageObj.params.result) {
+                    result = messageObj.params.result
+                    _txid = result.signature
+                    slot = result.slot
+                    transactionData = result.transaction?.transaction
+                    meta = result.transaction?.meta
+                    version = result.transaction?.version !== undefined ? result.transaction.version : 0
+                } 
+                else {
+                    log_error('Invalid message format: unrecognized structure', new Error(JSON.stringify(messageObj)))
+                    return
+                }
 
-                // set txid for parse
-                result.transaction.transaction.signatures = [_txid]
+                if(_txid !== this.txid) {
+                    log_error('[tx_result_check] txid mismatch!', new Error(JSON.stringify({ _txid, txid: this.txid, slot })))
+                    return
+                }
 
-                let tx_result:ParsedTransactionWithMeta = {
-                    slot,
-                    transaction: result.transaction.transaction,
-                    meta: result.transaction.meta,
-                    blockTime: Date.now() / 1000,
-                    version: result.transaction.version
+                // set txid for parse - 确保 signatures 数组存在
+                transactionData.signatures = [_txid]
+
+                // 构建 ParsedTransactionWithMeta 对象，确保所有属性都被正确复制
+                // version 字段类型为 TransactionVersion，通常是 0 或 'legacy'
+                let tx_result: ParsedTransactionWithMeta = {
+                    slot: slot,
+                    transaction: transactionData,
+                    meta: meta || null,
+                    blockTime: messageObj.blockTime || (Date.now() / 1000),
+                    version: (typeof version === 'number' && version === 0) ? 0 : (version as any)
                 }
                 
                 let swap_result = this.transactionParser.parse_transaction_data(tx_result, this.pool_info)
@@ -117,7 +154,7 @@ export class TransactionResultChecker extends AbstractTransactionResultCheck {
                 console.dir(trade_result, { depth: 8 })
                 console.log('---------------------------------------------------->')
             } catch (err) {
-                log_error('parse geyser stream message error!', err)
+                log_error('parse stream transaction message error!', err)
                 return
             }
         })