@clonegod/ttd-sol-common 2.0.33 → 2.0.35

package/dist/common/subscribe_account_update.js

@@ -6,8 +6,8 @@ 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 ws_client = new dist_1.WebSocketClient(ws_url);
     ws_client.onOpen(() => {
-        pool_list.forEach(({ pair, pool_address }, _) => {
-            ws_client.send(JSON.stringify({ dex_id, pair, pool_address }));
+        pool_list.forEach(({ pool_name, pool_address }, _) => {
+            ws_client.send(JSON.stringify({ dex_id, pool_name, pool_address }));
         });
     });
     ws_client.onMessage(((eventData) => {

package/dist/types/index.d.ts

@@ -1,3 +1,8 @@
+export declare enum SolanaPoolAccountType {
+    POOL = "pool",
+    VAULT_A = "vaultA",
+    VAULT_B = "vaultB"
+}
 export interface SolanaAccountUpdateEvent {
     recvTimeMs: number;
     providerId: string;
@@ -8,6 +13,7 @@ export interface SolanaAccountUpdateEvent {
     dexId: string;
     poolAddress: string;
     poolName: string;
+    accountType: SolanaPoolAccountType;
     accountData?: Buffer | string;
 }
 export interface SolanaBlockMetaUpdateEvent {
@@ -33,7 +39,7 @@ export interface SolanaPoolAccountUpdateEventData {
         pool_account_data: string;
         vaultA_account?: string;
         vaultA_account_data?: string;
-        vaultB?: string;
+        vaultB_account?: string;
         vaultB_account_data?: string;
     };
 }

package/dist/types/index.js

@@ -1,2 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolanaPoolAccountType = void 0;
+var SolanaPoolAccountType;
+(function (SolanaPoolAccountType) {
+    SolanaPoolAccountType["POOL"] = "pool";
+    SolanaPoolAccountType["VAULT_A"] = "vaultA";
+    SolanaPoolAccountType["VAULT_B"] = "vaultB";
+})(SolanaPoolAccountType || (exports.SolanaPoolAccountType = SolanaPoolAccountType = {}));

package/package.json

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

package/src/common/subscribe_account_update.ts

@@ -11,8 +11,8 @@ export function subscribe_pool_account_update(dex_id: DEX_ID, pool_list: Standar
     const ws_url = process.env.SUBSCIBE_MULTIPLE_PROVIDERS_WS_URL || 'ws://127.0.0.1:10000';
     const ws_client = new WebSocketClient(ws_url)
     ws_client.onOpen(() => {
-        pool_list.forEach(({ pair, pool_address }, _) => {
-            ws_client.send(JSON.stringify({ dex_id, pair, pool_address }))
+        pool_list.forEach(({ pool_name, pool_address }, _) => {
+            ws_client.send(JSON.stringify({ dex_id, pool_name, pool_address }))
         })
     })
     ws_client.onMessage(((eventData: SolanaPoolAccountUpdateEventData): void => {

package/src/types/index.ts

@@ -1,6 +1,12 @@
 /**
  * Solana 池子账户更新事件数据结构
  */
+export enum SolanaPoolAccountType {
+    POOL='pool',
+    VAULT_A='vaultA',
+    VAULT_B='vaultB',
+}
+
 export interface SolanaAccountUpdateEvent {
     recvTimeMs: number; // 接收时间戳（毫秒）
     
@@ -16,9 +22,13 @@ export interface SolanaAccountUpdateEvent {
     dexId: string; // DEX ID
     poolAddress: string; // 池子地址
     poolName: string; // 池子名称
+
+    // 账户类型
+    accountType: SolanaPoolAccountType; 
     
     // 账户数据（原始数据，由客户端解析）
     accountData?: Buffer | string; // 账户原始数据
+    
 }
 
 /**
@@ -55,7 +65,7 @@ export interface SolanaPoolAccountUpdateEventData {
         // AMM 池子的Vault 
         vaultA_account?: string
         vaultA_account_data?: string
-        vaultB?: string
+        vaultB_account?: string
         vaultB_account_data?: string
     }
 }