sol-parser-sdk 0.5.9 → 0.5.11

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

package/dist/instr/raydium_amm_v4_ix.js

@@ -29,12 +29,34 @@ const SWAP = {
     USER_DEST_TOKEN: 16,
     USER_OWNER: 17,
 };
+function swapAccountIndexes(accountCount) {
+    if (accountCount !== 17)
+        return SWAP;
+    return {
+        ...SWAP,
+        AMM_TARGET_ORDERS: -1,
+        POOL_COIN_TOKEN: 4,
+        POOL_PC_TOKEN: 5,
+        SERUM_PROGRAM: 6,
+        SERUM_MARKET: 7,
+        SERUM_BIDS: 8,
+        SERUM_ASKS: 9,
+        SERUM_EVENT_QUEUE: 10,
+        SERUM_COIN_VAULT: 11,
+        SERUM_PC_VAULT: 12,
+        SERUM_VAULT_SIGNER: 13,
+        USER_SOURCE_TOKEN: 14,
+        USER_DEST_TOKEN: 15,
+        USER_OWNER: 16,
+    };
+}
 function swapBaseInFromIx(instructionData, accounts, meta) {
     if (instructionData.length < 1 + 8 + 8)
         return null;
     const amount_in = (0, utils_js_1.readU64LE)(instructionData, 1) ?? 0n;
     const minimum_amount_out = (0, utils_js_1.readU64LE)(instructionData, 9) ?? 0n;
     const g = (i) => (0, utils_js_1.getAccount)(accounts, i) ?? Z;
+    const indexes = swapAccountIndexes(accounts.length);
     return {
         RaydiumAmmV4Swap: {
             metadata: meta,
@@ -42,24 +64,24 @@ function swapBaseInFromIx(instructionData, accounts, meta) {
             minimum_amount_out,
             max_amount_in: 0n,
             amount_out: 0n,
-            token_program: g(SWAP.TOKEN_PROGRAM),
-            amm: g(SWAP.AMM),
-            amm_authority: g(SWAP.AMM_AUTHORITY),
-            amm_open_orders: g(SWAP.AMM_OPEN_ORDERS),
-            amm_target_orders: g(SWAP.AMM_TARGET_ORDERS),
-            pool_coin_token_account: g(SWAP.POOL_COIN_TOKEN),
-            pool_pc_token_account: g(SWAP.POOL_PC_TOKEN),
-            serum_program: g(SWAP.SERUM_PROGRAM),
-            serum_market: g(SWAP.SERUM_MARKET),
-            serum_bids: g(SWAP.SERUM_BIDS),
-            serum_asks: g(SWAP.SERUM_ASKS),
-            serum_event_queue: g(SWAP.SERUM_EVENT_QUEUE),
-            serum_coin_vault_account: g(SWAP.SERUM_COIN_VAULT),
-            serum_pc_vault_account: g(SWAP.SERUM_PC_VAULT),
-            serum_vault_signer: g(SWAP.SERUM_VAULT_SIGNER),
-            user_source_token_account: g(SWAP.USER_SOURCE_TOKEN),
-            user_destination_token_account: g(SWAP.USER_DEST_TOKEN),
-            user_source_owner: g(SWAP.USER_OWNER),
+            token_program: g(indexes.TOKEN_PROGRAM),
+            amm: g(indexes.AMM),
+            amm_authority: g(indexes.AMM_AUTHORITY),
+            amm_open_orders: g(indexes.AMM_OPEN_ORDERS),
+            amm_target_orders: g(indexes.AMM_TARGET_ORDERS),
+            pool_coin_token_account: g(indexes.POOL_COIN_TOKEN),
+            pool_pc_token_account: g(indexes.POOL_PC_TOKEN),
+            serum_program: g(indexes.SERUM_PROGRAM),
+            serum_market: g(indexes.SERUM_MARKET),
+            serum_bids: g(indexes.SERUM_BIDS),
+            serum_asks: g(indexes.SERUM_ASKS),
+            serum_event_queue: g(indexes.SERUM_EVENT_QUEUE),
+            serum_coin_vault_account: g(indexes.SERUM_COIN_VAULT),
+            serum_pc_vault_account: g(indexes.SERUM_PC_VAULT),
+            serum_vault_signer: g(indexes.SERUM_VAULT_SIGNER),
+            user_source_token_account: g(indexes.USER_SOURCE_TOKEN),
+            user_destination_token_account: g(indexes.USER_DEST_TOKEN),
+            user_source_owner: g(indexes.USER_OWNER),
         },
     };
 }
@@ -69,6 +91,7 @@ function swapBaseOutFromIx(instructionData, accounts, meta) {
     const max_amount_in = (0, utils_js_1.readU64LE)(instructionData, 1) ?? 0n;
     const amount_out = (0, utils_js_1.readU64LE)(instructionData, 9) ?? 0n;
     const g = (i) => (0, utils_js_1.getAccount)(accounts, i) ?? Z;
+    const indexes = swapAccountIndexes(accounts.length);
     return {
         RaydiumAmmV4Swap: {
             metadata: meta,
@@ -76,24 +99,24 @@ function swapBaseOutFromIx(instructionData, accounts, meta) {
             minimum_amount_out: 0n,
             max_amount_in,
             amount_out,
-            token_program: g(SWAP.TOKEN_PROGRAM),
-            amm: g(SWAP.AMM),
-            amm_authority: g(SWAP.AMM_AUTHORITY),
-            amm_open_orders: g(SWAP.AMM_OPEN_ORDERS),
-            amm_target_orders: g(SWAP.AMM_TARGET_ORDERS),
-            pool_coin_token_account: g(SWAP.POOL_COIN_TOKEN),
-            pool_pc_token_account: g(SWAP.POOL_PC_TOKEN),
-            serum_program: g(SWAP.SERUM_PROGRAM),
-            serum_market: g(SWAP.SERUM_MARKET),
-            serum_bids: g(SWAP.SERUM_BIDS),
-            serum_asks: g(SWAP.SERUM_ASKS),
-            serum_event_queue: g(SWAP.SERUM_EVENT_QUEUE),
-            serum_coin_vault_account: g(SWAP.SERUM_COIN_VAULT),
-            serum_pc_vault_account: g(SWAP.SERUM_PC_VAULT),
-            serum_vault_signer: g(SWAP.SERUM_VAULT_SIGNER),
-            user_source_token_account: g(SWAP.USER_SOURCE_TOKEN),
-            user_destination_token_account: g(SWAP.USER_DEST_TOKEN),
-            user_source_owner: g(SWAP.USER_OWNER),
+            token_program: g(indexes.TOKEN_PROGRAM),
+            amm: g(indexes.AMM),
+            amm_authority: g(indexes.AMM_AUTHORITY),
+            amm_open_orders: g(indexes.AMM_OPEN_ORDERS),
+            amm_target_orders: g(indexes.AMM_TARGET_ORDERS),
+            pool_coin_token_account: g(indexes.POOL_COIN_TOKEN),
+            pool_pc_token_account: g(indexes.POOL_PC_TOKEN),
+            serum_program: g(indexes.SERUM_PROGRAM),
+            serum_market: g(indexes.SERUM_MARKET),
+            serum_bids: g(indexes.SERUM_BIDS),
+            serum_asks: g(indexes.SERUM_ASKS),
+            serum_event_queue: g(indexes.SERUM_EVENT_QUEUE),
+            serum_coin_vault_account: g(indexes.SERUM_COIN_VAULT),
+            serum_pc_vault_account: g(indexes.SERUM_PC_VAULT),
+            serum_vault_signer: g(indexes.SERUM_VAULT_SIGNER),
+            user_source_token_account: g(indexes.USER_SOURCE_TOKEN),
+            user_destination_token_account: g(indexes.USER_DEST_TOKEN),
+            user_source_owner: g(indexes.USER_OWNER),
         },
     };
 }

package/dist/instr/raydium_cpmm_ix.js

@@ -28,7 +28,7 @@ function parseRaydiumCpmmInstruction(instructionData, accounts, signature, slot,
         return {
             RaydiumCpmmSwap: {
                 metadata: meta,
-                pool_id: Z,
+                pool_id: (0, utils_js_1.getAccount)(accounts, 3) ?? Z,
                 input_amount: 0n,
                 output_amount: 0n,
                 input_vault_before: 0n,
@@ -45,7 +45,7 @@ function parseRaydiumCpmmInstruction(instructionData, accounts, signature, slot,
         return {
             RaydiumCpmmSwap: {
                 metadata: meta,
-                pool_id: Z,
+                pool_id: (0, utils_js_1.getAccount)(accounts, 3) ?? Z,
                 input_amount: 0n,
                 output_amount: 0n,
                 input_vault_before: 0n,

package/dist/logs/discriminator_lut.js

@@ -33,8 +33,12 @@ function protocolForProgramLogKey(key) {
 const NAME_BY_DISC = new Map();
 const PROTOCOL_BY_DISC = new Map();
 for (const [name, disc] of Object.entries(program_log_discriminators_js_1.PROGRAM_LOG_DISC)) {
-    NAME_BY_DISC.set(disc, name);
-    PROTOCOL_BY_DISC.set(disc, protocolForProgramLogKey(name));
+    // Some Anchor event names intentionally share a discriminator across programs.
+    // Keep the first canonical unscoped entry; program-aware parsing disambiguates them.
+    if (!NAME_BY_DISC.has(disc)) {
+        NAME_BY_DISC.set(disc, name);
+        PROTOCOL_BY_DISC.set(disc, protocolForProgramLogKey(name));
+    }
 }
 /** Rust `discriminator_to_name` */
 function discriminatorToName(discriminator) {

package/dist/logs/meteora_dlmm.d.ts

@@ -2,5 +2,6 @@
 import { type EventMetadata } from "../core/metadata.js";
 import type { DexEvent } from "../core/dex_event.js";
 export declare function parseDlmmFromDecoded(programData: Uint8Array, metadata: EventMetadata): DexEvent | null;
+export declare function parseDlmmEventFromData(discriminator: bigint, data: Uint8Array, metadata: EventMetadata): DexEvent | null;
 /** 从整行日志解析 */
 export declare function parseMeteoraDlmmLog(log: string, signature: string, slot: number, txIndex: number, blockTimeUs: number | undefined, grpcRecvUs: number): DexEvent | null;