sol-parser-sdk 0.5.17 → 0.5.18

package/dist/core/dex_event.d.ts

@@ -1,7 +1,16 @@
+import type { PumpFunPostCompleteBuyEvent, PumpFunSweepBondingCurveFeeEvent, PumpFunCompleteEvent, PumpSwapSweepPoolFeeEvent } from "../logs/pump_upgrade.js";
 import type { RawAccountSnapshotEvent, LiquidityAccountSnapshotEvent } from '../liquidity_snapshot.js';
 import type { EventMetadata } from "./metadata.js";
 /** 统一 DEX 事件：外部标签 JSON（单键对象）；键名清单见 `scripts/dex-event-variant-names.json` */
 export type DexEvent = {
+    PumpFunPostCompleteBuy: PumpFunPostCompleteBuyEvent;
+} | {
+    PumpFunSweepBondingCurveFee: PumpFunSweepBondingCurveFeeEvent;
+} | {
+    PumpFunComplete: PumpFunCompleteEvent;
+} | {
+    PumpSwapSweepPoolFee: PumpSwapSweepPoolFeeEvent;
+} | {
     RawAccountSnapshot: RawAccountSnapshotEvent;
 } | {
     LiquidityAccountSnapshot: LiquidityAccountSnapshotEvent;
@@ -131,6 +140,12 @@ export type DexEvent = {
     MeteoraDammV2RemoveLiquidity: MeteoraDammV2RemoveLiquidityEvent;
 } | {
     MeteoraDammV2CreatePosition: MeteoraDammV2CreatePositionEvent;
+} | {
+    MeteoraDammV2ClaimPositionFee: MeteoraDammV2ClaimPositionFeeEvent;
+} | {
+    MeteoraDammV2ClaimReward: MeteoraDammV2ClaimRewardEvent;
+} | {
+    MeteoraDlmmClaimReward: MeteoraDlmmClaimRewardEvent;
 } | {
     MeteoraDammV2InitializePool: MeteoraDammV2InitializePoolEvent;
 } | {
@@ -139,6 +154,16 @@ export type DexEvent = {
     MeteoraDammV2UpdateDelegatePermission: MeteoraDammV2UpdateDelegatePermissionEvent;
 } | {
     MeteoraDammV2WithdrawDeadLiquidityReward: MeteoraDammV2WithdrawDeadLiquidityRewardEvent;
+} | {
+    MeteoraDammV2WithdrawIneligibleReward: MeteoraDammV2WithdrawIneligibleRewardEvent;
+} | {
+    MeteoraDammV2UpdateRewardFunder: MeteoraDammV2UpdateRewardFunderEvent;
+} | {
+    MeteoraDammV2UpdateRewardDuration: MeteoraDammV2UpdateRewardDurationEvent;
+} | {
+    MeteoraDammV2InitializeReward: MeteoraDammV2InitializeRewardEvent;
+} | {
+    MeteoraDammV2FundReward: MeteoraDammV2FundRewardEvent;
 } | {
     MeteoraDammV2CreateConfig: MeteoraDammV2CreateConfigEvent;
 } | {
@@ -219,6 +244,7 @@ export type DexEvent = {
     Error: string;
 };
 export interface PumpFunCreateTokenEvent {
+    depth?: number;
     metadata: EventMetadata;
     name: string;
     symbol: string;
@@ -259,6 +285,7 @@ export interface PumpFunCreateV2TokenEvent extends PumpFunCreateTokenEvent {
     observed_fee_recipient: string;
 }
 export interface PumpFunTradeEvent {
+    creator_fee_unclaimed?: bigint;
     metadata: EventMetadata;
     mint: string;
     sol_amount: bigint;
@@ -469,6 +496,7 @@ export interface PumpSwapTradeEvent {
     ix_name: string;
 }
 export interface PumpSwapBuyEvent {
+    creator_fee_unclaimed?: bigint;
     metadata: EventMetadata;
     timestamp: bigint;
     base_amount_out: bigint;
@@ -526,6 +554,7 @@ export interface PumpSwapBuyEvent {
     fee_recipient_quote_token_account?: string;
 }
 export interface PumpSwapSellEvent {
+    creator_fee_unclaimed?: bigint;
     metadata: EventMetadata;
     timestamp: bigint;
     base_amount_in: bigint;
@@ -662,6 +691,8 @@ export interface RaydiumClmmSwapEvent {
 export interface RaydiumClmmIncreaseLiquidityEvent {
     metadata: EventMetadata;
     pool: string;
+    /** Personal position PDA; distinct from the NFT token account and mint. */
+    personal_position?: string;
     position_nft_mint: string;
     user: string;
     liquidity: bigint;
@@ -676,6 +707,8 @@ export interface RaydiumClmmIncreaseLiquidityEvent {
 export interface RaydiumClmmDecreaseLiquidityEvent {
     metadata: EventMetadata;
     pool: string;
+    /** Personal position PDA; distinct from the NFT token account and mint. */
+    personal_position?: string;
     position_nft_mint: string;
     user: string;
     liquidity: bigint;
@@ -838,6 +871,11 @@ export interface RaydiumCpmmSwapEvent {
     input_transfer_fee: bigint;
     output_transfer_fee: bigint;
     base_input: boolean;
+    input_mint?: string;
+    output_mint?: string;
+    trade_fee?: bigint;
+    creator_fee?: bigint;
+    creator_fee_on_input?: boolean;
 }
 export interface RaydiumCpmmDepositEvent {
     metadata: EventMetadata;
@@ -1039,6 +1077,9 @@ export interface OrcaWhirlpoolPoolInitializedEvent {
 }
 export interface MeteoraPoolsSwapEvent {
     metadata: EventMetadata;
+    /** Instruction intent; executed amounts remain in in_amount/out_amount. */
+    amount_in?: bigint;
+    minimum_out_amount?: bigint;
     in_amount: bigint;
     out_amount: bigint;
     trade_fee: bigint;
@@ -1210,6 +1251,53 @@ export interface MeteoraDammV2WithdrawDeadLiquidityRewardEvent {
     reward_mint: string;
     amount: bigint;
 }
+/** IDL `EvtWithdrawIneligibleReward` */
+export interface MeteoraDammV2WithdrawIneligibleRewardEvent {
+    metadata: EventMetadata;
+    pool: string;
+    reward_mint: string;
+    amount: bigint;
+}
+/** Official IDL `EvtUpdateRewardFunder`. */
+export interface MeteoraDammV2UpdateRewardFunderEvent {
+    metadata: EventMetadata;
+    pool: string;
+    reward_index: number;
+    old_funder: string;
+    new_funder: string;
+}
+/** Official IDL `EvtUpdateRewardDuration`. */
+export interface MeteoraDammV2UpdateRewardDurationEvent {
+    metadata: EventMetadata;
+    pool: string;
+    reward_index: number;
+    old_reward_duration: bigint;
+    new_reward_duration: bigint;
+}
+/** Official IDL `EvtInitializeReward`. */
+export interface MeteoraDammV2InitializeRewardEvent {
+    metadata: EventMetadata;
+    pool: string;
+    reward_mint: string;
+    funder: string;
+    creator: string;
+    reward_index: number;
+    reward_duration: bigint;
+}
+/** IDL `EvtFundReward`; amount is net new funding plus carried empty rewards.
+ * The post rate also includes unexpired rewards from the previous period. */
+export interface MeteoraDammV2FundRewardEvent {
+    metadata: EventMetadata;
+    pool: string;
+    funder: string;
+    mint_reward: string;
+    reward_index: number;
+    amount: bigint;
+    transfer_fee_excluded_amount_in: bigint;
+    reward_duration_end: bigint;
+    pre_reward_rate: bigint;
+    post_reward_rate: bigint;
+}
 /** IDL `EvtCreateConfig` (includes DAMM v2 0.2.4 `permission`) */
 export interface MeteoraDammV2CreateConfigEvent {
     metadata: EventMetadata;
@@ -1236,6 +1324,17 @@ export interface MeteoraDammV2CreateDynamicConfigEvent {
     permission: bigint;
 }
 export interface MeteoraDbcSwapEvent {
+    event_version?: number;
+    swap_mode?: number;
+    amount_0?: bigint;
+    amount_1?: bigint;
+    maximum_amount_in?: bigint;
+    included_fee_input_amount?: bigint;
+    /** Curve remainder uses fee-excluded units with input fees; not gross unspent wallet funding. */
+    amount_left?: bigint;
+    quote_reserve_amount?: bigint;
+    migration_threshold?: bigint;
+    has_transfer_hook?: boolean;
     metadata: EventMetadata;
     pool: string;
     config: string;
@@ -1288,6 +1387,12 @@ export interface MeteoraDlmmSwapEvent {
     protocol_fee: bigint;
     fee_bps: bigint;
     host_fee: bigint;
+    event_version?: number;
+    amount_left?: bigint;
+    mm_fee?: bigint;
+    limit_order_fee?: bigint;
+    fees_on_input?: boolean;
+    fees_on_token_x?: boolean;
 }
 export interface MeteoraPoolsSetPoolFeesEvent {
     metadata: EventMetadata;
@@ -1448,6 +1553,11 @@ export interface NonceAccountEvent {
     authority: string;
 }
 export interface PumpFunGlobal {
+    creator_fee_configurable?: boolean;
+    max_configurable_creator_fee_bps?: bigint;
+    holder_reward_claim_authority?: string;
+    is_holder_reward_enabled?: boolean;
+    max_curve_depth?: number;
     initialized: boolean;
     authority: string;
     fee_recipient: string;
@@ -1480,6 +1590,12 @@ export interface PumpFunGlobalAccountEvent {
     global: PumpFunGlobal;
 }
 export interface PumpFunBondingCurve {
+    creator_fee?: bigint;
+    protocol_fees?: bigint;
+    depth?: number;
+    initial_virtual_quote_reserves?: bigint;
+    post_complete_base_out?: bigint;
+    post_complete_quote_in?: bigint;
     virtual_token_reserves: bigint;
     virtual_quote_reserves: bigint;
     real_token_reserves: bigint;
@@ -1500,6 +1616,7 @@ export interface PumpFunBondingCurveAccountEvent {
     bonding_curve: PumpFunBondingCurve;
 }
 export interface PumpFunFeeConfig {
+    exotic_flat_fees?: PumpFeesFees;
     bump: number;
     admin: string;
     flat_fees: PumpFeesFees;
@@ -1579,6 +1696,8 @@ export interface PumpSwapGlobalConfigAccountEvent {
     global_config: PumpSwapGlobalConfig;
 }
 export interface PumpSwapPool {
+    protocol_fees?: bigint;
+    creator_fees?: bigint;
     pool_bump: number;
     index: number;
     creator: string;
@@ -1870,3 +1989,33 @@ export type LaunchLabPoolCreateEvent = RaydiumLaunchlabPoolCreateEvent;
 export type StonkFunPoolCreateEvent = RaydiumLaunchlabPoolCreateEvent;
 export type LaunchLabTradeEvent = RaydiumLaunchlabTradeEvent;
 export type StonkFunTradeEvent = RaydiumLaunchlabTradeEvent;
+/** Official gross claim amounts; transfer fees can reduce recipient credit. */
+export interface MeteoraDammV2ClaimPositionFeeEvent {
+    metadata: EventMetadata;
+    pool: string;
+    position: string;
+    owner: string;
+    fee_a_claimed: bigint;
+    fee_b_claimed: bigint;
+}
+/** Official accrued gross reward cleared from the position. A frozen-vault skip
+ * can emit a nonzero total_reward without a transfer; use token transfers and
+ * net balance changes to determine wallet credits. */
+export interface MeteoraDammV2ClaimRewardEvent {
+    metadata: EventMetadata;
+    pool: string;
+    position: string;
+    owner: string;
+    mint_reward: string;
+    reward_index: number;
+    total_reward: bigint;
+}
+export interface MeteoraDlmmClaimRewardEvent {
+    metadata: EventMetadata;
+    pool: string;
+    position: string;
+    owner: string;
+    reward_index: bigint;
+    total_reward: bigint;
+    active_bin_id: number;
+}

package/dist/grpc/client.js

@@ -536,6 +536,8 @@ class YellowstoneGrpc {
         };
         let flushTimer;
         if (order.needsTimer) {
+            // Idle flushes are limited by Node timers (at least 1 ms); arrivals
+            // still check the monotonic microsecond window in OrderDispatcher.
             const intervalMs = this.config.order_mode === "MicroBatch"
                 ? Math.max(1, Math.ceil(this.config.micro_batch_us / 1000))
                 : Math.max(1, Math.floor(this.config.order_timeout_ms / 2));

package/dist/grpc/log_instr_dedup.js

@@ -48,10 +48,12 @@ function ixLane(ixName) {
     switch (ixName) {
         case "sell":
         case "sell_v2":
+        case "sell_v3":
             return 1;
         case "buy_exact_sol_in":
         case "buy_exact_quote_in":
         case "buy_exact_quote_in_v2":
+        case "buy_exact_quote_in_v3":
             return 2;
         default:
             return 0;
@@ -74,6 +76,10 @@ function dedupeKey(ev, occurrenceCounts) {
         return `PumpFunTrade|${base}|${occurrence}`;
     }
     switch (name) {
+        case "PumpFunComplete":
+            return `PumpFunComplete|${data.mint}|${data.bonding_curve}|${data.user}`;
+        case "PumpFunPostCompleteBuy":
+            return `PumpFunPostCompleteBuy|${data.mint}|${data.bonding_curve}|${data.user}|${data.base_out}|${data.quote_in}`;
         case "PumpFunCreate":
             return `PumpFunCreate|${data.mint}`;
         case "PumpFunCreateV2":
@@ -82,22 +88,35 @@ function dedupeKey(ev, occurrenceCounts) {
             return `PumpFunMigrate|${data.mint}|${data.pool}|${data.user}`;
         case "RaydiumLaunchlabTrade":
             return `RaydiumLaunchlabTrade|${data.pool_state}|${data.user}|${Boolean(data.is_buy)}`;
+        case "MeteoraPoolsPoolCreated":
+            return isDefaultPubkey(data.pool) ? null : `MeteoraPoolsPoolCreated|${data.pool}`;
         case "RaydiumLaunchlabPoolCreate":
             return `RaydiumLaunchlabPoolCreate|${data.pool_state}`;
         case "RaydiumLaunchlabMigrateAmm":
             return `RaydiumLaunchlabMigrateAmm|${data.old_pool}|${data.new_pool}|${data.user}`;
         case "PumpSwapTrade":
             return `PumpSwapTrade|${data.mint}|${data.user}|${Boolean(data.is_buy)}|${ixLane(data.ix_name)}`;
-        case "PumpSwapBuy":
-            return `PumpSwapBuy|${data.pool}|${data.user}`;
-        case "PumpSwapSell":
-            return `PumpSwapSell|${data.pool}|${data.user}`;
+        case "PumpSwapBuy": {
+            const base = `PumpSwapBuy|${data.pool}|${data.user}`;
+            return `${base}|${nextOccurrence(base, occurrenceCounts)}`;
+        }
+        case "PumpSwapSell": {
+            const base = `PumpSwapSell|${data.pool}|${data.user}`;
+            return `${base}|${nextOccurrence(base, occurrenceCounts)}`;
+        }
         case "PumpSwapCreatePool":
             return `PumpSwapCreatePool|${data.pool}|${data.base_mint}|${data.quote_mint}`;
         case "PumpSwapLiquidityAdded":
             return `PumpSwapLiquidityAdded|${data.pool}|${data.user}`;
         case "PumpSwapLiquidityRemoved":
             return `PumpSwapLiquidityRemoved|${data.pool}|${data.user}`;
+        case "RaydiumClmmIncreaseLiquidity":
+        case "RaydiumClmmDecreaseLiquidity": {
+            if (isDefaultPubkey(data.personal_position))
+                return null;
+            const base = `${name}|${data.personal_position}`;
+            return `${base}|${nextOccurrence(base, occurrenceCounts)}`;
+        }
         case "RaydiumClmmSwap": {
             const base = String(data.pool_state);
             return `RaydiumClmmSwap|${base}|${nextOccurrence(`RaydiumClmm|${base}`, occurrenceCounts)}`;
@@ -112,6 +131,11 @@ function dedupeKey(ev, occurrenceCounts) {
                 : `in|${data.amount_in}`;
             return `RaydiumAmmV4Swap|${base}|${nextOccurrence(`RaydiumAmmV4|${base}`, occurrenceCounts)}`;
         }
+        case "OrcaWhirlpoolLiquidityIncreased":
+        case "OrcaWhirlpoolLiquidityDecreased": {
+            const base = `${name}|${data.whirlpool}|${data.position}|${data.liquidity}`;
+            return `${base}|${nextOccurrence(base, occurrenceCounts)}`;
+        }
         case "OrcaWhirlpoolSwap": {
             const base = String(data.whirlpool);
             return `OrcaWhirlpoolSwap|${base}|${nextOccurrence(`OrcaWhirlpool|${base}`, occurrenceCounts)}`;
@@ -377,6 +401,13 @@ function mergeGrpcInstructionIntoLog(logEvent, ixEvent) {
             if (ixName === "PumpSwapLiquidityRemoved")
                 mergePumpSwapLiquidity(log, ix);
             break;
+        case "RaydiumClmmIncreaseLiquidity":
+        case "RaydiumClmmDecreaseLiquidity":
+            for (const key of ["pool", "user", "personal_position"])
+                fillString(log, key, ix);
+            for (const key of logName === "RaydiumClmmIncreaseLiquidity" ? ["amount0_max", "amount1_max"] : ["amount0_min", "amount1_min"])
+                log[key] = ix[key];
+            return;
         case "RaydiumClmmSwap":
             if (ixName === "RaydiumClmmSwap")
                 mergeRaydiumClmmSwap(log, ix);
@@ -385,6 +416,11 @@ function mergeGrpcInstructionIntoLog(logEvent, ixEvent) {
             if (ixName === "RaydiumAmmV4Swap")
                 mergeRaydiumAmmV4Swap(log, ix);
             break;
+        case "MeteoraPoolsPoolCreated":
+            if (ixName === "MeteoraPoolsPoolCreated")
+                for (const key of ["pool", "lp_mint", "token_a_mint", "token_b_mint"])
+                    fillString(log, key, ix);
+            break;
         case "RaydiumLaunchlabPoolCreate":
             if (ixName === "RaydiumLaunchlabPoolCreate")
                 mergeRaydiumLaunchlabPoolCreate(log, ix);
@@ -408,8 +444,17 @@ function dedupeLogInstructionEvents(logEvents, instructionEvents) {
             indexByKey.set(key, out.length);
         out.push(ev);
     }
-    for (const ev of instructionEvents) {
-        const key = dedupeKey(ev, ixOccurrenceCounts);
+    // Ordinal pairing is ambiguous when one source has lost an invocation.
+    const instructionKeys = instructionEvents.map(ev => dedupeKey(ev, ixOccurrenceCounts));
+    for (const [base, count] of logOccurrenceCounts) {
+        if (!/^(PumpFun|PumpSwapBuy|PumpSwapSell|OrcaWhirlpoolLiquidityIncreased|OrcaWhirlpoolLiquidityDecreased|RaydiumClmmIncreaseLiquidity|RaydiumClmmDecreaseLiquidity)\|/.test(base) || count === ixOccurrenceCounts.get(base))
+            continue;
+        const prefix = `${base.replace(/^PumpFun\|/, 'PumpFunTrade|')}|`;
+        for (let occurrence = 0; occurrence < count; occurrence++)
+            indexByKey.delete(`${prefix}${occurrence}`);
+    }
+    for (const [i, ev] of instructionEvents.entries()) {
+        const key = instructionKeys[i];
         if (!key) {
             out.push(ev);
             continue;
@@ -422,5 +467,28 @@ function dedupeLogInstructionEvents(logEvents, instructionEvents) {
         }
         mergeGrpcInstructionIntoLog(out[existing], ev);
     }
-    return out;
+    return preferCurrentDbcEvents(out);
+}
+// Old and current DBC events can describe the same execution. Keep occurrence counts.
+function preferCurrentDbcEvents(events) {
+    const groups = new Map();
+    for (const [i, event] of events.entries()) {
+        if (!('MeteoraDbcSwap' in event))
+            continue;
+        const e = event.MeteoraDbcSwap;
+        const key = [e.pool, e.config, e.trade_direction, e.amount_in, e.output_amount, e.next_sqrt_price, e.trading_fee, e.protocol_fee, e.referral_fee, e.current_timestamp].join('|');
+        let group = groups.get(key);
+        if (!group) {
+            group = [[], []];
+            groups.set(key, group);
+        }
+        group[e.event_version === 2 ? 1 : 0].push(i);
+    }
+    const removed = new Set();
+    for (const [old, current] of groups.values()) {
+        if (old.length !== current.length)
+            continue;
+        old.forEach((index, i) => { events[index] = events[current[i]]; removed.add(current[i]); });
+    }
+    return removed.size ? events.filter((_, i) => !removed.has(i)) : events;
 }

package/dist/grpc/order_buffer.d.ts

@@ -6,11 +6,16 @@ export declare class OrderDispatcher {
     private readonly microBatchUs;
     private readonly slots;
     private readonly streamingWatermarks;
+    private readonly streamingPending;
     private microBatch;
     private microBatchStartUs;
     private lastFlushMs;
     private currentSlot;
     private seq;
+    private orderedWatermark;
+    private orderedLateDrops;
+    /** Each rejected late transaction marks an Ordered continuity break. */
+    get orderedLateTransactions(): number;
     constructor(config: ClientConfig);
     get needsTimer(): boolean;
     pushTransactionEvents(events: DexEvent[], fallbackSlot: number | bigint | string, fallbackTxIndex: number | bigint | string, emit: (event: DexEvent) => void): void;

package/dist/grpc/order_buffer.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderDispatcher = void 0;
+const node_perf_hooks_1 = require("node:perf_hooks");
 const metadata_js_1 = require("../core/metadata.js");
 const dex_event_js_1 = require("../core/dex_event.js");
 function eventSlotAndIndex(events, fallbackSlot, fallbackTxIndex) {
@@ -16,11 +17,16 @@ class OrderDispatcher {
     microBatchUs;
     slots = new Map();
     streamingWatermarks = new Map();
+    streamingPending = new Set();
     microBatch = [];
     microBatchStartUs = 0;
-    lastFlushMs = Date.now();
+    lastFlushMs = node_perf_hooks_1.performance.now();
     currentSlot = 0n;
     seq = 0;
+    orderedWatermark = null;
+    orderedLateDrops = 0;
+    /** Each rejected late transaction marks an Ordered continuity break. */
+    get orderedLateTransactions() { return this.orderedLateDrops; }
     constructor(config) {
         this.mode = config.order_mode;
         this.timeoutMs = Math.max(1, config.order_timeout_ms || 100);
@@ -50,12 +56,12 @@ class OrderDispatcher {
         }
     }
     flushDue(emit) {
-        const nowMs = Date.now();
+        const nowMs = node_perf_hooks_1.performance.now();
         if ((this.mode === "Ordered" || this.mode === "StreamingOrdered") && nowMs - this.lastFlushMs > this.timeoutMs) {
             this.flushAllSlots(emit);
         }
         if (this.mode === "MicroBatch") {
-            const nowUs = Math.floor(nowMs * 1000);
+            const nowUs = nowMs * 1000;
             if (this.microBatch.length > 0 && nowUs - this.microBatchStartUs >= this.microBatchUs) {
                 this.flushMicroBatch(emit);
             }
@@ -66,6 +72,16 @@ class OrderDispatcher {
         this.flushMicroBatch(emit);
     }
     pushOrdered(batch, emit) {
+        const last = this.orderedWatermark;
+        if (batch.slot < this.currentSlot || (last && (batch.slot < last.slot ||
+            (batch.slot === last.slot && batch.txIndex <= last.txIndex)))) {
+            this.orderedLateDrops++;
+            const dropped = this.orderedLateDrops;
+            if (dropped <= 10 || Number.isInteger(Math.log2(dropped))) {
+                console.warn(`Ordered continuity break: dropped late transaction (${batch.slot},${batch.txIndex}); total=${dropped}`);
+            }
+            return;
+        }
         if (batch.slot > this.currentSlot && this.currentSlot > 0) {
             this.flushBefore(batch.slot, emit);
         }
@@ -74,6 +90,8 @@ class OrderDispatcher {
         this.pushSlotBatch(batch);
     }
     pushStreaming(batch, emit) {
+        if (batch.slot < this.currentSlot)
+            return;
         if (batch.slot > this.currentSlot && this.currentSlot > 0) {
             this.flushBefore(batch.slot, emit);
             for (const slot of [...this.streamingWatermarks.keys()]) {
@@ -81,8 +99,10 @@ class OrderDispatcher {
                     this.streamingWatermarks.delete(slot);
             }
         }
-        if (batch.slot > this.currentSlot)
+        if (batch.slot > this.currentSlot) {
             this.currentSlot = batch.slot;
+            this.streamingPending.clear();
+        }
         const expected = this.streamingWatermarks.get(batch.slot) ?? 0n;
         if (batch.txIndex === expected) {
             this.emitBatch(batch, emit);
@@ -90,24 +110,27 @@ class OrderDispatcher {
             const buffered = this.slots.get(batch.slot);
             if (buffered) {
                 buffered.sort(compareBatch);
-                let pos = buffered.findIndex((b) => b.txIndex === watermark);
-                while (pos >= 0) {
-                    const [next] = buffered.splice(pos, 1);
-                    this.emitBatch(next, emit);
-                    watermark += 1n;
-                    pos = buffered.findIndex((b) => b.txIndex === watermark);
+                let released = 0;
+                while (released < buffered.length && buffered[released].txIndex === watermark) {
+                    this.emitBatch(buffered[released], emit);
+                    this.streamingPending.delete(watermark);
+                    released++;
+                    watermark++;
                 }
-                if (buffered.length === 0)
+                if (released === buffered.length)
                     this.slots.delete(batch.slot);
+                else if (released)
+                    buffered.splice(0, released);
             }
             this.streamingWatermarks.set(batch.slot, watermark);
         }
-        else if (batch.txIndex > expected) {
+        else if (batch.txIndex > expected && !this.streamingPending.has(batch.txIndex)) {
+            this.streamingPending.add(batch.txIndex);
             this.pushSlotBatch(batch);
         }
     }
     pushMicroBatch(batch, emit) {
-        const nowUs = Math.floor(Date.now() * 1000);
+        const nowUs = node_perf_hooks_1.performance.now() * 1000;
         if (this.microBatch.length === 0)
             this.microBatchStartUs = nowUs;
         this.microBatch.push(batch);
@@ -133,7 +156,7 @@ class OrderDispatcher {
             this.slots.delete(s);
             this.streamingWatermarks.delete(s);
         }
-        this.lastFlushMs = Date.now();
+        this.lastFlushMs = node_perf_hooks_1.performance.now();
     }
     flushAllSlots(emit) {
         for (const s of [...this.slots.keys()].sort((a, b) => a < b ? -1 : a > b ? 1 : 0)) {
@@ -142,9 +165,20 @@ class OrderDispatcher {
             for (const batch of batches)
                 this.emitBatch(batch, emit);
             this.slots.delete(s);
-            this.streamingWatermarks.delete(s);
+            if (this.mode === "StreamingOrdered" && batches.length) {
+                const next = batches[batches.length - 1].txIndex + 1n;
+                this.streamingWatermarks.set(s, next > (this.streamingWatermarks.get(s) ?? 0n)
+                    ? next : this.streamingWatermarks.get(s));
+            }
+            else
+                this.streamingWatermarks.delete(s);
+        }
+        this.streamingPending.clear();
+        for (const slot of this.streamingWatermarks.keys()) {
+            if (this.mode !== "StreamingOrdered" || slot !== this.currentSlot)
+                this.streamingWatermarks.delete(slot);
         }
-        this.lastFlushMs = Date.now();
+        this.lastFlushMs = node_perf_hooks_1.performance.now();
     }
     flushMicroBatch(emit) {
         if (this.microBatch.length === 0)
@@ -154,9 +188,11 @@ class OrderDispatcher {
             this.emitBatch(batch, emit);
         this.microBatch = [];
         this.microBatchStartUs = 0;
-        this.lastFlushMs = Date.now();
+        this.lastFlushMs = node_perf_hooks_1.performance.now();
     }
     emitBatch(batch, emit) {
+        if (this.mode === "Ordered")
+            this.orderedWatermark = { slot: batch.slot, txIndex: batch.txIndex };
         for (const event of batch.events)
             emit(event);
     }

package/dist/grpc/types.d.ts

@@ -1,6 +1,9 @@
 import type { SubscribeRequestFilterAccountsFilter } from "./protocol/geyser.js";
 import type { DexEvent } from "../core/dex_event.js";
 /** gRPC 订阅顺序模式 */
+/** Ordered sorts buffered transactions until a newer slot or timeout. Late data
+ * for a closed slot or at/before the emitted watermark is dropped with a
+ * continuity-break warning; upstream completeness cannot be guaranteed. */
 export type OrderMode = "Unordered" | "Ordered" | "StreamingOrdered" | "MicroBatch";
 /** 与 Rust `grpc::types::Protocol` 一致 */
 export type Protocol = "PumpFun" | "PumpSwap" | "PumpFees" | "LaunchLab" | "StonkFun" | "RaydiumLaunchlab" | "RaydiumCpmm" | "RaydiumClmm" | "RaydiumAmmV4" | "OrcaWhirlpool" | "MeteoraPools" | "MeteoraDammV2" | "MeteoraDlmm" | "MeteoraDbc";
@@ -151,7 +154,7 @@ export declare function accountFilterFromProgramOwners(programIds: string[]): Ac
  */
 export declare function accountFilterMemcmp(offset: number, bytes: Uint8Array): SubscribeRequestFilterAccountsFilter;
 /** 事件类型过滤标签 */
-export type EventType = "AccountRawSnapshot" | "AccountLiquiditySnapshot" | "BlockMeta" | "RaydiumLaunchlabTrade" | "RaydiumLaunchlabPoolCreate" | "RaydiumLaunchlabMigrateAmm" | "PumpFunTrade" | "PumpFunBuy" | "PumpFunSell" | "PumpFunBuyExactSolIn" | "PumpFunCreate" | "PumpFunCreateV2" | "PumpFunComplete" | "PumpFunMigrate" | "PumpFeesCreateFeeSharingConfig" | "PumpFeesInitializeFeeConfig" | "PumpFeesResetFeeSharingConfig" | "PumpFeesRevokeFeeSharingAuthority" | "PumpFeesTransferFeeSharingAuthority" | "PumpFeesUpdateAdmin" | "PumpFeesUpdateFeeConfig" | "PumpFeesUpdateFeeShares" | "PumpFeesUpsertFeeTiers" | "PumpFunMigrateBondingCurveCreator" | "PumpSwapTrade" | "PumpSwapBuy" | "PumpSwapSell" | "PumpSwapCreatePool" | "PumpSwapLiquidityAdded" | "PumpSwapLiquidityRemoved" | "RaydiumCpmmSwap" | "RaydiumCpmmDeposit" | "RaydiumCpmmWithdraw" | "RaydiumCpmmInitialize" | "RaydiumClmmSwap" | "RaydiumClmmCreatePool" | "RaydiumClmmOpenPosition" | "RaydiumClmmClosePosition" | "RaydiumClmmIncreaseLiquidity" | "RaydiumClmmDecreaseLiquidity" | "RaydiumClmmLiquidityChange" | "RaydiumClmmConfigChange" | "RaydiumClmmCreatePersonalPosition" | "RaydiumClmmLiquidityCalculate" | "RaydiumClmmOpenLimitOrder" | "RaydiumClmmIncreaseLimitOrder" | "RaydiumClmmDecreaseLimitOrder" | "RaydiumClmmSettleLimitOrder" | "RaydiumClmmUpdateRewardInfos" | "RaydiumClmmOpenPositionWithTokenExtNft" | "RaydiumClmmCollectFee" | "RaydiumAmmV4Swap" | "RaydiumAmmV4Deposit" | "RaydiumAmmV4Withdraw" | "RaydiumAmmV4Initialize2" | "RaydiumAmmV4WithdrawPnl" | "OrcaWhirlpoolSwap" | "OrcaWhirlpoolLiquidityIncreased" | "OrcaWhirlpoolLiquidityDecreased" | "OrcaWhirlpoolPoolInitialized" | "MeteoraPoolsSwap" | "MeteoraPoolsAddLiquidity" | "MeteoraPoolsRemoveLiquidity" | "MeteoraPoolsBootstrapLiquidity" | "MeteoraPoolsPoolCreated" | "MeteoraPoolsSetPoolFees" | "MeteoraDammV2Swap" | "MeteoraDammV2AddLiquidity" | "MeteoraDammV2RemoveLiquidity" | "MeteoraDammV2InitializePool" | "MeteoraDammV2CreatePosition" | "MeteoraDammV2ClosePosition" | "MeteoraDammV2UpdateDelegatePermission" | "MeteoraDammV2WithdrawDeadLiquidityReward" | "MeteoraDammV2CreateConfig" | "MeteoraDammV2CreateDynamicConfig" | "MeteoraDbcSwap" | "MeteoraDbcInitializePool" | "MeteoraDbcCurveComplete" | "MeteoraDlmmSwap" | "MeteoraDlmmAddLiquidity" | "MeteoraDlmmRemoveLiquidity" | "MeteoraDlmmInitializePool" | "MeteoraDlmmInitializeBinArray" | "MeteoraDlmmCreatePosition" | "MeteoraDlmmClosePosition" | "MeteoraDlmmClaimFee" | "TokenAccount" | "TokenInfo" | "NonceAccount" | "AccountPumpFunGlobal" | "AccountPumpFunBondingCurve" | "AccountPumpFunFeeConfig" | "AccountPumpFunSharingConfig" | "AccountPumpFunGlobalVolumeAccumulator" | "AccountPumpFunUserVolumeAccumulator" | "AccountPumpSwapGlobalConfig" | "AccountPumpSwapPool" | "AccountRaydiumClmmAmmConfig" | "AccountRaydiumClmmPoolState" | "AccountRaydiumClmmTickArrayState" | "AccountRaydiumCpmmAmmConfig" | "AccountRaydiumCpmmPoolState" | "AccountOrcaWhirlpool" | "AccountOrcaPosition" | "AccountOrcaTickArray" | "AccountOrcaFeeTier" | "AccountOrcaWhirlpoolsConfig";
+export type EventType = "AccountRawSnapshot" | "AccountLiquiditySnapshot" | "BlockMeta" | "RaydiumLaunchlabTrade" | "RaydiumLaunchlabPoolCreate" | "RaydiumLaunchlabMigrateAmm" | "PumpFunTrade" | "PumpFunBuy" | "PumpFunSell" | "PumpFunBuyExactSolIn" | "PumpFunCreate" | "PumpFunCreateV2" | "PumpFunComplete" | "PumpFunMigrate" | "PumpFeesCreateFeeSharingConfig" | "PumpFeesInitializeFeeConfig" | "PumpFeesResetFeeSharingConfig" | "PumpFeesRevokeFeeSharingAuthority" | "PumpFeesTransferFeeSharingAuthority" | "PumpFeesUpdateAdmin" | "PumpFeesUpdateFeeConfig" | "PumpFeesUpdateFeeShares" | "PumpFeesUpsertFeeTiers" | "PumpFunPostCompleteBuy" | "PumpFunSweepBondingCurveFee" | "PumpSwapSweepPoolFee" | "PumpFunMigrateBondingCurveCreator" | "PumpSwapTrade" | "PumpSwapBuy" | "PumpSwapSell" | "PumpSwapCreatePool" | "PumpSwapLiquidityAdded" | "PumpSwapLiquidityRemoved" | "RaydiumCpmmSwap" | "RaydiumCpmmDeposit" | "RaydiumCpmmWithdraw" | "RaydiumCpmmInitialize" | "RaydiumClmmSwap" | "RaydiumClmmCreatePool" | "RaydiumClmmOpenPosition" | "RaydiumClmmClosePosition" | "RaydiumClmmIncreaseLiquidity" | "RaydiumClmmDecreaseLiquidity" | "RaydiumClmmLiquidityChange" | "RaydiumClmmConfigChange" | "RaydiumClmmCreatePersonalPosition" | "RaydiumClmmLiquidityCalculate" | "RaydiumClmmOpenLimitOrder" | "RaydiumClmmIncreaseLimitOrder" | "RaydiumClmmDecreaseLimitOrder" | "RaydiumClmmSettleLimitOrder" | "RaydiumClmmUpdateRewardInfos" | "RaydiumClmmOpenPositionWithTokenExtNft" | "RaydiumClmmCollectFee" | "RaydiumAmmV4Swap" | "RaydiumAmmV4Deposit" | "RaydiumAmmV4Withdraw" | "RaydiumAmmV4Initialize2" | "RaydiumAmmV4WithdrawPnl" | "OrcaWhirlpoolSwap" | "OrcaWhirlpoolLiquidityIncreased" | "OrcaWhirlpoolLiquidityDecreased" | "OrcaWhirlpoolPoolInitialized" | "MeteoraPoolsSwap" | "MeteoraPoolsAddLiquidity" | "MeteoraPoolsRemoveLiquidity" | "MeteoraPoolsBootstrapLiquidity" | "MeteoraPoolsPoolCreated" | "MeteoraPoolsSetPoolFees" | "MeteoraDammV2Swap" | "MeteoraDammV2AddLiquidity" | "MeteoraDammV2RemoveLiquidity" | "MeteoraDammV2InitializePool" | "MeteoraDammV2CreatePosition" | "MeteoraDammV2ClaimPositionFee" | "MeteoraDammV2ClaimReward" | "MeteoraDlmmClaimReward" | "MeteoraDammV2ClosePosition" | "MeteoraDammV2UpdateDelegatePermission" | "MeteoraDammV2WithdrawDeadLiquidityReward" | "MeteoraDammV2WithdrawIneligibleReward" | "MeteoraDammV2UpdateRewardFunder" | "MeteoraDammV2UpdateRewardDuration" | "MeteoraDammV2InitializeReward" | "MeteoraDammV2FundReward" | "MeteoraDammV2CreateConfig" | "MeteoraDammV2CreateDynamicConfig" | "MeteoraDbcSwap" | "MeteoraDbcInitializePool" | "MeteoraDbcCurveComplete" | "MeteoraDlmmSwap" | "MeteoraDlmmAddLiquidity" | "MeteoraDlmmRemoveLiquidity" | "MeteoraDlmmInitializePool" | "MeteoraDlmmInitializeBinArray" | "MeteoraDlmmCreatePosition" | "MeteoraDlmmClosePosition" | "MeteoraDlmmClaimFee" | "TokenAccount" | "TokenInfo" | "NonceAccount" | "AccountPumpFunGlobal" | "AccountPumpFunBondingCurve" | "AccountPumpFunFeeConfig" | "AccountPumpFunSharingConfig" | "AccountPumpFunGlobalVolumeAccumulator" | "AccountPumpFunUserVolumeAccumulator" | "AccountPumpSwapGlobalConfig" | "AccountPumpSwapPool" | "AccountRaydiumClmmAmmConfig" | "AccountRaydiumClmmPoolState" | "AccountRaydiumClmmTickArrayState" | "AccountRaydiumCpmmAmmConfig" | "AccountRaydiumCpmmPoolState" | "AccountOrcaWhirlpool" | "AccountOrcaPosition" | "AccountOrcaTickArray" | "AccountOrcaFeeTier" | "AccountOrcaWhirlpoolsConfig";
 /** 与 Rust `grpc::EventType`（由 `StreamingEventType` 导出）一致 */
 export type StreamingEventType = EventType;
 /** 所有事件类型列表 */