sol-parser-sdk 0.5.9 → 0.5.10

package/dist/grpc/geyser_connect.js

@@ -7,7 +7,7 @@ exports.defaultGeyserConnectConfig = defaultGeyserConnectConfig;
 exports.geyserGrpcChannelOptions = geyserGrpcChannelOptions;
 exports.connectYellowstoneGeyser = connectYellowstoneGeyser;
 const yellowstone_grpc_1 = __importDefault(require("@triton-one/yellowstone-grpc"));
-/** 与 Rust `GeyserConnectConfig::default` 一致 */
+/** 公共字段与 Rust `GeyserConnectConfig::default` 一致，并包含 Node gRPC 通道默认值。 */
 function defaultGeyserConnectConfig() {
     return {
         connectTimeoutMs: 8000,
@@ -15,6 +15,9 @@ function defaultGeyserConnectConfig() {
         xToken: undefined,
         keepAliveIntervalMs: 30_000,
         keepAliveTimeoutMs: 5000,
+        initialReconnectBackoffMs: 1000,
+        maxReconnectBackoffMs: 60_000,
+        flowControlWindowBytes: 1024 * 1024,
     };
 }
 /** 与 `ClientConfig` / `grpc.keepalive_*` 对齐，用于长连接抗 NAT/负载均衡 idle 断开 */
@@ -29,6 +32,9 @@ function geyserGrpcChannelOptions(config = defaultGeyserConnectConfig()) {
         "grpc.keepalive_timeout_ms": timeout,
         /** 无活跃 RPC 时仍发 keepalive，避免长时间仅订阅时被中间设备掐断 */
         "grpc.keepalive_permit_without_calls": 1,
+        "grpc.initial_reconnect_backoff_ms": config.initialReconnectBackoffMs,
+        "grpc.max_reconnect_backoff_ms": config.maxReconnectBackoffMs,
+        "grpc-node.flow_control_window": config.flowControlWindowBytes,
     };
 }
 /**

package/dist/grpc/log_instr_dedup.js

@@ -62,7 +62,7 @@ function nextOccurrence(base, counts) {
     counts.set(base, current + 1);
     return current;
 }
-function dedupeKey(ev, pumpfunLaneCounts) {
+function dedupeKey(ev, occurrenceCounts) {
     const name = eventName(ev);
     const data = payload(ev);
     if (!data)
@@ -70,7 +70,7 @@ function dedupeKey(ev, pumpfunLaneCounts) {
     if (PUMPFUN_TRADE_NAMES.has(name)) {
         const lane = ixLane(data.ix_name);
         const base = `${data.mint}|${data.user}|${Boolean(data.is_buy)}|${lane}`;
-        const occurrence = nextOccurrence(base, pumpfunLaneCounts);
+        const occurrence = nextOccurrence(`PumpFun|${base}`, occurrenceCounts);
         return `PumpFunTrade|${base}|${occurrence}`;
     }
     switch (name) {
@@ -98,12 +98,28 @@ function dedupeKey(ev, pumpfunLaneCounts) {
             return `PumpSwapLiquidityAdded|${data.pool}|${data.user}`;
         case "PumpSwapLiquidityRemoved":
             return `PumpSwapLiquidityRemoved|${data.pool}|${data.user}`;
-        case "RaydiumClmmSwap":
-            return `RaydiumClmmSwap|${data.pool_state}|${Boolean(data.zero_for_one)}`;
-        case "RaydiumAmmV4Swap":
-            return `RaydiumAmmV4Swap|${data.amm}`;
-        case "MeteoraDlmmSwap":
-            return `MeteoraDlmmSwap|${data.pool}|${data.from}|${Boolean(data.swap_for_y)}`;
+        case "RaydiumClmmSwap": {
+            const base = String(data.pool_state);
+            return `RaydiumClmmSwap|${base}|${nextOccurrence(`RaydiumClmm|${base}`, occurrenceCounts)}`;
+        }
+        case "RaydiumCpmmSwap": {
+            const base = String(data.pool_id);
+            return `RaydiumCpmmSwap|${base}|${nextOccurrence(`RaydiumCpmm|${base}`, occurrenceCounts)}`;
+        }
+        case "RaydiumAmmV4Swap": {
+            const base = data.max_amount_in !== 0n && data.max_amount_in !== 0
+                ? `out|${data.amount_out}`
+                : `in|${data.amount_in}`;
+            return `RaydiumAmmV4Swap|${base}|${nextOccurrence(`RaydiumAmmV4|${base}`, occurrenceCounts)}`;
+        }
+        case "OrcaWhirlpoolSwap": {
+            const base = String(data.whirlpool);
+            return `OrcaWhirlpoolSwap|${base}|${nextOccurrence(`OrcaWhirlpool|${base}`, occurrenceCounts)}`;
+        }
+        case "MeteoraDlmmSwap": {
+            const base = `${data.pool}|${data.from}|${Boolean(data.swap_for_y)}`;
+            return `MeteoraDlmmSwap|${base}|${nextOccurrence(`MeteoraDlmm|${base}`, occurrenceCounts)}`;
+        }
         default:
             return null;
     }
@@ -282,6 +298,8 @@ function mergeRaydiumAmmV4Swap(log, ix) {
         "serum_vault_signer",
         "user_source_token_account",
         "user_destination_token_account",
+        "user_source_owner",
+        "amm",
     ]) {
         fillString(log, key, ix);
     }
@@ -376,16 +394,16 @@ function mergeGrpcInstructionIntoLog(logEvent, ixEvent) {
 function dedupeLogInstructionEvents(logEvents, instructionEvents) {
     const out = [];
     const indexByKey = new Map();
-    const logPumpfunLaneCounts = new Map();
-    const ixPumpfunLaneCounts = new Map();
+    const logOccurrenceCounts = new Map();
+    const ixOccurrenceCounts = new Map();
     for (const ev of logEvents) {
-        const key = dedupeKey(ev, logPumpfunLaneCounts);
+        const key = dedupeKey(ev, logOccurrenceCounts);
         if (key)
             indexByKey.set(key, out.length);
         out.push(ev);
     }
     for (const ev of instructionEvents) {
-        const key = dedupeKey(ev, ixPumpfunLaneCounts);
+        const key = dedupeKey(ev, ixOccurrenceCounts);
         if (!key) {
             out.push(ev);
             continue;

package/dist/grpc/types.d.ts

@@ -98,16 +98,18 @@ export interface ClientConfig {
     keep_alive_interval_ms: number;
     keep_alive_timeout_ms: number;
     buffer_size: number;
+    /** Node gRPC HTTP/2 receive window. Larger values reduce stalls on bursty streams. */
+    flow_control_window_bytes?: number;
     order_mode: OrderMode;
     order_timeout_ms: number;
     micro_batch_us: number;
 }
