@clonegod/ttd-sol-common 2.0.38 → 2.0.40

package/dist/common/subscribe_account_update.js

@@ -13,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,9 @@
+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();
+    init(): Promise<void>;
+    subscribe_wallet_raw_txn_event(): void;
+}

package/dist/config/SolanaTradeAppConfig.js

@@ -0,0 +1,30 @@
+"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();
+    }
+    async init() {
+        await super.init();
+        this.subscribe_wallet_raw_txn_event();
+        (0, dist_1.log_info)('SolanaTradeAppConfig init ...');
+    }
+    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://127.0.0.1:${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/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/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/package.json

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

package/src/common/subscribe_account_update.ts

@@ -18,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/{trade → config}/SolanaTradeAppConfig.ts

@@ -1,4 +1,4 @@
-import { AbstractTradeAppConfig, log_info, log_error, WebSocketClient, LOCAL_EVENT_NAME } from "@clonegod/ttd-core/dist";
+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 {
@@ -6,12 +6,16 @@ export class SolanaTradeAppConfig extends AbstractTradeAppConfig {
     // 子类需要设置的属性
     public connection: Connection;
     public keypair: Keypair;
-
+    
     constructor() {
         super();
-        this.subscribe_wallet_raw_txn_event();
     }
 
+    async init() {  
+        await super.init();
+        this.subscribe_wallet_raw_txn_event();
+        log_info('SolanaTradeAppConfig init ...');
+    }
 
     // 订阅 Wallet 在链上发生的tx data
     subscribe_wallet_raw_txn_event(): void {
@@ -30,7 +34,7 @@ export class SolanaTradeAppConfig extends AbstractTradeAppConfig {
         };
 
         const ws_port = process.env.STREAM_WS_TRADE_PORT || 10002;
-        const ws = new WebSocketClient(`ws://localhost:${ws_port}`)
+        const ws = new WebSocketClient(`ws://127.0.0.1:${ws_port}`)
         ws.onMessage(transactionHandler);
         ws.connect();
 
@@ -39,7 +43,6 @@ export class SolanaTradeAppConfig extends AbstractTradeAppConfig {
     }
 
 
-
 }
 
 

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/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";