@clonegod/ttd-sol-common 2.0.41 → 2.0.43

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_builder.js

@@ -48,19 +48,22 @@ class SolTransactionBuilder {
         swapTx.recentBlockhash = this.recentBlockhash;
         swapTx.lastValidBlockHeight = this.recentBlockheight + max_block_offset;
         swapTx.feePayer = this.keypair.publicKey;
-        let tip_lamports = context.trade_runtime.settings.strategy.sol_tip_fee;
-        if (tip_lamports < 5000) {
-            tip_lamports = 5000;
-        }
-        if (tip_lamports > 300000) {
-            tip_lamports = 300000;
+        const { sol_bundle_only, sol_tip_fee } = context.trade_runtime.settings.strategy;
+        if (!sol_bundle_only) {
+            let tip_lamports = sol_tip_fee;
+            if (tip_lamports < 5000) {
+                tip_lamports = 5000;
+            }
+            if (tip_lamports > 300000) {
+                tip_lamports = 300000;
+            }
+            let tip_instruction = web3_js_1.SystemProgram.transfer({
+                fromPubkey: this.keypair.publicKey,
+                toPubkey: new web3_js_1.PublicKey(helius_1.HELIUS_TIP_ACCOUNTS[Math.floor(Math.random() * helius_1.HELIUS_TIP_ACCOUNTS.length)]),
+                lamports: tip_lamports,
+            });
+            swapTx.instructions.push(tip_instruction);
         }
-        let tip_instruction = web3_js_1.SystemProgram.transfer({
-            fromPubkey: this.keypair.publicKey,
-            toPubkey: new web3_js_1.PublicKey(helius_1.HELIUS_TIP_ACCOUNTS[Math.floor(Math.random() * helius_1.HELIUS_TIP_ACCOUNTS.length)]),
-            lamports: tip_lamports,
-        });
-        swapTx.instructions.push(tip_instruction);
         swapTx.sign(this.keypair);
         return swapTx;
     }

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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-sol-common",
-  "version": "2.0.41",
+  "version": "2.0.43",
   "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_builder.ts

@@ -87,24 +87,30 @@ export class SolTransactionBuilder {
         swapTx.lastValidBlockHeight = this.recentBlockheight + max_block_offset
         swapTx.feePayer = this.keypair.publicKey
 
-        // Helius Sender 要求：
-        // 1、swqos_only: 至少 5000 lamports 小费
-        //   -> transaction must send a tip of at least 5000 lamports to one of the following Helius wallets: [xxx, ...]
-        // 2、swqos + jito: 至少 0.0002 SOL 小费 -> lamports = 0.0002 * LAMPORTS_PER_SOL
-        //   -> Requires minimum 0.0002 SOL tip.
-        let tip_lamports = context.trade_runtime.settings.strategy.sol_tip_fee
-        if(tip_lamports < 5000) {
-            tip_lamports = 5000
-        }
-        if(tip_lamports > 300000) {
-            tip_lamports = 300000
+        const {sol_bundle_only, sol_tip_fee} = context.trade_runtime.settings.strategy
+
+        // sol_bundle_only = false, 使用 Helius Sender
+        // sol_bundle_only = true, 使用 Jito Bundle - 不需要给Helius小费
+        if(!sol_bundle_only) {
+            // 使用 Helius Sender:
+            // 1、swqos_only: 至少 5000 lamports 小费
+            //   -> transaction must send a tip of at least 5000 lamports to one of the following Helius wallets: [xxx, ...]
+            // 2、swqos + jito: 至少 0.0002 SOL 小费 -> lamports = 0.0002 * LAMPORTS_PER_SOL
+            //   -> Requires minimum 0.0002 SOL tip.
+            let tip_lamports = sol_tip_fee
+            if(tip_lamports < 5000) {
+                tip_lamports = 5000
+            }
+            if(tip_lamports > 300000) {
+                tip_lamports = 300000
+            }
+            let tip_instruction = SystemProgram.transfer({
+                fromPubkey: this.keypair.publicKey,
+                toPubkey: new PublicKey(HELIUS_TIP_ACCOUNTS[Math.floor(Math.random() * HELIUS_TIP_ACCOUNTS.length)]),
+                lamports: tip_lamports,
+            })
+            swapTx.instructions.push(tip_instruction)
         }
-        let tip_instruction = SystemProgram.transfer({
-            fromPubkey: this.keypair.publicKey,
-            toPubkey: new PublicKey(HELIUS_TIP_ACCOUNTS[Math.floor(Math.random() * HELIUS_TIP_ACCOUNTS.length)]),
-            lamports: tip_lamports,
-        })
-        swapTx.instructions.push(tip_instruction)
 
         swapTx.sign(this.keypair)
 

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"
 
 
 

package/src/types/index.ts

@@ -58,6 +58,7 @@ export interface SolanaPoolAccountUpdateEventData {
     pool_name: string
     data: {
         slot: number
+        // tx_index: number
         tx_hash: string
         pool_account: string
         pool_account_data: string