-/** 与 Rust `grpc::config` 中 `StreamingConfig` 别名（即 `ClientConfig`）一致 */
+/** 与 Rust `grpc::config` 中 `StreamingConfig` 别名一致，并包含可选 Node gRPC 参数。 */
 export type StreamingConfig = ClientConfig;
 export declare function defaultClientConfig(): ClientConfig;
-/** 与 Rust `ClientConfig::low_latency` 一致 */
+/** Rust `ClientConfig::low_latency` 的 Node 调优版本，使用更小的 JS 对象队列。 */
 export declare function lowLatencyClientConfig(): ClientConfig;
-/** 与 Rust `ClientConfig::high_throughput` 一致 */
+/** Rust `ClientConfig::high_throughput` 的 Node 调优版本，使用更小的 JS 对象队列。 */
 export declare function highThroughputClientConfig(): ClientConfig;
 export interface TransactionFilter {
     account_include: string[];

package/dist/grpc/types.js

@@ -42,12 +42,13 @@ function defaultClientConfig() {
         keep_alive_interval_ms: 30000,
         keep_alive_timeout_ms: 5000,
         buffer_size: 8192,
+        flow_control_window_bytes: 1024 * 1024,
         order_mode: "Unordered",
         order_timeout_ms: 100,
         micro_batch_us: 100,
     };
 }
