@clonegod/ttd-sol-common 2.0.36 → 2.0.39

package/dist/common/subscribe_account_update.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribe_pool_account_update = subscribe_pool_account_update;
 const dist_1 = require("@clonegod/ttd-core/dist");
 function subscribe_pool_account_update(dex_id, pool_list, callback) {
-    const ws_url = process.env.SUBSCIBE_MULTIPLE_PROVIDERS_WS_URL || 'ws://127.0.0.1:10000';
+    const port = process.env.STREAM_WS_QUOTE_PORT || 10000;
+    const ws_url = `ws://127.0.0.1:${port}`;
     const ws_client = new dist_1.WebSocketClient(ws_url);
     ws_client.onOpen(() => {
         pool_list.forEach(({ pool_name, pool_address }, _) => {
@@ -12,7 +13,7 @@ function subscribe_pool_account_update(dex_id, pool_list, callback) {
     });
     ws_client.onMessage(((eventData) => {
         if (!eventData.data) {
-            (0, dist_1.log_warn)(`[SolanaTradeAppConfig] subscribe_pool_events_from_multiple_providers: no data`, eventData);
+            (0, dist_1.log_warn)(`subscribe_pool_account_update: no data`, eventData);
         }
         else {
             callback(eventData);

package/dist/config/SolanaTradeAppConfig.d.ts

@@ -0,0 +1,8 @@
+import { AbstractTradeAppConfig } from "@clonegod/ttd-core/dist";
+import { Connection, Keypair } from "@solana/web3.js";
+export declare class SolanaTradeAppConfig extends AbstractTradeAppConfig {
+    connection: Connection;
+    keypair: Keypair;
+    constructor();
+    subscribe_wallet_raw_txn_event(): void;
+}

package/dist/config/SolanaTradeAppConfig.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaTradeAppConfig = void 0;
+const dist_1 = require("@clonegod/ttd-core/dist");
+class SolanaTradeAppConfig extends dist_1.AbstractTradeAppConfig {
+    constructor() {
+        super();
+        this.subscribe_wallet_raw_txn_event();
+    }
+    subscribe_wallet_raw_txn_event() {
+        const transactionHandler = async (messageStr) => {
+            let messageObj = messageStr;
+            if (typeof messageStr === 'string') {
+                messageObj = JSON.parse(messageStr);
+            }
+            const tx_id = messageObj.transaction.signature;
+            (0, dist_1.log_info)(`Received transaction result via WebSocket: ${tx_id}`);
+            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://localhost:${ws_port}`);
+        ws.onMessage(transactionHandler);
+        ws.connect();
+    }
+}
+exports.SolanaTradeAppConfig = SolanaTradeAppConfig;

package/dist/config/index.d.ts

@@ -0,0 +1 @@
+export * from './SolanaTradeAppConfig';

package/dist/config/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./SolanaTradeAppConfig"), exports);

package/dist/trade/SolanaTradeAppConfig.js

@@ -5,9 +5,22 @@ const dist_1 = require("@clonegod/ttd-core/dist");
 class SolanaTradeAppConfig extends dist_1.AbstractTradeAppConfig {
     constructor() {
         super();
+        this.subscribe_wallet_raw_txn_event();
     }
     subscribe_wallet_raw_txn_event() {
-        return;
+        const transactionHandler = async (messageStr) => {
+            let messageObj = messageStr;
+            if (typeof messageStr === 'string') {
+                messageObj = JSON.parse(messageStr);
+            }
+            const tx_id = messageObj.transaction.signature;
+            (0, dist_1.log_info)(`Received transaction result via WebSocket: ${tx_id}`);
+            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://localhost:${ws_port}`);
+        ws.onMessage(transactionHandler);
+        ws.connect();
     }
 }
 exports.SolanaTradeAppConfig = SolanaTradeAppConfig;

package/dist/trade/index.d.ts

@@ -1,6 +1,6 @@
 export * from './tx_result_check';
 export * from './tx_result_parse';
-export * from './SolanaTradeAppConfig';
+export * from '../config/SolanaTradeAppConfig';
 export * from './tx_builder';
 export * from './send';
 export * from './jito_tip_wallets';

package/dist/trade/index.js

@@ -16,7 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./tx_result_check"), exports);
 __exportStar(require("./tx_result_parse"), exports);
-__exportStar(require("./SolanaTradeAppConfig"), exports);
+__exportStar(require("../config/SolanaTradeAppConfig"), exports);
 __exportStar(require("./tx_builder"), exports);
 __exportStar(require("./send"), exports);
 __exportStar(require("./jito_tip_wallets"), exports);

package/dist/trade/send/jito.js

@@ -111,8 +111,8 @@ const sendBundleWithJito = async (mainTx, tipTx) => {
 };
 exports.sendBundleWithJito = sendBundleWithJito;
 const sendBundleWithJitoMultiIps = async (mainTx, tipTx) => {
-    let ips = (process.env.JITO_SEND_BUNDLE_PROXY_SERVERS || '127.0.0.1').split(',');
-    let urls = ips.map(ip => `http://${ip}:10429/solana/send_tx`);
+    let ips = (process.env.JITO_SEND_BUNDLE_SERVER_IPS || '127.0.0.1').split(',');
+    let urls = ips.map(ip => `http://${ip}:10001/solana/send_tx`);
     const body = {
         trace_id: '',
         txid: (0, common_1.getSignature)(mainTx),

package/dist/trade/tx_builder.d.ts

@@ -1,6 +1,6 @@
 import { TradeContext } from "@clonegod/ttd-core/dist";
 import { Connection, Keypair, Transaction, TransactionInstruction } from "@solana/web3.js";
-import { SolanaTradeAppConfig } from "./SolanaTradeAppConfig";
+import { SolanaTradeAppConfig } from "../config/SolanaTradeAppConfig";
 import { JitoTipWalletManager } from "./jito_tip_wallets";
 export declare class SolTransactionBuilder {
     appConfig: SolanaTradeAppConfig;

package/dist/trade/tx_result_check.js

@@ -35,13 +35,12 @@ class TransactionResultChecker extends dist_1.AbstractTransactionResultCheck {
         this.on_subscibe_transaction();
     }
     on_subscibe_transaction() {
-        this.event_emitter.once(dist_1.LOCAL_EVENT_NAME.EVENT_WALLET_TRANSACTION + '#' + this.txid, (messageStr) => {
+        this.event_emitter.once(dist_1.LOCAL_EVENT_NAME.EVENT_WALLET_TRANSACTION + '#' + this.txid, (message) => {
             try {
                 this.trade_result_already_processed = true;
-                (0, dist_1.log_debug)('on events: EVENT_WALLET_TRANSACTION', messageStr);
-                let messageObj = messageStr;
-                if (typeof messageStr === 'string') {
-                    messageObj = JSON.parse(messageStr);
+                let messageObj = message;
+                if (typeof message === 'string') {
+                    messageObj = JSON.parse(message);
                 }
                 const result = messageObj.params.result;
                 const _txid = result.signature;
@@ -75,8 +74,8 @@ class TransactionResultChecker extends dist_1.AbstractTransactionResultCheck {
     }
     async check_tx_result_interval() {
         const check_start_time = Date.now();
-        const check_interval = parseInt(process.env.CHECK_TX_RESULT_INTERVAL_MILLS || '3000');
-        const check_timeout = parseInt(process.env.CHECK_TX_RESULT_TIMEOUT_MILLS || '10000');
+        const check_interval = parseInt(process.env.CHECK_TX_RESULT_INTERVAL_MILLS || '1000');
+        const check_timeout = parseInt(process.env.CHECK_TX_RESULT_TIMEOUT_MILLS || '6000');
         (0, dist_1.log_info)(`check transaction start: check_interval=${check_interval}, check_timeout=${check_timeout}`);
         if (check_interval >= check_timeout) {
             (0, dist_1.log_warn)(`check_interval=${check_interval} >= check_timeout=${check_timeout}, check_tx_result_interval failed!`);

package/package.json

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

package/src/common/subscribe_account_update.ts

@@ -8,7 +8,8 @@ import { SolanaPoolAccountUpdateEventData } from "../types";
  * - 交易使用：交易中需要池子的最新状态
  */
 export function subscribe_pool_account_update(dex_id: DEX_ID, pool_list: StandardPoolInfoType[], callback: (eventData: SolanaPoolAccountUpdateEventData) => void) {
-    const ws_url = process.env.SUBSCIBE_MULTIPLE_PROVIDERS_WS_URL || 'ws://127.0.0.1:10000';
+    const port = process.env.STREAM_WS_QUOTE_PORT || 10000;
+    const ws_url = `ws://127.0.0.1:${port}`;
     const ws_client = new WebSocketClient(ws_url)
     ws_client.onOpen(() => {
         pool_list.forEach(({ pool_name, pool_address }, _) => {
@@ -17,7 +18,7 @@ export function subscribe_pool_account_update(dex_id: DEX_ID, pool_list: Standar
     })
     ws_client.onMessage(((eventData: SolanaPoolAccountUpdateEventData): void => {
         if (!eventData.data) {
-            log_warn(`[SolanaTradeAppConfig] subscribe_pool_events_from_multiple_providers: no data`, eventData);
+            log_warn(`subscribe_pool_account_update: no data`, eventData);
         } else {
             callback(eventData);
         }

package/src/config/SolanaTradeAppConfig.ts

@@ -0,0 +1,45 @@
+import { AbstractTradeAppConfig, LOCAL_EVENT_NAME, log_info, WebSocketClient } from "@clonegod/ttd-core/dist";
+import { Connection, Keypair } from "@solana/web3.js";
+
+export class SolanaTradeAppConfig extends AbstractTradeAppConfig {
+
+    // 子类需要设置的属性
+    public connection: Connection;
+    public keypair: Keypair;
+
+    constructor() {
+        super();
+        this.subscribe_wallet_raw_txn_event();
+    }
+
+
+    // 订阅 Wallet 在链上发生的tx data
+    subscribe_wallet_raw_txn_event(): void {
+        // 定义处理函数，便于后续移除
+        const transactionHandler = async (messageStr: any) => {
+            let messageObj = messageStr
+            if(typeof messageStr === 'string') {
+                messageObj = JSON.parse(messageStr)
+            }
+
+            // console.dir(messge, { depth: null });
+            const tx_id = messageObj.transaction.signature;
+            log_info(`Received transaction result via WebSocket: ${tx_id}`);
+
+            this.emit(LOCAL_EVENT_NAME.EVENT_WALLET_TRANSACTION + '#' + tx_id, messageObj);
+        };
+
+        const ws_port = process.env.STREAM_WS_TRADE_PORT || 10002;
+        const ws = new WebSocketClient(`ws://localhost:${ws_port}`)
+        ws.onMessage(transactionHandler);
+        ws.connect();
+
+        // 不断开连接
+        // setTimeout(() => { ws.disconnect(); }, 6000);
+    }
+
+
+
+}
+
+

package/src/config/index.ts

@@ -0,0 +1,2 @@
+export * from './SolanaTradeAppConfig';
+

package/src/trade/index.ts

@@ -1,6 +1,6 @@
 export * from './tx_result_check'
 export * from './tx_result_parse'
-export * from './SolanaTradeAppConfig'
+export * from '../config/SolanaTradeAppConfig'
 export * from './tx_builder'
 export * from './send'
 export * from './jito_tip_wallets'

package/src/trade/send/jito.ts

@@ -95,8 +95,8 @@ export const sendBundleWithJito = async (mainTx: Transaction, tipTx: Transaction
 
 
 export const sendBundleWithJitoMultiIps = async (mainTx: Transaction, tipTx: Transaction): Promise<string> => {
-    let ips = (process.env.JITO_SEND_BUNDLE_PROXY_SERVERS || '127.0.0.1').split(',')
-    let urls = ips.map(ip => `http://${ip}:10429/solana/send_tx`)
+    let ips = (process.env.JITO_SEND_BUNDLE_SERVER_IPS || '127.0.0.1').split(',')
+    let urls = ips.map(ip => `http://${ip}:10001/solana/send_tx`)
 
     const body = {
         trace_id: '',

package/src/trade/tx_builder.ts

@@ -2,7 +2,7 @@ import { CHAIN_ID, TradeContext } from "@clonegod/ttd-core/dist";
 import { ComputeBudgetProgram, Connection, Keypair, LAMPORTS_PER_SOL, PublicKey, SystemProgram, Transaction, TransactionInstruction } from "@solana/web3.js";
 import { LAMPORTS_PER_MICRO_LAMPORTS } from "../common";
 import { SolanaBlockMetaUpdateEvent } from "../types";
-import { SolanaTradeAppConfig } from "./SolanaTradeAppConfig";
+import { SolanaTradeAppConfig } from "../config/SolanaTradeAppConfig";
 import { HELIUS_TIP_ACCOUNTS } from "./send/helius";
 import { getJitoTipAccount } from "./send/jito";
 import { JitoTipWalletManager } from "./jito_tip_wallets";

package/src/trade/tx_result_check.ts

@@ -76,17 +76,16 @@ export class TransactionResultChecker extends AbstractTransactionResultCheck {
     }
 
     /**
-     * 从第三方服务(helius geyser ws)订阅Transaction结果
+     * 从第三方服务(stream ws)订阅Transaction结果
      */
     on_subscibe_transaction() {
-        this.event_emitter.once(LOCAL_EVENT_NAME.EVENT_WALLET_TRANSACTION + '#' + this.txid, (messageStr) => {
+        this.event_emitter.once(LOCAL_EVENT_NAME.EVENT_WALLET_TRANSACTION + '#' + this.txid, (message: any) => {
             try {
                 this.trade_result_already_processed = true
-                log_debug('on events: EVENT_WALLET_TRANSACTION', messageStr)
 
-                let messageObj = messageStr
-                if(typeof messageStr === 'string') {
-                    messageObj = JSON.parse(messageStr)
+                let messageObj = message
+                if(typeof message === 'string') {
+                    messageObj = JSON.parse(message)
                 }
 
                 const result = messageObj.params.result
@@ -130,8 +129,8 @@ export class TransactionResultChecker extends AbstractTransactionResultCheck {
      */
     async check_tx_result_interval() {
         const check_start_time = Date.now()
-        const check_interval = parseInt(process.env.CHECK_TX_RESULT_INTERVAL_MILLS || '3000')
-        const check_timeout = parseInt(process.env.CHECK_TX_RESULT_TIMEOUT_MILLS || '10000')
+        const check_interval = parseInt(process.env.CHECK_TX_RESULT_INTERVAL_MILLS || '1000')
+        const check_timeout = parseInt(process.env.CHECK_TX_RESULT_TIMEOUT_MILLS || '6000')
 
         log_info(`check transaction start: check_interval=${check_interval}, check_timeout=${check_timeout}`)
 

package/src/trade/SolanaTradeAppConfig.ts

@@ -1,25 +0,0 @@
-import { AbstractTradeAppConfig } from "@clonegod/ttd-core/dist";
-import { Connection, Keypair } from "@solana/web3.js";
-
-export class SolanaTradeAppConfig extends AbstractTradeAppConfig {
-
-    // 子类需要设置的属性
-    public connection: Connection;
-    public keypair: Keypair;
-
-    constructor() {
-        super();
-    }
-
-
-    // 订阅 Wallet 在链上发生的tx data
-    subscribe_wallet_raw_txn_event(): void {
-        // not used
-        return;
-    }
-
-
-
-}
-
-