@clonegod/ttd-sol-common 2.0.70 → 2.0.72

package/dist/appconfig/SolanaTradeAppConfig.js

@@ -60,7 +60,7 @@ class SolanaTradeAppConfig extends dist_1.AbstractTradeAppConfig {
             (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_port = dist_1.SERVICE_PORT.STREAM_TRADE_WS;
         const ws_url = `ws://127.0.0.1:${ws_port}`;
         this.ws_client = new dist_1.WebSocketClient(ws_url);
         this.ws_client.onMessage(transactionHandler);

package/dist/common/subscribe_account_update.js

@@ -3,7 +3,7 @@ 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 port = process.env.STREAM_WS_QUOTE_PORT || 10000;
+    const port = dist_1.SERVICE_PORT.STREAM_QUOTE_WS;
     const ws_url = `ws://127.0.0.1:${port}`;
     const ws_client = new dist_1.WebSocketClient(ws_url);
     ws_client.onOpen(() => {

package/dist/trade/tx_builder.js

@@ -101,8 +101,8 @@ class SolTransactionBuilder {
         if (tip_lamports < 5000) {
             tip_lamports = 5000;
         }
-        if (tip_lamports > 300000) {
-            tip_lamports = 300000;
+        if (tip_lamports > 1000000) {
+            tip_lamports = 1000000;
         }
         let tip_instruction = web3_js_1.SystemProgram.transfer({
             fromPubkey: this.keypair.publicKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-sol-common",
-  "version": "2.0.70",
+  "version": "2.0.72",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,7 +13,7 @@
     "push": "npm run build && npm publish"
   },
   "dependencies": {
-    "@clonegod/ttd-core": "3.1.84",
+    "@clonegod/ttd-core": "3.1.86",
     "@solana/web3.js": "1.91.6",
     "rpc-websockets": "7.10.0",
     "axios": "^1.2.3",

package/src/appconfig/SolanaTradeAppConfig.ts

@@ -16,6 +16,7 @@ import {
     LOCAL_EVENT_NAME,
     log_error,
     log_info,
+    SERVICE_PORT,
     sleep,
     WebSocketClient,
 } from '@clonegod/ttd-core/dist'
@@ -106,7 +107,7 @@ export class SolanaTradeAppConfig extends AbstractTradeAppConfig {
             this.emit(LOCAL_EVENT_NAME.EVENT_WALLET_TRANSACTION + '#' + tx_id, messageObj)
         }
 
-        const ws_port = process.env.STREAM_WS_TRADE_PORT || 10002
+        const ws_port = SERVICE_PORT.STREAM_TRADE_WS
         const ws_url = `ws://127.0.0.1:${ws_port}`
         this.ws_client = new WebSocketClient(ws_url)
         this.ws_client.onMessage(transactionHandler)

package/src/common/subscribe_account_update.ts

@@ -1,5 +1,5 @@
 import { StandardPoolInfoType } from "@clonegod/ttd-core";
-import { DEX_ID, log_warn, WebSocketClient } from "@clonegod/ttd-core/dist";
+import { DEX_ID, log_warn, SERVICE_PORT, WebSocketClient } from "@clonegod/ttd-core/dist";
 import { SolanaPoolAccountUpdateEventData } from "../types";
 
 /**
@@ -8,7 +8,7 @@ import { SolanaPoolAccountUpdateEventData } from "../types";
  * - 交易使用：交易中需要池子的最新状态
  */
 export function subscribe_pool_account_update(dex_id: DEX_ID, pool_list: StandardPoolInfoType[], callback: (eventData: SolanaPoolAccountUpdateEventData) => void) {
-    const port = process.env.STREAM_WS_QUOTE_PORT || 10000;
+    const port = SERVICE_PORT.STREAM_QUOTE_WS;
     const ws_url = `ws://127.0.0.1:${port}`;
     const ws_client = new WebSocketClient(ws_url)
     ws_client.onOpen(() => {

package/src/quote/chain_ops.ts

@@ -9,7 +9,7 @@ import { TokenPriceCache } from './pricing/token_price_cache'
  *
  * 把「询价流程不变、链能力可换」收成一个对象：同一套 AbstractDexQuote 模板，Solana 注入 SolanaChainOps。
  * 与 SUI 的差异：
- *   - 池事件源是 stream-quote 的 **WS 通道**（subscribe_pool_account_update，port STREAM_WS_QUOTE_PORT），
+ *   - 池事件源是 stream-quote 的 **WS 通道**（subscribe_pool_account_update，port SERVICE_PORT.STREAM_QUOTE_WS），
  *     推送的是**账户原始快照**（base64），非结构化 swap 事件（详见 pool_event.ts）。
  *   - assertProgramDeployed 用 connection.getAccountInfo + executable 校验（Solana 无 eth_getCode）。
  *   - Solana 地址是 base58 **大小写敏感**，loadTokenPrices 用原地址作 key（不可 lowercase）。

package/src/trade/tx_builder.ts

@@ -178,10 +178,10 @@ export class SolTransactionBuilder {
         // 2、swqos + jito: 至少 0.0002 SOL 小费 -> lamports = 0.0002 * LAMPORTS_PER_SOL
         let tip_lamports = sol_tip_fee
         if (tip_lamports < 5000) {
-            tip_lamports = 5000
+            tip_lamports = 5000          // 下限：Helius swqos 协议硬要求
         }
-        if (tip_lamports > 300000) {
-            tip_lamports = 300000
+        if (tip_lamports > 1000000) {
+            tip_lamports = 1000000       // 上限：0.001 SOL
         }
         let tip_instruction = SystemProgram.transfer({
             fromPubkey: this.keypair.publicKey,