-/** 与 Rust `ClientConfig::low_latency` 一致 */
+/** Rust `ClientConfig::low_latency` 的 Node 调优版本，使用更小的 JS 对象队列。 */
 function lowLatencyClientConfig() {
     return {
         enable_metrics: false,
@@ -60,12 +61,13 @@ function lowLatencyClientConfig() {
         keep_alive_interval_ms: 10_000,
         keep_alive_timeout_ms: 2000,
         buffer_size: 16384,
+        flow_control_window_bytes: 16 * 1024 * 1024,
         order_mode: "Unordered",
         order_timeout_ms: 50,
         micro_batch_us: 50,
     };
 }
-/** 与 Rust `ClientConfig::high_throughput` 一致 */
+/** Rust `ClientConfig::high_throughput` 的 Node 调优版本，使用更小的 JS 对象队列。 */
 function highThroughputClientConfig() {
     return {
         enable_metrics: true,
@@ -78,6 +80,7 @@ function highThroughputClientConfig() {
         keep_alive_interval_ms: 60_000,
         keep_alive_timeout_ms: 10_000,
         buffer_size: 32768,
+        flow_control_window_bytes: 16 * 1024 * 1024,
         order_mode: "Unordered",
         order_timeout_ms: 200,
         micro_batch_us: 200,

package/dist/index.d.ts

@@ -41,7 +41,7 @@ export { parseInstructionUnified, parsePumpfunInstruction, parsePumpswapInstruct
 /** Rust `instr` 根模块蛇形命名别名 */
 export { parse_instruction_unified, parse_pumpfun_instruction, parse_pumpswap_instruction, parse_meteora_damm_instruction, parse_meteora_dlmm_instruction, parse_meteora_pools_instruction, parse_pump_fees_instruction, } from "./instr/rust_aliases.js";
 export * as programIds from "./instr/program_ids.js";
-export { YellowstoneGrpc, type SubscribeCallbacks, type DexEventSubscription } from "./grpc/client.js";
+export { YellowstoneGrpc, type SubscribeCallbacks, type DexEventSubscription, type SubscribeDexEventsOptions, type EventQueueOverflowStrategy, } from "./grpc/client.js";
 export { connectYellowstoneGeyser, defaultGeyserConnectConfig, geyserGrpcChannelOptions, type GeyserConnectConfig, } from "./grpc/geyser_connect.js";
 /** 与 Rust `sol_parser_sdk::grpc::event_parser` 模块对应 */
 export * as event_parser from "./grpc/event_parser.js";

package/dist/instr/inner.js

@@ -48,7 +48,7 @@ function filterDexEvent(ev, filter) {
         ? (0, types_js_1.eventTypeFilterNormalizeDexEvent)(filter, ev)
         : null;
 }
-function pumpFeesEventDisc(disc) {
+function eventCpiDiscriminator(disc) {
     if (bytesEq(disc, 0, EVENT_CPI_PREFIX))
         return (0, binary_js_1.readU64LE)(disc, 8);
     if (bytesEq(disc, 8, EVENT_CPI_SUFFIX))
@@ -116,14 +116,16 @@ const LOG = {
     METEORA_DAMM_INITIALIZE_POOL: [228, 50, 246, 85, 203, 66, 134, 37],
     METEORA_DAMM_CREATE_POSITION: [156, 15, 119, 198, 29, 181, 221, 55],
     METEORA_DAMM_CLOSE_POSITION: [20, 145, 144, 68, 143, 142, 214, 178],
-    METEORA_DLMM_SWAP: [143, 190, 90, 218, 196, 30, 51, 222],
-    METEORA_DLMM_ADD_LIQUIDITY: [181, 157, 89, 67, 143, 182, 52, 72],
-    METEORA_DLMM_REMOVE_LIQUIDITY: [80, 85, 209, 72, 24, 206, 35, 178],
-    METEORA_DLMM_INITIALIZE_POOL: [95, 180, 10, 172, 84, 174, 232, 40],
+    METEORA_DLMM_SWAP: [81, 108, 227, 190, 205, 208, 10, 196],
+    METEORA_DLMM_SWAP2: [46, 116, 82, 215, 148, 27, 84, 77],
+    METEORA_DLMM_ADD_LIQUIDITY: [31, 94, 125, 90, 227, 52, 61, 186],
+    METEORA_DLMM_REMOVE_LIQUIDITY: [116, 244, 97, 232, 103, 31, 152, 58],
+    METEORA_DLMM_INITIALIZE_POOL: [185, 74, 252, 125, 27, 215, 188, 111],
     METEORA_DLMM_INITIALIZE_BIN_ARRAY: [11, 18, 155, 194, 33, 115, 238, 119],
-    METEORA_DLMM_CREATE_POSITION: [123, 233, 11, 43, 146, 180, 97, 119],
-    METEORA_DLMM_CLOSE_POSITION: [94, 168, 102, 45, 59, 122, 137, 54],
-    METEORA_DLMM_CLAIM_FEE: [152, 70, 208, 111, 104, 91, 44, 1],
+    METEORA_DLMM_CREATE_POSITION: [144, 142, 252, 84, 157, 53, 37, 121],
+    METEORA_DLMM_CLOSE_POSITION: [255, 196, 16, 107, 28, 202, 53, 128],
+    METEORA_DLMM_CLAIM_FEE: [75, 122, 154, 48, 140, 74, 123, 163],
+    METEORA_DLMM_CLAIM_FEE2: [232, 171, 242, 97, 58, 77, 35, 45],
     RAYDIUM_LAUNCHLAB_POOL_CREATE: [151, 215, 226, 9, 118, 161, 115, 174],
     RAYDIUM_LAUNCHLAB_TRADE: [189, 219, 127, 211, 78, 230, 97, 238],
 };
@@ -200,6 +202,28 @@ const IX = {
         [80, 85, 209, 72, 24, 206, 177, 108],
         [95, 180, 10, 172, 84, 174, 232, 40],
     ],
+    METEORA_DLMM: [
+        [181, 157, 89, 67, 143, 182, 52, 72],
+        [228, 162, 78, 28, 70, 219, 116, 115],
+        [169, 32, 79, 137, 136, 232, 70, 137],
+        [112, 191, 101, 171, 28, 144, 127, 187],
+        [123, 134, 81, 0, 49, 68, 98, 98],
+        [174, 90, 35, 115, 186, 40, 147, 226],
+        [35, 86, 19, 185, 78, 212, 75, 211],
+        [45, 154, 237, 210, 221, 15, 166, 92],
+        [73, 59, 36, 120, 237, 83, 108, 198],
+        [219, 192, 234, 71, 190, 191, 102, 80],
+        [143, 19, 242, 145, 213, 15, 104, 115],
+        [46, 82, 125, 146, 85, 141, 228, 153],
+        [80, 85, 209, 72, 24, 206, 177, 108],
+        [230, 215, 82, 127, 241, 101, 227, 146],
+        [248, 198, 158, 145, 225, 117, 135, 200],
+        [65, 75, 63, 76, 235, 91, 91, 136],
+        [250, 73, 101, 33, 38, 207, 75, 184],
+        [43, 215, 247, 132, 137, 60, 243, 81],
+        [56, 173, 230, 208, 173, 228, 156, 205],
+        [74, 98, 192, 214, 177, 51, 75, 51],
+    ],
 };
 function firstByteIn(data, allowed) {
     return data.length > 0 && allowed.includes(data[0]);
@@ -213,7 +237,7 @@ function normalInstructionDataMayParse(programId, data) {
     if (programId === program_ids_js_1.RAYDIUM_AMM_V4_PROGRAM_ID)
         return firstByteIn(data, [1, 3, 4, 7, 9, 11]);
     if (programId === program_ids_js_1.METEORA_DLMM_PROGRAM_ID)
-        return firstByteIn(data, [0, 1, 2, 7, 8, 11, 13, 14]);
+        return headIn(data, IX.METEORA_DLMM);
     if (programId === program_ids_js_1.METEORA_DAMM_V2_PROGRAM_ID) {
         return discEq(data, LOG.METEORA_DAMM_INITIALIZE_POOL);
     }
@@ -243,7 +267,7 @@ function parseInnerCompiledInstructionIfSupported(data, accounts, signature, slo
     return (0, mod_js_1.parseInstructionUnified)(data, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs, filter, programId);
 }
 function parsePumpFeesInner(disc, data, metadata) {
-    const eventDisc = pumpFeesEventDisc(disc);
+    const eventDisc = eventCpiDiscriminator(disc);
     if (eventDisc === null)
         return null;
     if (eventDisc === disc8(LOG.PUMP_FEES_CREATE_FEE_SHARING_CONFIG)) {
@@ -431,12 +455,10 @@ function parseInnerInstructionUnified(instructionData, accounts, signature, slot
     else if (programId === program_ids_js_1.METEORA_DLMM_PROGRAM_ID) {
         if (filter && !(0, types_js_1.eventTypeFilterIncludesMeteoraDlmm)(filter))
             return null;
-        if (!discTailEq(disc, EVENT_CPI_SUFFIX))
+        const eventDisc = eventCpiDiscriminator(disc);
+        if (eventDisc === null)
             return null;
-        const decoded = new Uint8Array(8 + data.length);
-        decoded.set(disc.subarray(0, 8), 0);
-        decoded.set(data, 8);
-        ev = (0, meteora_dlmm_js_1.parseDlmmFromDecoded)(decoded, metadata);
+        ev = (0, meteora_dlmm_js_1.parseDlmmEventFromData)(eventDisc, data, metadata);
     }
     else if (programId === program_ids_js_1.RAYDIUM_LAUNCHLAB_PROGRAM_ID) {
         if (filter && !(0, types_js_1.eventTypeFilterIncludesRaydiumLaunchlab)(filter))

package/dist/instr/meteora_dlmm_ix.js

@@ -5,100 +5,157 @@ const dex_event_js_1 = require("../core/dex_event.js");
 const binary_js_1 = require("../util/binary.js");
 const utils_js_1 = require("./utils.js");
 const Z = (0, dex_event_js_1.defaultPubkey)();
+function discEq(data, bytes) {
+    return data.length >= 8 && bytes.every((b, i) => data[i] === b);
+}
+const IX = {
+    ADD_LIQUIDITY: [181, 157, 89, 67, 143, 182, 52, 72],
+    ADD_LIQUIDITY2: [228, 162, 78, 28, 70, 219, 116, 115],
+    CLAIM_FEE: [169, 32, 79, 137, 136, 232, 70, 137],
+    CLAIM_FEE2: [112, 191, 101, 171, 28, 144, 127, 187],
+    CLOSE_POSITION: [123, 134, 81, 0, 49, 68, 98, 98],
+    CLOSE_POSITION2: [174, 90, 35, 115, 186, 40, 147, 226],
+    INITIALIZE_BIN_ARRAY: [35, 86, 19, 185, 78, 212, 75, 211],
+    INITIALIZE_LB_PAIR: [45, 154, 237, 210, 221, 15, 166, 92],
+    INITIALIZE_LB_PAIR2: [73, 59, 36, 120, 237, 83, 108, 198],
+    INITIALIZE_POSITION: [219, 192, 234, 71, 190, 191, 102, 80],
+    INITIALIZE_POSITION2: [143, 19, 242, 145, 213, 15, 104, 115],
+    INITIALIZE_POSITION_PDA: [46, 82, 125, 146, 85, 141, 228, 153],
+    REMOVE_LIQUIDITY: [80, 85, 209, 72, 24, 206, 177, 108],
+    REMOVE_LIQUIDITY2: [230, 215, 82, 127, 241, 101, 227, 146],
+    SWAP: [248, 198, 158, 145, 225, 117, 135, 200],
+    SWAP2: [65, 75, 63, 76, 235, 91, 91, 136],
+    SWAP_EXACT_OUT: [250, 73, 101, 33, 38, 207, 75, 184],
+    SWAP_EXACT_OUT2: [43, 215, 247, 132, 137, 60, 243, 81],
+    SWAP_WITH_PRICE_IMPACT: [56, 173, 230, 208, 173, 228, 156, 205],
+    SWAP_WITH_PRICE_IMPACT2: [74, 98, 192, 214, 177, 51, 75, 51],
+};
 function parseMeteoraDlmmInstruction(instructionData, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs) {
-    if (instructionData.length === 0)
-        return null;
-    const pool = (0, utils_js_1.getAccount)(accounts, 0);
-    if (!pool)
+    if (instructionData.length < 8)
         return null;
     const metadata = (0, utils_js_1.ixMeta)(signature, slot, txIndex, blockTimeUs, grpcRecvUs);
-    const kind = instructionData[0];
-    if (kind === 0) {
-        if (instructionData.length < 1 + 4 + 2)
+    const data = instructionData.subarray(8);
+    if (discEq(instructionData, IX.INITIALIZE_LB_PAIR)) {
+        const pool = (0, utils_js_1.getAccount)(accounts, 0);
+        if (!pool || data.length < 6)
             return null;
-        const active_bin_id = (0, binary_js_1.readI32LE)(instructionData, 1);
-        const bin_step = (0, binary_js_1.readU16LE)(instructionData, 5);
+        const active_bin_id = (0, binary_js_1.readI32LE)(data, 0);
+        const bin_step = (0, binary_js_1.readU16LE)(data, 4);
         if (active_bin_id === null || bin_step === null)
             return null;
         return {
             MeteoraDlmmInitializePool: {
                 metadata,
                 pool,
-                creator: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+                creator: (0, utils_js_1.getAccount)(accounts, 8) ?? Z,
                 active_bin_id,
                 bin_step,
             },
         };
     }
-    if (kind === 1) {
-        if (instructionData.length < 1 + 8)
+    if (discEq(instructionData, IX.INITIALIZE_LB_PAIR2)) {
+        const pool = (0, utils_js_1.getAccount)(accounts, 0);
+        if (!pool || data.length < 4)
+            return null;
+        return {
+            MeteoraDlmmInitializePool: {
+                metadata,
+                pool,
+                creator: (0, utils_js_1.getAccount)(accounts, 8) ?? Z,
+                active_bin_id: (0, binary_js_1.readI32LE)(data, 0) ?? 0,
+                bin_step: 0,
+            },
+        };
+    }
+    if (discEq(instructionData, IX.INITIALIZE_BIN_ARRAY)) {
+        const pool = (0, utils_js_1.getAccount)(accounts, 0);
+        if (!pool || data.length < 8)
             return null;
         return {
             MeteoraDlmmInitializeBinArray: {
                 metadata,
                 pool,
                 bin_array: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
-                index: (0, binary_js_1.readU64LE)(instructionData, 1) ?? 0n,
+                index: (0, binary_js_1.readI64LE)(data, 0) ?? 0n,
             },
         };
     }
-    if (kind === 2) {
-        if (instructionData.length < 1 + 32)
+    if (discEq(instructionData, IX.ADD_LIQUIDITY) || discEq(instructionData, IX.ADD_LIQUIDITY2)) {
+        const pool = (0, utils_js_1.getAccount)(accounts, 1);
+        if (!pool)
+            return null;
+        const senderIndex = discEq(instructionData, IX.ADD_LIQUIDITY2) ? 9 : 11;
+        const from = (0, utils_js_1.getAccount)(accounts, senderIndex);
+        if (!from)
             return null;
         return {
             MeteoraDlmmAddLiquidity: {
                 metadata,
                 pool,
-                from: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
-                position: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
+                from,
+                position: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
                 amounts: [0n, 0n],
                 active_bin_id: 0,
             },
         };
     }
-    if (kind === 7) {
-        if (instructionData.length < 1 + 32)
+    if (discEq(instructionData, IX.REMOVE_LIQUIDITY) || discEq(instructionData, IX.REMOVE_LIQUIDITY2)) {
+        const pool = (0, utils_js_1.getAccount)(accounts, 1);
+        if (!pool)
+            return null;
+        const senderIndex = discEq(instructionData, IX.REMOVE_LIQUIDITY2) ? 9 : 11;
+        const from = (0, utils_js_1.getAccount)(accounts, senderIndex);
+        if (!from)
             return null;
         return {
             MeteoraDlmmRemoveLiquidity: {
                 metadata,
                 pool,
-                from: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
-                position: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
+                from,
+                position: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
                 amounts: [0n, 0n],
                 active_bin_id: 0,
             },
         };
     }
-    if (kind === 8) {
-        if (instructionData.length < 1 + 4 + 4)
+    if (discEq(instructionData, IX.INITIALIZE_POSITION) ||
+        discEq(instructionData, IX.INITIALIZE_POSITION2) ||
+        discEq(instructionData, IX.INITIALIZE_POSITION_PDA)) {
+        if (data.length < 8)
+            return null;
+        const lower_bin_id = (0, binary_js_1.readI32LE)(data, 0);
+        const width = (0, binary_js_1.readI32LE)(data, 4);
+        if (lower_bin_id === null || width === null || width < 0)
             return null;
-        const lower_bin_id = (0, binary_js_1.readI32LE)(instructionData, 1);
-        const width = (0, binary_js_1.readU32LE)(instructionData, 5);
-        if (lower_bin_id === null || width === null)
+        const pda = discEq(instructionData, IX.INITIALIZE_POSITION_PDA);
+        const position = (0, utils_js_1.getAccount)(accounts, pda ? 2 : 1);
+        const pool = (0, utils_js_1.getAccount)(accounts, pda ? 3 : 2);
+        const owner = (0, utils_js_1.getAccount)(accounts, pda ? 4 : 3);
+        if (!position || !pool || !owner)
             return null;
         return {
             MeteoraDlmmCreatePosition: {
                 metadata,
                 pool,
-                position: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
-                owner: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
+                position,
+                owner,
                 lower_bin_id,
                 width,
             },
         };
     }
-    if (kind === 11) {
-        if (instructionData.length < 1 + 8 + 8)
+    if (discEq(instructionData, IX.SWAP) || discEq(instructionData, IX.SWAP2)) {
+        const pool = (0, utils_js_1.getAccount)(accounts, 0);
+        if (!pool || data.length < 16)
             return null;
         return {
             MeteoraDlmmSwap: {
                 metadata,
                 pool,
-                from: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+                from: (0, utils_js_1.getAccount)(accounts, 10) ?? Z,
                 start_bin_id: 0,
                 end_bin_id: 0,
-                amount_in: (0, binary_js_1.readU64LE)(instructionData, 1) ?? 0n,
+                amount_in: (0, binary_js_1.readU64LE)(data, 0) ?? 0n,
                 amount_out: 0n,
                 swap_for_y: false,
                 fee: 0n,
@@ -108,25 +165,60 @@ function parseMeteoraDlmmInstruction(instructionData, accounts, signature, slot,
             },
         };
     }
-    if (kind === 13) {
+    if (discEq(instructionData, IX.SWAP_EXACT_OUT) ||
+        discEq(instructionData, IX.SWAP_EXACT_OUT2) ||
+        discEq(instructionData, IX.SWAP_WITH_PRICE_IMPACT) ||
+        discEq(instructionData, IX.SWAP_WITH_PRICE_IMPACT2)) {
+        const pool = (0, utils_js_1.getAccount)(accounts, 0);
+        if (!pool || data.length < 8)
+            return null;
+        return {
+            MeteoraDlmmSwap: {
+                metadata,
+                pool,
+                from: (0, utils_js_1.getAccount)(accounts, 10) ?? Z,
+                start_bin_id: 0,
+                end_bin_id: 0,
+                amount_in: (0, binary_js_1.readU64LE)(data, 0) ?? 0n,
+                amount_out: discEq(instructionData, IX.SWAP_EXACT_OUT) || discEq(instructionData, IX.SWAP_EXACT_OUT2)
+                    ? (0, binary_js_1.readU64LE)(data, 8) ?? 0n
+                    : 0n,
+                swap_for_y: false,
+                fee: 0n,
+                protocol_fee: 0n,
+                fee_bps: 0n,
+                host_fee: 0n,
+            },
+        };
+    }
+    if (discEq(instructionData, IX.CLAIM_FEE) || discEq(instructionData, IX.CLAIM_FEE2)) {
+        const pool = (0, utils_js_1.getAccount)(accounts, 0);
+        const owner = (0, utils_js_1.getAccount)(accounts, discEq(instructionData, IX.CLAIM_FEE2) ? 2 : 4);
+        if (!pool || !owner)
+            return null;
         return {
             MeteoraDlmmClaimFee: {
                 metadata,
                 pool,
                 position: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
-                owner: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
+                owner,
                 fee_x: 0n,
                 fee_y: 0n,
             },
         };
     }
-    if (kind === 14) {
+    if (discEq(instructionData, IX.CLOSE_POSITION) || discEq(instructionData, IX.CLOSE_POSITION2)) {
+        const position = (0, utils_js_1.getAccount)(accounts, 0);
+        const v2 = discEq(instructionData, IX.CLOSE_POSITION2);
+        const owner = (0, utils_js_1.getAccount)(accounts, v2 ? 1 : 4);
+        if (!position || !owner)
+            return null;
         return {
             MeteoraDlmmClosePosition: {
                 metadata,
-                pool,
-                position: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
-                owner: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
+                pool: v2 ? Z : (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+                position,
+                owner,
             },
         };
     }

package/dist/instr/orca_whirlpool_ix.js

@@ -34,10 +34,11 @@ function parseOrcaWhirlpoolInstruction(instructionData, accounts, signature, slo
             return null;
         const input_amount = amount_specified_is_input ? amount : 0n;
         const output_amount = amount_specified_is_input ? other_threshold : amount;
+        const whirlpoolIndex = discEq(instructionData, DISC.SWAP_V2) ? 4 : 2;
         return {
             OrcaWhirlpoolSwap: {
                 metadata: meta,
-                whirlpool: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+                whirlpool: (0, utils_js_1.getAccount)(accounts, whirlpoolIndex) ?? Z,
                 a_to_b,
                 pre_sqrt_price: sqrt_price_limit,
                 post_sqrt_price: 0n,

package/dist/instr/pumpswap_ix.js

@@ -94,6 +94,11 @@ function buyLike(data, accounts, meta, swapOrder) {
         ix_name: "",
         cashback_fee_basis_points: 0n,
         cashback: 0n,
+        buyback_fee_basis_points: 0n,
+        buyback_fee: 0n,
+        virtual_quote_reserves: 0n,
+        can_boost: false,
+        base_supply: 0n,
         is_pump_pool: false,
         base_mint: g(3),
         quote_mint: g(4),
@@ -157,6 +162,11 @@ function parsePumpswapInstruction(instructionData, accounts, signature, slot, tx
             coin_creator_fee: 0n,
             cashback_fee_basis_points: 0n,
             cashback: 0n,
+            buyback_fee_basis_points: 0n,
+            buyback_fee: 0n,
+            virtual_quote_reserves: 0n,
+            can_boost: false,
+            base_supply: 0n,
             is_pump_pool: false,
             base_mint: g(3),
             quote_mint: g(4),