@clonegod/ttd-sol-common 2.0.73 → 2.0.75

package/dist/common/subscribe_account_update.js

@@ -12,12 +12,15 @@ function subscribe_pool_account_update(dex_id, pool_list, callback) {
         });
     });
     ws_client.onMessage(((eventData) => {
+        if (eventData.type === 'subscribed') {
+            (0, dist_1.log_info)(`subscribe_pool_account_update: ACK ${eventData.ws_id || eventData.pool_address || ''}`);
+            return;
+        }
         if (!eventData.data) {
             (0, dist_1.log_warn)(`subscribe_pool_account_update: no data`, eventData);
+            return;
         }
-        else {
-            callback(eventData);
-        }
+        callback(eventData);
     }));
     ws_client.connect();
 }

package/dist/quote/abstract_dex_quote.js

@@ -74,7 +74,9 @@ class AbstractDexQuote {
         return true;
     }
     async handleBlockUpdateEvent(eventData) {
-        const { slot, blockTime } = JSON.parse(eventData);
+        const parsed = JSON.parse(eventData);
+        const slot = Number(parsed.slot);
+        const blockTime = Number(parsed.blockTime);
         this.assertValidBlockNumber(slot, `${this.dexId} block-event`);
         this.latestBlockSlot = slot;
         for (const poolInfo of this.poolInfoMap.values()) {

package/dist/quote/pool_event.js

@@ -7,8 +7,8 @@ function toSolPoolEvent(data) {
         pool_address: data.pool_address,
         dex_id: data.dex_id,
         pool_name: data.pool_name,
-        blockNumber: d.slot,
-        writeVersion: d.write_version,
+        blockNumber: Number(d.slot),
+        writeVersion: d.write_version != null ? Number(d.write_version) : undefined,
         txHash: d.tx_hash || 'account',
         blockTime: data.event_time || 0,
         poolAccountData: d.pool_account_data,

package/dist/types/index.d.ts

@@ -23,6 +23,7 @@ export interface SolanaBlockMetaUpdateEvent {
     slot: number;
     blockHash: string;
     blockTime: number;
+    recvBlockTime: number;
     blockHeight: number;
     parentSlot: number;
     parentBlockhash: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clonegod/ttd-sol-common",
-  "version": "2.0.73",
+  "version": "2.0.75",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,10 +13,10 @@
     "push": "npm run build && npm publish"
   },
   "dependencies": {
-    "@clonegod/ttd-core": "3.1.87",
+    "@clonegod/ttd-core": "3.1.88",
     "@solana/web3.js": "1.91.6",
     "rpc-websockets": "7.10.0",
-    "axios": "^1.2.3",
+    "axios": "1.17.0",
     "bn.js": "^4.12.1",
     "bs58": "^6.0.0",
     "helius-laserstream": "^0.4.0"

package/src/common/subscribe_account_update.ts

@@ -1,5 +1,5 @@
 import { StandardPoolInfoType } from "@clonegod/ttd-core";
-import { DEX_ID, log_warn, SERVICE_PORT, WebSocketClient } from "@clonegod/ttd-core/dist";
+import { DEX_ID, log_info, log_warn, SERVICE_PORT, WebSocketClient } from "@clonegod/ttd-core/dist";
 import { SolanaPoolAccountUpdateEventData } from "../types";
 
 /**
@@ -17,11 +17,16 @@ export function subscribe_pool_account_update(dex_id: DEX_ID, pool_list: Standar
         })
     })
     ws_client.onMessage(((eventData: SolanaPoolAccountUpdateEventData): void => {
+        // 订阅 ACK（stream-quote 确认订阅成功，无 data 字段）→ 打 info 确认链路通，不当异常告警
+        if ((eventData as any).type === 'subscribed') {
+            log_info(`subscribe_pool_account_update: ACK ${(eventData as any).ws_id || (eventData as any).pool_address || ''}`);
+            return;
+        }
         if (!eventData.data) {
             log_warn(`subscribe_pool_account_update: no data`, eventData);
-        } else {
-            callback(eventData);
+            return;
         }
+        callback(eventData);
     }));
     ws_client.connect();
 }

package/src/quote/abstract_dex_quote.ts

@@ -191,7 +191,10 @@ export abstract class AbstractDexQuote<C extends SolanaChainOps = SolanaChainOps
     }
 
     private async handleBlockUpdateEvent(eventData: string): Promise<void> {
-        const { slot, blockTime } = JSON.parse(eventData) as SolanaBlockMetaUpdateEvent
+        const parsed = JSON.parse(eventData) as SolanaBlockMetaUpdateEvent
+        // slot/blockTime 可能是 protobuf u64 字符串 → 在"blockNumber"归一化边界统一转 number
+        const slot = Number(parsed.slot)
+        const blockTime = Number(parsed.blockTime)
         this.assertValidBlockNumber(slot, `${this.dexId} block-event`)
         this.latestBlockSlot = slot   // v1 兜底询价取当前 slot 用（动态费 currentPoint）
         for (const poolInfo of this.poolInfoMap.values()) {

package/src/quote/pool_event.ts

@@ -66,9 +66,10 @@ export function toSolPoolEvent(data: SolanaPoolAccountUpdateEventData): SolPoolE
         pool_address: data.pool_address,
         dex_id: data.dex_id,
         pool_name: data.pool_name,
-        blockNumber: d.slot,
+        // slot/write_version 可能是 protobuf u64 字符串 → 在归一化边界统一转 number，否则 assert 判非法/水位线变字符串比较
+        blockNumber: Number(d.slot),
         // Geyser write_version（全局单调）；stream-quote 已补进 wire（step 2）→ (slot, writeVersion) 水位线去重
-        writeVersion: d.write_version,
+        writeVersion: d.write_version != null ? Number(d.write_version) : undefined,
         txHash: d.tx_hash || 'account',
         blockTime: data.event_time || 0,
         poolAccountData: d.pool_account_data,

package/src/types/index.ts

@@ -40,7 +40,8 @@ export interface SolanaAccountUpdateEvent {
 export interface SolanaBlockMetaUpdateEvent {
     slot: number;
     blockHash: string;
-    blockTime: number;
+    blockTime: number;            // 链上出块时间（Unix 秒，Solana 无亚秒精度）
+    recvBlockTime: number;        // stream-block 从 Laserstream 收到该块的本地时间（Unix 毫秒）；analyze 用它做 ms 精度时间戳/新鲜度
     blockHeight: number;
     parentSlot: number;
     parentBlockhash: string;