sol-parser-sdk-nodejs 0.4.0 → 0.5.5

package/dist/rpc_transaction.js

@@ -13,7 +13,9 @@ const bs58_1 = __importDefault(require("bs58"));
 const web3_js_1 = require("@solana/web3.js");
 const account_dispatcher_rpc_js_1 = require("./core/account_dispatcher_rpc.js");
 const common_filler_rpc_js_1 = require("./core/common_filler_rpc.js");
+const pumpfun_fee_enrich_js_1 = require("./core/pumpfun_fee_enrich.js");
 const rpc_invoke_map_js_1 = require("./core/rpc_invoke_map.js");
+const log_instr_dedup_js_1 = require("./grpc/log_instr_dedup.js");
 const mod_js_1 = require("./instr/mod.js");
 const optimized_matcher_js_1 = require("./logs/optimized_matcher.js");
 const DEFAULT_PK = web3_js_1.PublicKey.default.toBase58();
@@ -71,6 +73,7 @@ function applyRpcFills(events, msg, meta) {
  */
 function applyAccountFillsToLogEvents(events, msg, meta) {
     applyRpcFills(events, msg, meta);
+    (0, pumpfun_fee_enrich_js_1.enrichPumpfunSameTxPostMerge)(events);
 }
 /**
  * 解析已获取的 `VersionedTransactionResponse`（顺序：指令 → 日志 → 账户/数据填充）。
@@ -88,21 +91,26 @@ function parseRpcTransaction(tx, signature, filter, options) {
     }
     const meta = tx.meta ?? null;
     const slot = tx.slot;
-    const blockTimeUs = tx.blockTime != null ? tx.blockTime * 1_000_000 : undefined;
+    const blockTimeUs = options?.blockTimeUs ?? (tx.blockTime != null ? tx.blockTime * 1_000_000 : undefined);
     const grpcRecvUs = options?.grpcRecvUs ?? Math.floor(Date.now() * 1000);
+    const txIndex = options?.txIndex ?? 0;
     const rb = recentBlockhashBytes(msg.recentBlockhash);
-    const events = [];
-    parseOuterAndInnerInstructions(msg, meta, signature, slot, 0, blockTimeUs, grpcRecvUs, filter, events);
+    const instructionEvents = [];
+    parseOuterAndInnerInstructions(msg, meta, signature, slot, txIndex, blockTimeUs, grpcRecvUs, filter, instructionEvents);
+    const logEvents = [];
     let isCreatedBuy = false;
     for (const log of meta?.logMessages ?? []) {
-        const e = (0, optimized_matcher_js_1.parseLogOptimized)(log, signature, slot, 0, blockTimeUs, grpcRecvUs, filter, isCreatedBuy, rb);
+        const e = (0, optimized_matcher_js_1.parseLogOptimized)(log, signature, slot, txIndex, blockTimeUs, grpcRecvUs, filter, isCreatedBuy, rb);
         if (e) {
             if ("PumpFunCreate" in e || "PumpFunCreateV2" in e)
                 isCreatedBuy = true;
-            events.push(e);
+            logEvents.push(e);
         }
     }
-    applyRpcFills(events, msg, meta);
+    applyRpcFills(instructionEvents, msg, meta);
+    applyRpcFills(logEvents, msg, meta);
+    const events = (0, log_instr_dedup_js_1.dedupeLogInstructionEvents)(logEvents, instructionEvents);
+    (0, pumpfun_fee_enrich_js_1.enrichPumpfunSameTxPostMerge)(events);
     return { ok: true, events };
 }
 var account_dispatcher_rpc_js_2 = require("./core/account_dispatcher_rpc.js");

package/dist/shredstream/client.d.ts

@@ -1,4 +1,5 @@
 import { type DexEvent } from "../core/dex_event.js";
+import type { EventTypeFilter } from "../grpc/types.js";
 import { type ShredStreamConfig } from "./config.js";
 /** 订阅周期内累计（用于排查「无 gRPC 包 / 解码失败 / 无 DEX 事件」） */
 export type ShredStreamReceiveStats = {
@@ -48,7 +49,9 @@ export declare class ShredStreamClient {
      * 订阅 DEX 事件（自动重连）；返回队列供轮询消费（与 Rust `subscribe` 一致）。
      * 重连循环使用订阅时刻的配置快照（与 Rust 在 `tokio::spawn` 前 `config.clone()` 一致）。
      */
-    subscribe(): Promise<ShredEventQueue>;
+    subscribe(eventTypeFilter?: EventTypeFilter): Promise<ShredEventQueue>;
+    /** 与 Rust `subscribe_with_filter` 对齐：在解析热路径按事件类型预过滤。 */
+    subscribeWithFilter(eventTypeFilter?: EventTypeFilter): Promise<ShredEventQueue>;
     /** 停止订阅并中止当前流 */
     stop(): Promise<void>;
     private runReconnectLoop;

package/dist/shredstream/client.js

@@ -193,7 +193,7 @@ class ShredStreamClient {
      * 订阅 DEX 事件（自动重连）；返回队列供轮询消费（与 Rust `subscribe` 一致）。
      * 重连循环使用订阅时刻的配置快照（与 Rust 在 `tokio::spawn` 前 `config.clone()` 一致）。
      */
-    async subscribe() {
+    async subscribe(eventTypeFilter) {
         await this.stop();
         this.receiveStats = {
             entryMessagesReceived: 0,
@@ -205,9 +205,13 @@ class ShredStreamClient {
         const ac = new AbortController();
         this.loopAbort = ac;
         const configSnapshot = { ...this.config };
-        this.loopPromise = this.runReconnectLoop(queue, ac.signal, configSnapshot);
+        this.loopPromise = this.runReconnectLoop(queue, ac.signal, configSnapshot, eventTypeFilter);
         return queue;
     }
+    /** 与 Rust `subscribe_with_filter` 对齐：在解析热路径按事件类型预过滤。 */
+    async subscribeWithFilter(eventTypeFilter) {
+        return this.subscribe(eventTypeFilter);
+    }
     /** 停止订阅并中止当前流 */
     async stop() {
         this.loopAbort?.abort();
@@ -219,7 +223,7 @@ class ShredStreamClient {
             this.loopPromise = null;
         }
     }
-    async runReconnectLoop(queue, signal, config) {
+    async runReconnectLoop(queue, signal, config, eventTypeFilter) {
         let delay = config.reconnect_delay_ms;
         let attempts = 0;
         while (!signal.aborted) {
@@ -230,7 +234,7 @@ class ShredStreamClient {
             }
             attempts += 1;
             try {
-                await this.streamOnce(queue, signal, config);
+                await this.streamOnce(queue, signal, config, eventTypeFilter);
                 delay = config.reconnect_delay_ms;
                 attempts = 0;
             }
@@ -247,7 +251,7 @@ class ShredStreamClient {
         }
     }
     /** 与 Rust `stream_events` + `connect_with_config`（tonic Endpoint / Grpc 消息上限）一致 */
-    streamOnce(queue, signal, config) {
+    streamOnce(queue, signal, config, eventTypeFilter) {
         if (signal.aborted)
             return Promise.resolve();
         const target = grpcTarget(this.endpoint);
@@ -272,7 +276,7 @@ class ShredStreamClient {
                 if (signal.aborted)
                     return;
                 try {
-                    void this.processEntryMessage(entry, queue);
+                    void this.processEntryMessage(entry, queue, eventTypeFilter);
                 }
                 catch (err) {
                     console.error("processEntryMessage:", err);
@@ -293,7 +297,7 @@ class ShredStreamClient {
             });
         });
     }
-    async processEntryMessage(entry, queue) {
+    async processEntryMessage(entry, queue, eventTypeFilter) {
         this.receiveStats.entryMessagesReceived += 1;
         const recvUs = (0, unified_parser_js_1.nowUs)();
         const slotNum = toSlotNumber(entry.slot);
@@ -312,18 +316,18 @@ class ShredStreamClient {
         const conn = this.config.connection;
         if (conn) {
             try {
-                await this.processEntryMessageWithAlt(decoded, slotNum, recvUs, queue, bytes.length, conn);
+                await this.processEntryMessageWithAlt(decoded, slotNum, recvUs, queue, bytes.length, conn, eventTypeFilter);
             }
             catch (e) {
                 console.warn(`[shredstream] ALT/RPC 解析失败 slot=${slotNum}:`, e);
-                this.processEntryMessageSync(decoded, slotNum, recvUs, queue, bytes.length);
+                this.processEntryMessageSync(decoded, slotNum, recvUs, queue, bytes.length, eventTypeFilter);
             }
             return;
         }
-        this.processEntryMessageSync(decoded, slotNum, recvUs, queue, bytes.length);
+        this.processEntryMessageSync(decoded, slotNum, recvUs, queue, bytes.length, eventTypeFilter);
     }
     /** 无 RPC：仅用静态账户表 */
-    processEntryMessageSync(decoded, slotNum, recvUs, queue, entriesBytesLen) {
+    processEntryMessageSync(decoded, slotNum, recvUs, queue, entriesBytesLen, eventTypeFilter) {
         let txTotal = 0;
         let evTotal = 0;
         /** 与 golang `shredstream_entries` 一致：单条 gRPC 消息内跨所有 Solana Entry 的连续下标 */
@@ -336,7 +340,7 @@ class ShredStreamClient {
                 const txIndex = globalTxIndex++;
                 if (!tx?.signature)
                     continue;
-                const events = (0, instruction_parse_js_1.dexEventsFromShredWasmTx)(tx, slotNum, txIndex, recvUs, undefined);
+                const events = (0, instruction_parse_js_1.dexEventsFromShredWasmTx)(tx, slotNum, txIndex, recvUs, eventTypeFilter);
                 evTotal += events.length;
                 for (const ev of events) {
                     setGrpcRecvUsMut(ev, recvUs);
@@ -351,7 +355,7 @@ class ShredStreamClient {
         }
     }
     /** 拉取 ALT 后完整账户表解析 */
-    async processEntryMessageWithAlt(decoded, slotNum, recvUs, queue, entriesBytesLen, conn) {
+    async processEntryMessageWithAlt(decoded, slotNum, recvUs, queue, entriesBytesLen, conn, eventTypeFilter) {
         const altKeys = new Set();
         for (const outer of decoded) {
             for (const tx of outer) {
@@ -373,7 +377,7 @@ class ShredStreamClient {
                 if (!tx?.signature)
                     continue;
                 const fullKeys = (0, alt_lookup_js_1.fullAccountKeyStringsFromShredTx)(tx, altMap);
-                const events = (0, instruction_parse_js_1.dexEventsFromShredWasmTxWithFullKeys)(tx, fullKeys, slotNum, txIndex, recvUs, undefined);
+                const events = (0, instruction_parse_js_1.dexEventsFromShredWasmTxWithFullKeys)(tx, fullKeys, slotNum, txIndex, recvUs, eventTypeFilter);
                 evTotal += events.length;
                 for (const ev of events) {
                     setGrpcRecvUsMut(ev, recvUs);

package/dist/shredstream/index.d.ts

@@ -5,7 +5,7 @@
  * - 仅静态账户键；使用 ALT 的交易账户列表不完整
  * - 无 inner instructions，无法 CPI 解析
  * - 无 block_time
- * - 无交易日志（program logs）；客户端对每条交易走 **外层 `parseInstructionUnified`**（与 gRPC 指令解析同源），可产出 `DexEvent`（V0+ALT 若账户下标超出静态表则跳过该指令）
+ * - 无交易日志（program logs）；客户端对每条交易走 **外层 `parseInstructionUnified`**（与 gRPC 指令解析同源），可产出 `DexEvent`（V0+ALT 若账户下标超出静态表则用默认 pubkey best-effort）
  * - `metadata.tx_index` 为**单条 gRPC `Entry` 消息内**跨所有 Solana `Entry` 分组的连续下标（与 golang `shredstream_entries` 扁平 `ti` 对齐），非 slot 级全局序号
  */
 export { type ShredStreamConfig, defaultShredStreamConfig, lowLatencyShredStreamConfig, highThroughputShredStreamConfig, } from "./config.js";

package/dist/shredstream/index.js

@@ -8,7 +8,7 @@ exports.wireBytesToShredWasmTx = exports.decodeShredstreamEntriesBincode = expor
  * - 仅静态账户键；使用 ALT 的交易账户列表不完整
  * - 无 inner instructions，无法 CPI 解析
  * - 无 block_time
- * - 无交易日志（program logs）；客户端对每条交易走 **外层 `parseInstructionUnified`**（与 gRPC 指令解析同源），可产出 `DexEvent`（V0+ALT 若账户下标超出静态表则跳过该指令）
+ * - 无交易日志（program logs）；客户端对每条交易走 **外层 `parseInstructionUnified`**（与 gRPC 指令解析同源），可产出 `DexEvent`（V0+ALT 若账户下标超出静态表则用默认 pubkey best-effort）
  * - `metadata.tx_index` 为**单条 gRPC `Entry` 消息内**跨所有 Solana `Entry` 分组的连续下标（与 golang `shredstream_entries` 扁平 `ti` 对齐），非 slot 级全局序号
  */
 var config_js_1 = require("./config.js");

package/dist/shredstream/instruction_parse.d.ts

@@ -1,10 +1,10 @@
 /**
  * ShredStream：外层编译指令 → `parseInstructionUnified`（与 gRPC 指令解析同源）。
  * `ShredWasmTx` 来自线格式交易经 `@solana/web3.js` 反序列化（见 `wire_to_shred_tx.ts`），非 WASM。
- * 完整账户列表需含 V0 ALT 展开，见 `alt_lookup.ts` + `ShredStreamConfig.connection`。
+ * 有 `ShredStreamConfig.connection` 时可展开 V0 ALT；无 RPC 时用静态账户表 + 默认 pubkey best-effort。
  */
 import type { MessageHeader } from "@solana/web3.js";
-import type { DexEvent } from "../core/dex_event.js";
+import { type DexEvent } from "../core/dex_event.js";
 import type { EventTypeFilter } from "../grpc/types.js";
 export type ShredWasmCompiledIx = {
     programIdIndex: number;
@@ -30,5 +30,5 @@ export type ShredWasmTx = {
  * 使用已解析的完整账户表（静态+ALT）解析外层指令。
  */
 export declare function dexEventsFromShredWasmTxWithFullKeys(tx: ShredWasmTx, fullAccountKeys: string[], slot: number, txIndex: number, grpcRecvUs: number, eventTypeFilter?: EventTypeFilter): DexEvent[];
-/** 仅静态账户表（无 RPC 时；V0+ALT 交易多数指令无法解析） */
+/** 仅静态账户表（无 RPC 时；V0+ALT 缺失账户以默认 pubkey 占位） */
 export declare function dexEventsFromShredWasmTx(tx: ShredWasmTx, slot: number, txIndex: number, grpcRecvUs: number, eventTypeFilter?: EventTypeFilter): DexEvent[];

package/dist/shredstream/instruction_parse.js

@@ -2,12 +2,37 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dexEventsFromShredWasmTxWithFullKeys = dexEventsFromShredWasmTxWithFullKeys;
 exports.dexEventsFromShredWasmTx = dexEventsFromShredWasmTx;
+const dex_event_js_1 = require("../core/dex_event.js");
+const pumpfun_fee_enrich_js_1 = require("../core/pumpfun_fee_enrich.js");
 const mod_js_1 = require("../instr/mod.js");
+const program_ids_js_1 = require("../instr/program_ids.js");
 function asU8(b) {
     if (b instanceof Uint8Array)
         return b;
     return Uint8Array.from(b);
 }
+const UNKNOWN_PROGRAM_CANDIDATES = [
+    program_ids_js_1.PUMPFUN_PROGRAM_ID,
+    program_ids_js_1.PUMPSWAP_PROGRAM_ID,
+    program_ids_js_1.PUMP_FEES_PROGRAM_ID,
+    program_ids_js_1.RAYDIUM_LAUNCHLAB_PROGRAM_ID,
+    program_ids_js_1.RAYDIUM_CPMM_PROGRAM_ID,
+    program_ids_js_1.RAYDIUM_CLMM_PROGRAM_ID,
+    program_ids_js_1.RAYDIUM_AMM_V4_PROGRAM_ID,
+    program_ids_js_1.ORCA_WHIRLPOOL_PROGRAM_ID,
+    program_ids_js_1.METEORA_POOLS_PROGRAM_ID,
+    program_ids_js_1.METEORA_DAMM_V2_PROGRAM_ID,
+    program_ids_js_1.METEORA_DLMM_PROGRAM_ID,
+];
+const SHRED_DEFAULT_PUBKEY = (0, dex_event_js_1.defaultPubkey)();
+function ixAccountStrings(fullAccountKeys, accBytes) {
+    const accountStrs = [];
+    for (let i = 0; i < accBytes.length; i++) {
+        const ai = accBytes[i];
+        accountStrs.push(ai < fullAccountKeys.length ? fullAccountKeys[ai] : SHRED_DEFAULT_PUBKEY);
+    }
+    return accountStrs;
+}
 /**
  * 使用已解析的完整账户表（静态+ALT）解析外层指令。
  */
@@ -18,30 +43,30 @@ function dexEventsFromShredWasmTxWithFullKeys(tx, fullAccountKeys, slot, txIndex
     const out = [];
     for (const rawIx of ixs) {
         const pidIdx = rawIx.programIdIndex;
-        if (!Number.isFinite(pidIdx) || pidIdx < 0 || pidIdx >= fullAccountKeys.length)
+        if (!Number.isFinite(pidIdx) || pidIdx < 0)
             continue;
-        const programId = fullAccountKeys[pidIdx];
         const accBytes = asU8(rawIx.accounts);
         const data = asU8(rawIx.data);
-        const accountStrs = [];
-        let oob = false;
-        for (let i = 0; i < accBytes.length; i++) {
-            const ai = accBytes[i];
-            if (ai >= fullAccountKeys.length) {
-                oob = true;
-                break;
+        const accountStrs = ixAccountStrings(fullAccountKeys, accBytes);
+        if (pidIdx >= fullAccountKeys.length) {
+            for (const programId of UNKNOWN_PROGRAM_CANDIDATES) {
+                const ev = (0, mod_js_1.parseInstructionUnified)(data, accountStrs, tx.signature, slot, txIndex, undefined, grpcRecvUs, eventTypeFilter, programId);
+                if (ev) {
+                    out.push(ev);
+                    break;
+                }
             }
-            accountStrs.push(fullAccountKeys[ai]);
-        }
-        if (oob)
             continue;
+        }
+        const programId = fullAccountKeys[pidIdx];
         const ev = (0, mod_js_1.parseInstructionUnified)(data, accountStrs, tx.signature, slot, txIndex, undefined, grpcRecvUs, eventTypeFilter, programId);
         if (ev)
             out.push(ev);
     }
+    (0, pumpfun_fee_enrich_js_1.enrichPumpfunSameTxPostMerge)(out);
     return out;
 }
-/** 仅静态账户表（无 RPC 时；V0+ALT 交易多数指令无法解析） */
+/** 仅静态账户表（无 RPC 时；V0+ALT 缺失账户以默认 pubkey 占位） */
 function dexEventsFromShredWasmTx(tx, slot, txIndex, grpcRecvUs, eventTypeFilter) {
     return dexEventsFromShredWasmTxWithFullKeys(tx, tx.accounts, slot, txIndex, grpcRecvUs, eventTypeFilter);
 }

package/dist/util/market.d.ts

@@ -0,0 +1,18 @@
+export type NumericAmount = bigint | number | string;
+export type NormalizedTradeSide = "Buy" | "Sell";
+/**
+ * Convert a Q64.64 sqrt price into quote-token units per one base token.
+ */
+export declare function sqrtPriceX64ToPrice(sqrtPriceX64: NumericAmount, baseDecimals: number, quoteDecimals: number): number;
+/**
+ * Compute quote-token price per one base token from raw vault balances.
+ */
+export declare function vaultPriceFromBalances(baseRaw: NumericAmount, quoteRaw: NumericAmount, baseDecimals: number, quoteDecimals: number): number | undefined;
+/**
+ * Positive watched-token delta means Buy; negative means Sell.
+ */
+export declare function normalizeBuySellFromTokenDelta(tokenDelta: NumericAmount): NormalizedTradeSide | undefined;
+/**
+ * If input is quote, the user buys base. If input is base, the user sells base.
+ */
+export declare function normalizeBuySellFromInputMint(inputMint: string, baseMint: string, quoteMint: string): NormalizedTradeSide | undefined;

package/dist/util/market.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sqrtPriceX64ToPrice = sqrtPriceX64ToPrice;
+exports.vaultPriceFromBalances = vaultPriceFromBalances;
+exports.normalizeBuySellFromTokenDelta = normalizeBuySellFromTokenDelta;
+exports.normalizeBuySellFromInputMint = normalizeBuySellFromInputMint;
+function amountToNumber(value) {
+    if (typeof value === "bigint")
+        return Number(value);
+    if (typeof value === "number")
+        return value;
+    if (value.trim() === "")
+        throw new Error("amount must not be empty");
+    return Number(value);
+}
+/**
+ * Convert a Q64.64 sqrt price into quote-token units per one base token.
+ */
+function sqrtPriceX64ToPrice(sqrtPriceX64, baseDecimals, quoteDecimals) {
+    const sqrt = amountToNumber(sqrtPriceX64) / 2 ** 64;
+    return sqrt * sqrt * 10 ** (baseDecimals - quoteDecimals);
+}
+/**
+ * Compute quote-token price per one base token from raw vault balances.
+ */
+function vaultPriceFromBalances(baseRaw, quoteRaw, baseDecimals, quoteDecimals) {
+    const base = amountToNumber(baseRaw);
+    if (base === 0)
+        return undefined;
+    return (amountToNumber(quoteRaw) / base) * 10 ** (baseDecimals - quoteDecimals);
+}
+/**
+ * Positive watched-token delta means Buy; negative means Sell.
+ */
+function normalizeBuySellFromTokenDelta(tokenDelta) {
+    const delta = amountToNumber(tokenDelta);
+    if (delta > 0)
+        return "Buy";
+    if (delta < 0)
+        return "Sell";
+    return undefined;
+}
+/**
+ * If input is quote, the user buys base. If input is base, the user sells base.
+ */
+function normalizeBuySellFromInputMint(inputMint, baseMint, quoteMint) {
+    if (baseMint === quoteMint)
+        return undefined;
+    if (inputMint === quoteMint)
+        return "Buy";
+    if (inputMint === baseMint)
+        return "Sell";
+    return undefined;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sol-parser-sdk-nodejs",
-  "version": "0.4.0",
+  "version": "0.5.5",
   "description": "High-performance Solana DEX event parser for Node.js/TypeScript (Yellowstone gRPC, log parsing)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",