sol-parser-sdk 0.5.9 → 0.5.10

package/dist/logs/raydium_amm.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseRayLogSwap = parseRayLogSwap;
 exports.parseSwapBaseInFromData = parseSwapBaseInFromData;
 exports.parseSwapBaseOutFromData = parseSwapBaseOutFromData;
 exports.parseDepositFromData = parseDepositFromData;
@@ -37,6 +38,41 @@ function emptySwap(metadata, amm, user) {
         user_source_owner: user,
     };
 }
+const RAY_LOG_PREFIX = "Program log: ray_log: ";
+/** Decode Raydium AMM V4's official bincode `SwapBaseInLog` / `SwapBaseOutLog`. */
+function parseRayLogSwap(log, metadata) {
+    const prefix = log.indexOf(RAY_LOG_PREFIX);
+    if (prefix < 0)
+        return null;
+    const encoded = log.slice(prefix + RAY_LOG_PREFIX.length).trim();
+    let data;
+    try {
+        data = Buffer.from(encoded, "base64");
+    }
+    catch {
+        return null;
+    }
+    // Both swap bincode structs are one u8 followed by seven u64 values.
+    if (data.length !== 57 || (data[0] !== 3 && data[0] !== 4))
+        return null;
+    const input = (0, binary_js_1.readU64LE)(data, 1);
+    const output = (0, binary_js_1.readU64LE)(data, 9);
+    const actual = (0, binary_js_1.readU64LE)(data, 49);
+    if (input == null || output == null || actual == null)
+        return null;
+    const ev = emptySwap(metadata, (0, dex_event_js_1.defaultPubkey)(), (0, dex_event_js_1.defaultPubkey)());
+    if (data[0] === 3) {
+        ev.amount_in = input;
+        ev.minimum_amount_out = output;
+        ev.amount_out = actual;
+    }
+    else {
+        ev.max_amount_in = input;
+        ev.amount_out = output;
+        ev.amount_in = actual;
+    }
+    return { RaydiumAmmV4Swap: ev };
+}
 function parseSwapBaseInFromData(data, metadata) {
     let o = 0;
     const amm = (0, binary_js_1.readPubkey)(data, o);

package/dist/logs/raydium_cpmm.d.ts

@@ -1,5 +1,7 @@
 import type { EventMetadata } from "../core/metadata.js";
 import type { DexEvent } from "../core/dex_event.js";
+/** Current Anchor `SwapEvent` payload (the 8-byte event discriminator is removed by the caller). */
+export declare function parseSwapEventFromData(data: Uint8Array, metadata: EventMetadata): DexEvent | null;
 export declare function parseSwapBaseInFromData(data: Uint8Array, metadata: EventMetadata): DexEvent | null;
 export declare function parseSwapBaseOutFromData(data: Uint8Array, metadata: EventMetadata): DexEvent | null;
 export declare function parseCreatePoolFromData(data: Uint8Array, metadata: EventMetadata): DexEvent | null;

package/dist/logs/raydium_cpmm.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseSwapEventFromData = parseSwapEventFromData;
 exports.parseSwapBaseInFromData = parseSwapBaseInFromData;
 exports.parseSwapBaseOutFromData = parseSwapBaseOutFromData;
 exports.parseCreatePoolFromData = parseCreatePoolFromData;
@@ -9,6 +10,48 @@ const binary_js_1 = require("../util/binary.js");
 function bn64(v) {
     return v ?? 0n;
 }
+/** Current Anchor `SwapEvent` payload (the 8-byte event discriminator is removed by the caller). */
+function parseSwapEventFromData(data, metadata) {
+    // pool_id + six u64 fields + base_input. Newer IDLs append mint/fee fields,
+    // which remain wire-compatible with this stable prefix.
+    if (data.length < 32 + (6 * 8) + 1)
+        return null;
+    let o = 0;
+    const pool_id = (0, binary_js_1.readPubkey)(data, o);
+    if (!pool_id)
+        return null;
+    o += 32;
+    const input_vault_before = (0, binary_js_1.readU64LE)(data, o);
+    o += 8;
+    const output_vault_before = (0, binary_js_1.readU64LE)(data, o);
+    o += 8;
+    const input_amount = (0, binary_js_1.readU64LE)(data, o);
+    o += 8;
+    const output_amount = (0, binary_js_1.readU64LE)(data, o);
+    o += 8;
+    const input_transfer_fee = (0, binary_js_1.readU64LE)(data, o);
+    o += 8;
+    const output_transfer_fee = (0, binary_js_1.readU64LE)(data, o);
+    o += 8;
+    const base_input = (0, binary_js_1.readBool)(data, o);
+    if (input_vault_before == null || output_vault_before == null ||
+        input_amount == null || output_amount == null ||
+        input_transfer_fee == null || output_transfer_fee == null ||
+        base_input == null)
+        return null;
+    const ev = {
+        metadata,
+        pool_id,
+        input_vault_before,
+        output_vault_before,
+        input_amount,
+        output_amount,
+        input_transfer_fee,
+        output_transfer_fee,
+        base_input,
+    };
+    return { RaydiumCpmmSwap: ev };
+}
 function parseSwapBaseInFromData(data, metadata) {
     let o = 0;
     const pool_state = (0, binary_js_1.readPubkey)(data, o);

package/dist/rpc_transaction.js

@@ -19,8 +19,31 @@ 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 inner_js_1 = require("./instr/inner.js");
 const mod_js_1 = require("./instr/mod.js");
+const program_ids_js_1 = require("./instr/program_ids.js");
 const optimized_matcher_js_1 = require("./logs/optimized_matcher.js");
 const DEFAULT_PK = web3_js_1.PublicKey.default.toBase58();
+const PUMPFUN_TRADE_EVENT_NAMES = new Set([
+    "PumpFunTrade",
+    "PumpFunBuy",
+    "PumpFunSell",
+    "PumpFunBuyExactSolIn",
+]);
+const EVENT_CPI_PREFIX = Uint8Array.from([228, 69, 165, 46, 81, 203, 154, 29]);
+const LEGACY_EVENT_CPI_SUFFIX = Uint8Array.from([155, 167, 108, 32, 122, 76, 173, 64]);
+function bytesEqualAt(data, expected, offset) {
+    for (let i = 0; i < expected.length; i++) {
+        if (data[offset + i] !== expected[i])
+            return false;
+    }
+    return true;
+}
+function isDlmmEventCpi(programId, data) {
+    return programId === program_ids_js_1.METEORA_DLMM_PROGRAM_ID && data.length >= 16 && (bytesEqualAt(data, EVENT_CPI_PREFIX, 0) ||
+        bytesEqualAt(data, LEGACY_EVENT_CPI_SUFFIX, 8));
+}
+function isDlmmEvent(event) {
+    return eventName(event).startsWith("MeteoraDlmm");
+}
 function eventName(ev) {
     return Object.keys(ev)[0] ?? "";
 }
@@ -224,35 +247,48 @@ function mergePumpSwapBuySellInstruction(base, inner) {
         fillStringIfEmpty(base, key, ix);
     }
 }
+function mergeDlmmInstruction(baseName, base, inner) {
+    const context = baseName === "MeteoraDlmmInitializePool"
+        ? { creator: base.creator, active_bin_id: base.active_bin_id }
+        : baseName === "MeteoraDlmmCreatePosition"
+            ? { lower_bin_id: base.lower_bin_id, width: base.width }
+            : baseName === "MeteoraDlmmClosePosition"
+                ? { pool: base.pool }
+                : null;
+    Object.assign(base, inner);
+    if (context)
+        Object.assign(base, context);
+}
 function mergeInstructionEvent(base, inner) {
     const baseName = eventName(base);
     const innerName = eventName(inner);
     const baseData = eventPayload(base);
     const innerData = eventPayload(inner);
     if (!baseData || !innerData)
-        return;
-    const pumpfunTradeNames = new Set([
-        "PumpFunTrade",
-        "PumpFunBuy",
-        "PumpFunSell",
-        "PumpFunBuyExactSolIn",
-    ]);
-    if (pumpfunTradeNames.has(baseName) && pumpfunTradeNames.has(innerName)) {
+        return false;
+    if (PUMPFUN_TRADE_EVENT_NAMES.has(baseName) && PUMPFUN_TRADE_EVENT_NAMES.has(innerName)) {
         mergePumpfunTradeInstruction(baseData, innerData);
-        return;
+        return true;
     }
     if (baseName === "PumpFunCreateV2" && innerName === "PumpFunCreateV2") {
         mergePumpfunCreateV2Instruction(baseData, innerData);
-        return;
+        return true;
     }
     if ((baseName === "PumpSwapBuy" && innerName === "PumpSwapBuy") ||
         (baseName === "PumpSwapSell" && innerName === "PumpSwapSell")) {
         mergePumpSwapBuySellInstruction(baseData, innerData);
-        return;
+        return true;
     }
     if (baseName === innerName) {
-        Object.assign(baseData, innerData);
+        if (baseName.startsWith("MeteoraDlmm")) {
+            mergeDlmmInstruction(baseName, baseData, innerData);
+        }
+        else {
+            Object.assign(baseData, innerData);
+        }
+        return true;
     }
+    return false;
 }
 function mergeInstructionEvents(events) {
     if (events.length === 0)
@@ -265,27 +301,71 @@ function mergeInstructionEvents(events) {
         return ak - bk;
     });
     const out = [];
-    let pending = null;
+    let outerTarget = null;
+    const dlmmTargets = [];
     for (const item of events) {
         if (item.innerIdx === null) {
-            if (pending)
-                out.push(pending.event);
-            pending = { outerIdx: item.outerIdx, event: item.event };
+            out.push(item.event);
+            const resultIdx = out.length - 1;
+            outerTarget = { outerIdx: item.outerIdx, resultIdx };
+            dlmmTargets.length = 0;
+            if (isDlmmEvent(item.event)) {
+                dlmmTargets.push({
+                    outerIdx: item.outerIdx,
+                    stackHeight: item.stackHeight,
+                    resultIdx,
+                });
+            }
             continue;
         }
-        if (pending && pending.outerIdx === item.outerIdx) {
-            mergeInstructionEvent(pending.event, item.event);
+        if (item.isDlmmEventCpi) {
+            let merged = false;
+            for (let i = dlmmTargets.length - 1; i >= 0; i--) {
+                const target = dlmmTargets[i];
+                const directChild = target.stackHeight === undefined || item.stackHeight === undefined ||
+                    item.stackHeight === target.stackHeight + 1;
+                if (target.outerIdx === item.outerIdx && directChild) {
+                    dlmmTargets.length = i + 1;
+                    merged = mergeInstructionEvent(out[target.resultIdx], item.event);
+                    break;
+                }
+            }
+            if (!merged)
+                out.push(item.event);
+            continue;
+        }
+        let resultIdx = -1;
+        if (outerTarget && outerTarget.outerIdx === item.outerIdx &&
+            mergeInstructionEvent(out[outerTarget.resultIdx], item.event)) {
+            resultIdx = outerTarget.resultIdx;
         }
         else {
-            if (pending) {
-                out.push(pending.event);
-                pending = null;
-            }
             out.push(item.event);
+            resultIdx = out.length - 1;
+        }
+        if (isDlmmEvent(item.event)) {
+            if (item.stackHeight === undefined) {
+                dlmmTargets.length = 0;
+            }
+            else {
+                while (dlmmTargets.length > 0) {
+                    const last = dlmmTargets[dlmmTargets.length - 1];
+                    if (last.outerIdx !== item.outerIdx ||
+                        (last.stackHeight !== undefined && last.stackHeight >= item.stackHeight)) {
+                        dlmmTargets.pop();
+                    }
+                    else {
+                        break;
+                    }
+                }
+            }
+            dlmmTargets.push({
+                outerIdx: item.outerIdx,
+                stackHeight: item.stackHeight,
+                resultIdx,
+            });
         }
     }
-    if (pending)
-        out.push(pending.event);
     return out;
 }
 function resolveAccounts(resolver, indices) {
@@ -303,7 +383,13 @@ function parseOuterAndInnerInstructions(message, meta, signature, slot, txIndex,
         const accounts = resolveAccounts(resolver, ix.accountKeyIndexes);
         const ev = (0, mod_js_1.parseInstructionUnified)(data, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs, filter, programId);
         if (ev)
-            indexedEvents.push({ outerIdx, innerIdx: null, event: ev });
+            indexedEvents.push({
+                outerIdx,
+                innerIdx: null,
+                stackHeight: 1,
+                isDlmmEventCpi: false,
+                event: ev,
+            });
     }
     const innerGroups = meta?.innerInstructions;
     if (!innerGroups)
@@ -318,7 +404,13 @@ function parseOuterAndInnerInstructions(message, meta, signature, slot, txIndex,
             const ev = (0, inner_js_1.parseInnerCompiledInstructionIfSupported)(data, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs, filter, programId) ??
                 (0, inner_js_1.parseInnerInstructionUnified)(data, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs, filter, programId, isCreatedBuy);
             if (ev)
-                indexedEvents.push({ outerIdx: group.index, innerIdx, event: ev });
+                indexedEvents.push({
+                    outerIdx: group.index,
+                    innerIdx,
+                    stackHeight: ix.stackHeight,
+                    isDlmmEventCpi: isDlmmEventCpi(programId, data),
+                    event: ev,
+                });
         }
     }
     return mergeInstructionEvents(indexedEvents);

package/package.json

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