sol-parser-sdk 0.5.9 → 0.5.11

package/dist/logs/meteora_dlmm.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseDlmmFromDecoded = parseDlmmFromDecoded;
+exports.parseDlmmEventFromData = parseDlmmEventFromData;
 exports.parseMeteoraDlmmLog = parseMeteoraDlmmLog;
 /** Meteora DLMM 结构化日志解析 */
 const metadata_js_1 = require("../core/metadata.js");
+const dex_event_js_1 = require("../core/dex_event.js");
 const program_data_js_1 = require("./program_data.js");
 const binary_js_1 = require("../util/binary.js");
 function disc(bytes) {
@@ -13,14 +15,23 @@ function disc(bytes) {
     return new DataView(u8.buffer).getBigUint64(0, true);
 }
 const DLMM = {
-    SWAP: disc([143, 190, 90, 218, 196, 30, 51, 222]),
-    ADD_LIQ: disc([181, 157, 89, 67, 143, 182, 52, 72]),
-    REMOVE_LIQ: disc([80, 85, 209, 72, 24, 206, 35, 178]),
+    SWAP: disc([81, 108, 227, 190, 205, 208, 10, 196]),
+    SWAP2: disc([46, 116, 82, 215, 148, 27, 84, 77]),
+    ADD_LIQ: disc([31, 94, 125, 90, 227, 52, 61, 186]),
+    REMOVE_LIQ: disc([116, 244, 97, 232, 103, 31, 152, 58]),
     INIT_BIN_ARRAY: disc([11, 18, 155, 194, 33, 115, 238, 119]),
-    INIT_POOL: disc([95, 180, 10, 172, 84, 174, 232, 40]),
-    CREATE_POS: disc([123, 233, 11, 43, 146, 180, 97, 119]),
-    CLOSE_POS: disc([94, 168, 102, 45, 59, 122, 137, 54]),
-    CLAIM_FEE: disc([152, 70, 208, 111, 104, 91, 44, 1]),
+    INIT_POOL: disc([185, 74, 252, 125, 27, 215, 188, 111]),
+    CREATE_POS: disc([144, 142, 252, 84, 157, 53, 37, 121]),
+    CLOSE_POS: disc([255, 196, 16, 107, 28, 202, 53, 128]),
+    CLAIM_FEE: disc([75, 122, 154, 48, 140, 74, 123, 163]),
+    CLAIM_FEE2: disc([232, 171, 242, 97, 58, 77, 35, 45]),
+    LEGACY_SWAP: disc([143, 190, 90, 218, 196, 30, 51, 222]),
+    LEGACY_ADD_LIQ: disc([181, 157, 89, 67, 143, 182, 52, 72]),
+    LEGACY_REMOVE_LIQ: disc([80, 85, 209, 72, 24, 206, 35, 178]),
+    LEGACY_INIT_POOL: disc([95, 180, 10, 172, 84, 174, 232, 40]),
+    LEGACY_CREATE_POS: disc([123, 233, 11, 43, 146, 180, 97, 119]),
+    LEGACY_CLOSE_POS: disc([94, 168, 102, 45, 59, 122, 137, 54]),
+    LEGACY_CLAIM_FEE: disc([152, 70, 208, 111, 104, 91, 44, 1]),
 };
 function bn64(v) {
     return v ?? 0n;
@@ -31,7 +42,12 @@ function parseDlmmFromDecoded(programData, metadata) {
     const dv = new DataView(programData.buffer, programData.byteOffset, 8);
     const discriminator = dv.getBigUint64(0, true);
     const data = programData.subarray(8);
-    if (discriminator === DLMM.SWAP) {
+    return parseDlmmEventFromData(discriminator, data, metadata);
+}
+function parseDlmmEventFromData(discriminator, data, metadata) {
+    if (discriminator === DLMM.SWAP || discriminator === DLMM.LEGACY_SWAP) {
+        if (data.length < 129)
+            return null;
         let o = 0;
         const pool = (0, binary_js_1.readPubkey)(data, o);
         o += 32;
@@ -70,7 +86,52 @@ function parseDlmmFromDecoded(programData, metadata) {
         };
         return { MeteoraDlmmSwap: ev };
     }
-    if (discriminator === DLMM.ADD_LIQ) {
+    if (discriminator === DLMM.SWAP2) {
+        if (data.length < 147)
+            return null;
+        let o = 0;
+        const pool = (0, binary_js_1.readPubkey)(data, o);
+        o += 32;
+        const from = (0, binary_js_1.readPubkey)(data, o);
+        o += 32;
+        const start_bin_id = (0, binary_js_1.readI32LE)(data, o);
+        o += 4;
+        const end_bin_id = (0, binary_js_1.readI32LE)(data, o);
+        o += 4;
+        const swap_for_y = (0, binary_js_1.readBool)(data, o);
+        o += 1;
+        const fee_bps = (0, binary_js_1.readU128LE)(data, o);
+        o += 16;
+        const amount_in = bn64((0, binary_js_1.readU64LE)(data, o));
+        o += 8;
+        o += 8; // amount_left
+        const amount_out = bn64((0, binary_js_1.readU64LE)(data, o));
+        o += 8;
+        const fee = bn64((0, binary_js_1.readU64LE)(data, o));
+        o += 8;
+        const protocol_fee = bn64((0, binary_js_1.readU64LE)(data, o));
+        o += 8;
+        o += 8; // limit_order_fee
+        const host_fee = bn64((0, binary_js_1.readU64LE)(data, o));
+        const ev = {
+            metadata,
+            pool,
+            from,
+            start_bin_id,
+            end_bin_id,
+            amount_in,
+            amount_out,
+            swap_for_y,
+            fee,
+            protocol_fee,
+            fee_bps,
+            host_fee,
+        };
+        return { MeteoraDlmmSwap: ev };
+    }
+    if (discriminator === DLMM.ADD_LIQ || discriminator === DLMM.LEGACY_ADD_LIQ) {
+        if (data.length < 116)
+            return null;
         let o = 0;
         const pool = (0, binary_js_1.readPubkey)(data, o);
         o += 32;
@@ -93,7 +154,9 @@ function parseDlmmFromDecoded(programData, metadata) {
         };
         return { MeteoraDlmmAddLiquidity: ev };
     }
-    if (discriminator === DLMM.REMOVE_LIQ) {
+    if (discriminator === DLMM.REMOVE_LIQ || discriminator === DLMM.LEGACY_REMOVE_LIQ) {
+        if (data.length < 116)
+            return null;
         let o = 0;
         const pool = (0, binary_js_1.readPubkey)(data, o);
         o += 32;
@@ -117,6 +180,24 @@ function parseDlmmFromDecoded(programData, metadata) {
         return { MeteoraDlmmRemoveLiquidity: ev };
     }
     if (discriminator === DLMM.INIT_POOL) {
+        if (data.length < 98)
+            return null;
+        let o = 0;
+        const pool = (0, binary_js_1.readPubkey)(data, o);
+        o += 32;
+        const bin_step = (0, binary_js_1.readU16LE)(data, o);
+        const ev = {
+            metadata,
+            pool,
+            creator: (0, dex_event_js_1.defaultPubkey)(),
+            active_bin_id: 0,
+            bin_step,
+        };
+        return { MeteoraDlmmInitializePool: ev };
+    }
+    if (discriminator === DLMM.LEGACY_INIT_POOL) {
+        if (data.length < 70)
+            return null;
         let o = 0;
         const pool = (0, binary_js_1.readPubkey)(data, o);
         o += 32;
@@ -135,6 +216,8 @@ function parseDlmmFromDecoded(programData, metadata) {
         return { MeteoraDlmmInitializePool: ev };
     }
     if (discriminator === DLMM.INIT_BIN_ARRAY) {
+        if (data.length < 72)
+            return null;
         let o = 0;
         const pool = (0, binary_js_1.readPubkey)(data, o);
         o += 32;
@@ -145,6 +228,27 @@ function parseDlmmFromDecoded(programData, metadata) {
         return { MeteoraDlmmInitializeBinArray: ev };
     }
     if (discriminator === DLMM.CREATE_POS) {
+        if (data.length < 96)
+            return null;
+        let o = 0;
+        const pool = (0, binary_js_1.readPubkey)(data, o);
+        o += 32;
+        const position = (0, binary_js_1.readPubkey)(data, o);
+        o += 32;
+        const owner = (0, binary_js_1.readPubkey)(data, o);
+        const ev = {
+            metadata,
+            pool,
+            position,
+            owner,
+            lower_bin_id: 0,
+            width: 0,
+        };
+        return { MeteoraDlmmCreatePosition: ev };
+    }
+    if (discriminator === DLMM.LEGACY_CREATE_POS) {
+        if (data.length < 104)
+            return null;
         let o = 0;
         const pool = (0, binary_js_1.readPubkey)(data, o);
         o += 32;
@@ -166,6 +270,23 @@ function parseDlmmFromDecoded(programData, metadata) {
         return { MeteoraDlmmCreatePosition: ev };
     }
     if (discriminator === DLMM.CLOSE_POS) {
+        if (data.length < 64)
+            return null;
+        let o = 0;
+        const position = (0, binary_js_1.readPubkey)(data, o);
+        o += 32;
+        const owner = (0, binary_js_1.readPubkey)(data, o);
+        const ev = {
+            metadata,
+            pool: (0, dex_event_js_1.defaultPubkey)(),
+            position,
+            owner,
+        };
+        return { MeteoraDlmmClosePosition: ev };
+    }
+    if (discriminator === DLMM.LEGACY_CLOSE_POS) {
+        if (data.length < 96)
+            return null;
         let o = 0;
         const pool = (0, binary_js_1.readPubkey)(data, o);
         o += 32;
@@ -175,7 +296,10 @@ function parseDlmmFromDecoded(programData, metadata) {
         const ev = { metadata, pool, position, owner };
         return { MeteoraDlmmClosePosition: ev };
     }
-    if (discriminator === DLMM.CLAIM_FEE) {
+    if (discriminator === DLMM.CLAIM_FEE || discriminator === DLMM.CLAIM_FEE2 || discriminator === DLMM.LEGACY_CLAIM_FEE) {
+        const requiredLength = discriminator === DLMM.CLAIM_FEE2 ? 116 : 112;
+        if (data.length < requiredLength)
+            return null;
         let o = 0;
         const pool = (0, binary_js_1.readPubkey)(data, o);
         o += 32;

package/dist/logs/optimized_matcher.js

@@ -28,14 +28,16 @@ const binary_js_1 = require("../util/binary.js");
 const program_log_discriminators_js_1 = require("./program_log_discriminators.js");
 const program_ids_js_1 = require("../grpc/program_ids.js");
 const DLMM_DISC = {
-    SWAP: program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_SWAP_BASE_IN,
-    ADD_LIQUIDITY: (0, program_log_discriminators_js_1.u64leDiscriminator)([181, 157, 89, 67, 143, 182, 52, 72]),
-    REMOVE_LIQUIDITY: (0, program_log_discriminators_js_1.u64leDiscriminator)([80, 85, 209, 72, 24, 206, 35, 178]),
-    INITIALIZE_POOL: (0, program_log_discriminators_js_1.u64leDiscriminator)([95, 180, 10, 172, 84, 174, 232, 40]),
+    SWAP: (0, program_log_discriminators_js_1.u64leDiscriminator)([81, 108, 227, 190, 205, 208, 10, 196]),
+    SWAP2: (0, program_log_discriminators_js_1.u64leDiscriminator)([46, 116, 82, 215, 148, 27, 84, 77]),
+    ADD_LIQUIDITY: (0, program_log_discriminators_js_1.u64leDiscriminator)([31, 94, 125, 90, 227, 52, 61, 186]),
+    REMOVE_LIQUIDITY: (0, program_log_discriminators_js_1.u64leDiscriminator)([116, 244, 97, 232, 103, 31, 152, 58]),
+    INITIALIZE_POOL: (0, program_log_discriminators_js_1.u64leDiscriminator)([185, 74, 252, 125, 27, 215, 188, 111]),
     INITIALIZE_BIN_ARRAY: (0, program_log_discriminators_js_1.u64leDiscriminator)([11, 18, 155, 194, 33, 115, 238, 119]),
-    CREATE_POSITION: (0, program_log_discriminators_js_1.u64leDiscriminator)([123, 233, 11, 43, 146, 180, 97, 119]),
-    CLOSE_POSITION: (0, program_log_discriminators_js_1.u64leDiscriminator)([94, 168, 102, 45, 59, 122, 137, 54]),
-    CLAIM_FEE: (0, program_log_discriminators_js_1.u64leDiscriminator)([152, 70, 208, 111, 104, 91, 44, 1]),
+    CREATE_POSITION: (0, program_log_discriminators_js_1.u64leDiscriminator)([144, 142, 252, 84, 157, 53, 37, 121]),
+    CLOSE_POSITION: (0, program_log_discriminators_js_1.u64leDiscriminator)([255, 196, 16, 107, 28, 202, 53, 128]),
+    CLAIM_FEE: (0, program_log_discriminators_js_1.u64leDiscriminator)([75, 122, 154, 48, 140, 74, 123, 163]),
+    CLAIM_FEE2: (0, program_log_discriminators_js_1.u64leDiscriminator)([232, 171, 242, 97, 58, 77, 35, 45]),
 };
 function discriminatorToEventType(disc) {
     if (disc === program_log_discriminators_js_1.PROGRAM_LOG_DISC.PUMPFUN_CREATE)
@@ -247,7 +249,9 @@ function programScopedDiscriminatorToEventType(programId, disc) {
         return null;
     }
     if (programId === program_ids_js_1.RAYDIUM_CPMM_PROGRAM_ID) {
-        if (disc === program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_SWAP_BASE_IN || disc === program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_SWAP_BASE_OUT)
+        if (disc === program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_SWAP_EVENT ||
+            disc === program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_SWAP_BASE_IN ||
+            disc === program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_SWAP_BASE_OUT)
             return "RaydiumCpmmSwap";
         if (disc === program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_CREATE_POOL)
             return "RaydiumCpmmInitialize";
@@ -321,7 +325,7 @@ function programScopedDiscriminatorToEventType(programId, disc) {
         return null;
     }
     if (programId === program_ids_js_1.METEORA_DLMM_PROGRAM_ID) {
-        if (disc === DLMM_DISC.SWAP)
+        if (disc === DLMM_DISC.SWAP || disc === DLMM_DISC.SWAP2)
             return "MeteoraDlmmSwap";
         if (disc === DLMM_DISC.ADD_LIQUIDITY)
             return "MeteoraDlmmAddLiquidity";
@@ -335,7 +339,7 @@ function programScopedDiscriminatorToEventType(programId, disc) {
             return "MeteoraDlmmCreatePosition";
         if (disc === DLMM_DISC.CLOSE_POSITION)
             return "MeteoraDlmmClosePosition";
-        if (disc === DLMM_DISC.CLAIM_FEE)
+        if (disc === DLMM_DISC.CLAIM_FEE || disc === DLMM_DISC.CLAIM_FEE2)
             return "MeteoraDlmmClaimFee";
         return null;
     }
@@ -568,6 +572,15 @@ function parseUnscopedPumpfunLaunchlabTrade(data, metadata, filter, isCreatedBuy
     return null;
 }
 function parseLogOptimized(log, signature, slot, txIndex, blockTimeUs, grpcRecvUs, eventTypeFilter, isCreatedBuy, recentBlockhash, programId) {
+    if (programId === program_ids_js_1.RAYDIUM_AMM_V4_PROGRAM_ID && log.indexOf("ray_log: ") >= 0) {
+        if (eventTypeFilter && !eventTypeFilter.shouldInclude("RaydiumAmmV4Swap"))
+            return null;
+        const rb = recentBlockhash && recentBlockhash.length > 0
+            ? bs58_1.default.encode(recentBlockhash)
+            : undefined;
+        const metadata = (0, metadata_js_1.makeMetadata)(signature, slot, txIndex, blockTimeUs, grpcRecvUs, rb);
+        return (0, raydium_amm_js_1.parseRayLogSwap)(log, metadata);
+    }
     const buf = (0, program_data_js_1.decodeProgramDataLine)(log);
     if (!buf)
         return null;
@@ -642,6 +655,8 @@ function parseLogOptimized(log, signature, slot, txIndex, blockTimeUs, grpcRecvU
     }
     if (programId === program_ids_js_1.RAYDIUM_CPMM_PROGRAM_ID) {
         switch (disc) {
+            case program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_SWAP_EVENT:
+                return applyActualEventTypeFilter((0, raydium_cpmm_js_1.parseSwapEventFromData)(data, metadata), eventTypeFilter);
             case program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_SWAP_BASE_IN:
                 return applyActualEventTypeFilter((0, raydium_cpmm_js_1.parseSwapBaseInFromData)(data, metadata), eventTypeFilter);
             case program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_SWAP_BASE_OUT:

package/dist/logs/program_log_discriminators.d.ts

@@ -48,6 +48,7 @@ export declare const PROGRAM_LOG_DISC: {
     readonly RAYDIUM_CLMM_CREATE_POOL: bigint;
     readonly RAYDIUM_CLMM_COLLECT_PERSONAL_FEE: bigint;
     readonly RAYDIUM_CLMM_COLLECT_PROTOCOL_FEE: bigint;
+    readonly RAYDIUM_CPMM_SWAP_EVENT: bigint;
     readonly RAYDIUM_CPMM_SWAP_BASE_IN: bigint;
     readonly RAYDIUM_CPMM_SWAP_BASE_OUT: bigint;
     readonly RAYDIUM_CPMM_CREATE_POOL: bigint;

package/dist/logs/program_log_discriminators.js

@@ -57,6 +57,8 @@ exports.PROGRAM_LOG_DISC = {
     RAYDIUM_CLMM_CREATE_POOL: u64leDiscriminator([25, 94, 75, 47, 112, 99, 53, 63]),
     RAYDIUM_CLMM_COLLECT_PERSONAL_FEE: u64leDiscriminator([166, 174, 105, 192, 81, 161, 83, 105]),
     RAYDIUM_CLMM_COLLECT_PROTOCOL_FEE: u64leDiscriminator([206, 87, 17, 79, 45, 41, 213, 61]),
+    // Anchor event: `event:SwapEvent` (shared with CLMM; program context disambiguates it).
+    RAYDIUM_CPMM_SWAP_EVENT: u64leDiscriminator([64, 198, 205, 232, 38, 8, 113, 226]),
     RAYDIUM_CPMM_SWAP_BASE_IN: u64leDiscriminator([143, 190, 90, 218, 196, 30, 51, 222]),
     RAYDIUM_CPMM_SWAP_BASE_OUT: u64leDiscriminator([55, 217, 98, 86, 163, 74, 180, 173]),
     RAYDIUM_CPMM_CREATE_POOL: u64leDiscriminator([233, 146, 209, 142, 207, 104, 64, 188]),

package/dist/logs/pump_amm.js

@@ -17,9 +17,64 @@ function bnI64(v) {
     return v ?? 0n;
 }
 const ZP = (0, dex_event_js_1.defaultPubkey)();
+function emptyTradeTail() {
+    return {
+        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,
+    };
+}
+function parseTradeTail(data) {
+    const tail = emptyTradeTail();
+    if (data.length === 0)
+        return tail;
+    if (data.length < 16)
+        return null;
+    tail.cashback_fee_basis_points = bn64((0, binary_js_1.readU64LE)(data, 0));
+    tail.cashback = bn64((0, binary_js_1.readU64LE)(data, 8));
+    if (data.length === 16)
+        return tail;
+    if (data.length < 32)
+        return null;
+    tail.buyback_fee_basis_points = bn64((0, binary_js_1.readU64LE)(data, 16));
+    tail.buyback_fee = bn64((0, binary_js_1.readU64LE)(data, 24));
+    if (data.length === 32)
+        return tail;
+    if (data.length < 57)
+        return null;
+    const virtual = (0, binary_js_1.readU128LE)(data, 32);
+    if (virtual === null)
+        return null;
+    tail.virtual_quote_reserves = BigInt.asIntN(128, virtual);
+    const canBoost = (0, binary_js_1.readU8)(data, 48);
+    if (canBoost !== 0 && canBoost !== 1)
+        return null;
+    tail.can_boost = canBoost === 1;
+    tail.base_supply = bn64((0, binary_js_1.readU64LE)(data, 49));
+    return tail;
+}
+function readStrictBorshString(data, offset) {
+    const len = (0, binary_js_1.readU32LE)(data, offset);
+    if (len === null || offset + 4 + len > data.length)
+        return null;
+    try {
+        const value = new TextDecoder("utf-8", { fatal: true }).decode(data.subarray(offset + 4, offset + 4 + len));
+        return { value, next: offset + 4 + len };
+    }
+    catch {
+        return null;
+    }
+}
 function parseBuyFromData(data, metadata) {
-    const MIN = 16 * 8 + 7 * 32 + 1 + 5 * 8 + 4;
-    if (data.length < MIN)
+    const LEGACY_LEN = 16 * 8 + 7 * 32 + 1 + 4 * 8;
+    const MIN_REQUIRED_LEN = LEGACY_LEN + 8 + 4;
+    if (data.length !== LEGACY_LEN && data.length < MIN_REQUIRED_LEN)
+        return null;
+    if (data[352] !== 0 && data[352] !== 1)
         return null;
     let o = 0;
     const timestamp = bnI64((0, binary_js_1.readI64LE)(data, o));
@@ -68,7 +123,7 @@ function parseBuyFromData(data, metadata) {
     o += 8;
     const coin_creator_fee = bn64((0, binary_js_1.readU64LE)(data, o));
     o += 8;
-    const track_volume = (0, binary_js_1.readBool)(data, o);
+    const track_volume = data[o] === 1;
     o += 1;
     const total_unclaimed_tokens = bn64((0, binary_js_1.readU64LE)(data, o));
     o += 8;
@@ -78,15 +133,21 @@ function parseBuyFromData(data, metadata) {
     o += 8;
     const last_update_timestamp = bnI64((0, binary_js_1.readI64LE)(data, o));
     o += 8;
-    const min_base_amount_out = bn64((0, binary_js_1.readU64LE)(data, o));
-    o += 8;
+    let min_base_amount_out = 0n;
     let ix_name = "";
-    if (o + 4 <= data.length) {
-        const len = (0, binary_js_1.readU32LE)(data, o);
-        o += 4;
-        if (o + len <= data.length) {
-            ix_name = new TextDecoder().decode(data.subarray(o, o + len));
-        }
+    let tail = emptyTradeTail();
+    if (data.length !== LEGACY_LEN) {
+        min_base_amount_out = bn64((0, binary_js_1.readU64LE)(data, o));
+        o += 8;
+        const name = readStrictBorshString(data, o);
+        if (name === null)
+            return null;
+        ix_name = name.value;
+        o = name.next;
+        const parsedTail = parseTradeTail(data.subarray(o));
+        if (parsedTail === null)
+            return null;
+        tail = parsedTail;
     }
     const ev = {
         metadata,
@@ -120,8 +181,13 @@ function parseBuyFromData(data, metadata) {
         last_update_timestamp,
         min_base_amount_out,
         ix_name,
-        cashback_fee_basis_points: 0n,
-        cashback: 0n,
+        cashback_fee_basis_points: tail.cashback_fee_basis_points,
+        cashback: tail.cashback,
+        buyback_fee_basis_points: tail.buyback_fee_basis_points,
+        buyback_fee: tail.buyback_fee,
+        virtual_quote_reserves: tail.virtual_quote_reserves,
+        can_boost: tail.can_boost,
+        base_supply: tail.base_supply,
         is_pump_pool: false,
         base_mint: ZP,
         quote_mint: ZP,
@@ -135,9 +201,12 @@ function parseBuyFromData(data, metadata) {
     return { PumpSwapBuy: ev };
 }
 function parseSellFromData(data, metadata) {
-    const REQUIRED = 13 * 8 + 7 * 32;
+    const REQUIRED = 14 * 8 + 7 * 32 + 2 * 8;
     if (data.length < REQUIRED)
         return null;
+    const tail = parseTradeTail(data.subarray(REQUIRED));
+    if (tail === null)
+        return null;
     let o = 0;
     const timestamp = bnI64((0, binary_js_1.readI64LE)(data, o));
     o += 8;
@@ -185,12 +254,6 @@ function parseSellFromData(data, metadata) {
     o += 8;
     const coin_creator_fee = bn64((0, binary_js_1.readU64LE)(data, o));
     o += 8;
-    let cashback_fee_basis_points = 0n;
-    let cashback = 0n;
-    if (data.length >= 368) {
-        cashback_fee_basis_points = bn64((0, binary_js_1.readU64LE)(data, 352));
-        cashback = bn64((0, binary_js_1.readU64LE)(data, 360));
-    }
     const ev = {
         metadata,
         timestamp,
@@ -216,8 +279,13 @@ function parseSellFromData(data, metadata) {
         coin_creator,
         coin_creator_fee_basis_points,
         coin_creator_fee,
-        cashback_fee_basis_points,
-        cashback,
+        cashback_fee_basis_points: tail.cashback_fee_basis_points,
+        cashback: tail.cashback,
+        buyback_fee_basis_points: tail.buyback_fee_basis_points,
+        buyback_fee: tail.buyback_fee,
+        virtual_quote_reserves: tail.virtual_quote_reserves,
+        can_boost: tail.can_boost,
+        base_supply: tail.base_supply,
         is_pump_pool: false,
         base_mint: ZP,
         quote_mint: ZP,

package/dist/logs/raydium_amm.d.ts

@@ -1,5 +1,7 @@
 import type { EventMetadata } from "../core/metadata.js";
 import type { DexEvent } from "../core/dex_event.js";
+/** Decode Raydium AMM V4's official bincode `SwapBaseInLog` / `SwapBaseOutLog`. */
+export declare function parseRayLogSwap(log: string, 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 parseDepositFromData(data: Uint8Array, metadata: EventMetadata): DexEvent | null;

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);