sol-parser-sdk-nodejs 0.3.0 → 0.4.0

package/dist/instr/pumpswap_ix.js

@@ -27,6 +27,7 @@ function buyLike(data, accounts, meta, swapOrder) {
         ? [(0, utils_js_1.readU64LE)(data, 0) ?? 0n, (0, utils_js_1.readU64LE)(data, 8) ?? 0n]
         : [0n, 0n];
     const [base_amount_out, max_quote_amount_in] = swapOrder === "buy" ? [a0, a1] : [a1, a0];
+    const g = (i) => (0, utils_js_1.getAccount)(accounts, i) ?? ZP;
     const ev = {
         metadata: meta,
         timestamp: 0n,
@@ -43,13 +44,13 @@ function buyLike(data, accounts, meta, swapOrder) {
         protocol_fee: 0n,
         quote_amount_in_with_lp_fee: 0n,
         user_quote_amount_in: 0n,
-        pool: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
-        user: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
-        user_base_token_account: (0, utils_js_1.getAccount)(accounts, 5) ?? Z,
-        user_quote_token_account: (0, utils_js_1.getAccount)(accounts, 6) ?? Z,
-        protocol_fee_recipient: (0, utils_js_1.getAccount)(accounts, 9) ?? Z,
-        protocol_fee_recipient_token_account: (0, utils_js_1.getAccount)(accounts, 10) ?? Z,
-        coin_creator: Z,
+        pool: g(0),
+        user: g(1),
+        user_base_token_account: g(5),
+        user_quote_token_account: g(6),
+        protocol_fee_recipient: g(9),
+        protocol_fee_recipient_token_account: g(10),
+        coin_creator: accounts.length > 16 ? g(16) : Z,
         coin_creator_fee_basis_points: 0n,
         coin_creator_fee: 0n,
         track_volume: false,
@@ -62,23 +63,23 @@ function buyLike(data, accounts, meta, swapOrder) {
         cashback_fee_basis_points: 0n,
         cashback: 0n,
         is_pump_pool: false,
-        base_mint: ZP,
-        quote_mint: ZP,
-        pool_base_token_account: ZP,
-        pool_quote_token_account: ZP,
-        coin_creator_vault_ata: ZP,
-        coin_creator_vault_authority: ZP,
-        base_token_program: ZP,
-        quote_token_program: ZP,
+        base_mint: g(3),
+        quote_mint: g(4),
+        pool_base_token_account: g(7),
+        pool_quote_token_account: g(8),
+        coin_creator_vault_ata: accounts.length > 17 ? g(17) : ZP,
+        coin_creator_vault_authority: accounts.length > 18 ? g(18) : ZP,
+        base_token_program: g(11),
+        quote_token_program: g(12),
     };
     return ev;
 }
-function parsePumpswapInstruction(instructionData, accounts, signature, slot, txIndex, blockTimeUs) {
+function parsePumpswapInstruction(instructionData, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs = 0) {
     if (instructionData.length < 8)
         return null;
     const head = instructionData.subarray(0, 8);
     const data = instructionData.subarray(8);
-    const meta = (0, utils_js_1.ixMeta)(signature, slot, txIndex, blockTimeUs, 0);
+    const meta = (0, utils_js_1.ixMeta)(signature, slot, txIndex, blockTimeUs, grpcRecvUs);
     if (discEq(head, PS.BUY)) {
         if (accounts.length < 13)
             return null;
@@ -95,6 +96,7 @@ function parsePumpswapInstruction(instructionData, accounts, signature, slot, tx
         const [base_amount_in, min_quote_amount_out] = data.length >= 16
             ? [(0, utils_js_1.readU64LE)(data, 0) ?? 0n, (0, utils_js_1.readU64LE)(data, 8) ?? 0n]
             : [0n, 0n];
+        const g = (i) => (0, utils_js_1.getAccount)(accounts, i) ?? ZP;
         const ev = {
             metadata: meta,
             timestamp: 0n,
@@ -111,39 +113,41 @@ function parsePumpswapInstruction(instructionData, accounts, signature, slot, tx
             protocol_fee: 0n,
             quote_amount_out_without_lp_fee: 0n,
             user_quote_amount_out: 0n,
-            pool: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
-            user: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
-            user_base_token_account: (0, utils_js_1.getAccount)(accounts, 5) ?? Z,
-            user_quote_token_account: (0, utils_js_1.getAccount)(accounts, 6) ?? Z,
-            protocol_fee_recipient: (0, utils_js_1.getAccount)(accounts, 9) ?? Z,
-            protocol_fee_recipient_token_account: (0, utils_js_1.getAccount)(accounts, 10) ?? Z,
-            coin_creator: Z,
+            pool: g(0),
+            user: g(1),
+            user_base_token_account: g(5),
+            user_quote_token_account: g(6),
+            protocol_fee_recipient: g(9),
+            protocol_fee_recipient_token_account: g(10),
+            coin_creator: accounts.length > 16 ? g(16) : Z,
             coin_creator_fee_basis_points: 0n,
             coin_creator_fee: 0n,
             cashback_fee_basis_points: 0n,
             cashback: 0n,
             is_pump_pool: false,
-            base_mint: ZP,
-            quote_mint: ZP,
-            pool_base_token_account: ZP,
-            pool_quote_token_account: ZP,
-            coin_creator_vault_ata: ZP,
-            coin_creator_vault_authority: ZP,
-            base_token_program: ZP,
-            quote_token_program: ZP,
+            base_mint: g(3),
+            quote_mint: g(4),
+            pool_base_token_account: g(7),
+            pool_quote_token_account: g(8),
+            coin_creator_vault_ata: accounts.length > 17 ? g(17) : ZP,
+            coin_creator_vault_authority: accounts.length > 18 ? g(18) : ZP,
+            base_token_program: g(11),
+            quote_token_program: g(12),
         };
         return { PumpSwapSell: ev };
     }
     if (discEq(head, PS.CREATE_POOL)) {
-        if (accounts.length < 5)
+        if (accounts.length < 8)
             return null;
+        const g = (i) => (0, utils_js_1.getAccount)(accounts, i) ?? Z;
         const ev = {
             metadata: meta,
             timestamp: 0n,
             index: 0,
-            creator: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
-            base_mint: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
-            quote_mint: (0, utils_js_1.getAccount)(accounts, 3) ?? Z,
+            pool: g(0),
+            creator: g(2),
+            base_mint: g(3),
+            quote_mint: g(4),
             base_mint_decimals: 0,
             quote_mint_decimals: 0,
             base_amount_in: 0n,
@@ -154,11 +158,10 @@ function parsePumpswapInstruction(instructionData, accounts, signature, slot, tx
             initial_liquidity: 0n,
             lp_token_amount_out: 0n,
             pool_bump: 0,
-            pool: Z,
-            lp_mint: Z,
-            user_base_token_account: Z,
-            user_quote_token_account: Z,
-            coin_creator: Z,
+            lp_mint: g(5),
+            user_base_token_account: g(6),
+            user_quote_token_account: g(7),
+            coin_creator: g(1),
             is_mayhem_mode: false,
         };
         return { PumpSwapCreatePool: ev };
@@ -166,12 +169,21 @@ function parsePumpswapInstruction(instructionData, accounts, signature, slot, tx
     if (discEq(head, PS.DEPOSIT)) {
         if (accounts.length < 8)
             return null;
+        const g = (i) => (0, utils_js_1.getAccount)(accounts, i) ?? Z;
+        let lp_out = 0n;
+        let max_base = 0n;
+        let max_quote = 0n;
+        if (data.length >= 24) {
+            lp_out = (0, utils_js_1.readU64LE)(data, 0) ?? 0n;
+            max_base = (0, utils_js_1.readU64LE)(data, 8) ?? 0n;
+            max_quote = (0, utils_js_1.readU64LE)(data, 16) ?? 0n;
+        }
         const ev = {
             metadata: meta,
             timestamp: 0n,
-            lp_token_amount_out: 0n,
-            max_base_amount_in: 0n,
-            max_quote_amount_in: 0n,
+            lp_token_amount_out: lp_out,
+            max_base_amount_in: max_base,
+            max_quote_amount_in: max_quote,
             user_base_token_reserves: 0n,
             user_quote_token_reserves: 0n,
             pool_base_token_reserves: 0n,
@@ -179,23 +191,32 @@ function parsePumpswapInstruction(instructionData, accounts, signature, slot, tx
             base_amount_in: 0n,
             quote_amount_in: 0n,
             lp_mint_supply: 0n,
-            pool: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
-            user: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
-            user_base_token_account: (0, utils_js_1.getAccount)(accounts, 4) ?? Z,
-            user_quote_token_account: (0, utils_js_1.getAccount)(accounts, 5) ?? Z,
-            user_pool_token_account: (0, utils_js_1.getAccount)(accounts, 6) ?? Z,
+            pool: g(0),
+            user: g(1),
+            user_base_token_account: g(4),
+            user_quote_token_account: g(5),
+            user_pool_token_account: g(6),
         };
         return { PumpSwapLiquidityAdded: ev };
     }
     if (discEq(head, PS.WITHDRAW)) {
         if (accounts.length < 8)
             return null;
+        const g = (i) => (0, utils_js_1.getAccount)(accounts, i) ?? Z;
+        let lp_in = 0n;
+        let min_base = 0n;
+        let min_quote = 0n;
+        if (data.length >= 24) {
+            lp_in = (0, utils_js_1.readU64LE)(data, 0) ?? 0n;
+            min_base = (0, utils_js_1.readU64LE)(data, 8) ?? 0n;
+            min_quote = (0, utils_js_1.readU64LE)(data, 16) ?? 0n;
+        }
         const ev = {
             metadata: meta,
             timestamp: 0n,
-            lp_token_amount_in: 0n,
-            min_base_amount_out: 0n,
-            min_quote_amount_out: 0n,
+            lp_token_amount_in: lp_in,
+            min_base_amount_out: min_base,
+            min_quote_amount_out: min_quote,
             user_base_token_reserves: 0n,
             user_quote_token_reserves: 0n,
             pool_base_token_reserves: 0n,
@@ -203,11 +224,11 @@ function parsePumpswapInstruction(instructionData, accounts, signature, slot, tx
             base_amount_out: 0n,
             quote_amount_out: 0n,
             lp_mint_supply: 0n,
-            pool: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
-            user: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
-            user_base_token_account: (0, utils_js_1.getAccount)(accounts, 4) ?? Z,
-            user_quote_token_account: (0, utils_js_1.getAccount)(accounts, 5) ?? Z,
-            user_pool_token_account: (0, utils_js_1.getAccount)(accounts, 6) ?? Z,
+            pool: g(0),
+            user: g(1),
+            user_base_token_account: g(4),
+            user_quote_token_account: g(5),
+            user_pool_token_account: g(6),
         };
         return { PumpSwapLiquidityRemoved: ev };
     }

package/dist/instr/raydium_amm_v4_ix.d.ts

@@ -1,6 +1,6 @@
 /**
  * Raydium AMM V4 指令解析
- * 注意：Raydium AMM V4 使用单字节 instruction discriminator
+ * 单字节 discriminator；Swap 账户顺序与链上 `SwapBaseIn`/`SwapBaseOut` 一致（18 个账户）。
  */
 import type { DexEvent } from "../core/dex_event.js";
 export declare function parseRaydiumAmmV4Instruction(instructionData: Uint8Array, accounts: string[], signature: string, slot: number, txIndex: number, blockTimeUs: number | undefined, grpcRecvUs: number): DexEvent | null;

package/dist/instr/raydium_amm_v4_ix.js

@@ -4,43 +4,109 @@ exports.parseRaydiumAmmV4Instruction = parseRaydiumAmmV4Instruction;
 const dex_event_js_1 = require("../core/dex_event.js");
 const utils_js_1 = require("./utils.js");
 const Z = (0, dex_event_js_1.defaultPubkey)();
-// Raydium AMM V4 使用单字节指令类型
 const INSTR_TYPE = {
     SWAP_BASE_IN: 9,
     SWAP_BASE_OUT: 11,
 };
+/** 指令内账户顺序（与 Raydium AMM V4 swap 一致） */
+const SWAP = {
+    TOKEN_PROGRAM: 0,
+    AMM: 1,
+    AMM_AUTHORITY: 2,
+    AMM_OPEN_ORDERS: 3,
+    AMM_TARGET_ORDERS: 4,
+    POOL_COIN_TOKEN: 5,
+    POOL_PC_TOKEN: 6,
+    SERUM_PROGRAM: 7,
+    SERUM_MARKET: 8,
+    SERUM_BIDS: 9,
+    SERUM_ASKS: 10,
+    SERUM_EVENT_QUEUE: 11,
+    SERUM_COIN_VAULT: 12,
+    SERUM_PC_VAULT: 13,
+    SERUM_VAULT_SIGNER: 14,
+    USER_SOURCE_TOKEN: 15,
+    USER_DEST_TOKEN: 16,
+    USER_OWNER: 17,
+};
+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;
+    return {
+        RaydiumAmmV4Swap: {
+            metadata: meta,
+            amount_in,
+            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),
+        },
+    };
+}
+function swapBaseOutFromIx(instructionData, accounts, meta) {
+    if (instructionData.length < 1 + 8 + 8)
+        return null;
+    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;
+    return {
+        RaydiumAmmV4Swap: {
+            metadata: meta,
+            amount_in: 0n,
+            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),
+        },
+    };
+}
 function parseRaydiumAmmV4Instruction(instructionData, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs) {
     if (instructionData.length < 1)
         return null;
     const instrType = instructionData[0];
     const meta = (0, utils_js_1.ixMeta)(signature, slot, txIndex, blockTimeUs, grpcRecvUs);
-    if (instrType === INSTR_TYPE.SWAP_BASE_IN || instrType === INSTR_TYPE.SWAP_BASE_OUT) {
-        return {
-            RaydiumAmmV4Swap: {
-                metadata: meta,
-                amm: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
-                user_source_owner: (0, utils_js_1.getAccount)(accounts, 17) ?? Z,
-                amount_in: 0n,
-                minimum_amount_out: 0n,
-                max_amount_in: 0n,
-                amount_out: 0n,
-                token_program: Z,
-                amm_authority: Z,
-                amm_open_orders: Z,
-                pool_coin_token_account: Z,
-                pool_pc_token_account: Z,
-                serum_program: Z,
-                serum_market: Z,
-                serum_bids: Z,
-                serum_asks: Z,
-                serum_event_queue: Z,
-                serum_coin_vault_account: Z,
-                serum_pc_vault_account: Z,
-                serum_vault_signer: Z,
-                user_source_token_account: Z,
-                user_destination_token_account: Z,
-            },
-        };
+    if (instrType === INSTR_TYPE.SWAP_BASE_IN) {
+        return swapBaseInFromIx(instructionData, accounts, meta);
+    }
+    if (instrType === INSTR_TYPE.SWAP_BASE_OUT) {
+        return swapBaseOutFromIx(instructionData, accounts, meta);
     }
     return null;
 }

package/dist/instr/raydium_clmm_ix.d.ts

@@ -1,5 +1,5 @@
 /**
- * Raydium CLMM 指令解析
+ * Raydium CLMM 指令解析（与 Orca Whirlpool 同源 Anchor 布局：swap / 增减流动性）
  */
 import type { DexEvent } from "../core/dex_event.js";
 export declare function parseRaydiumClmmInstruction(instructionData: Uint8Array, accounts: string[], signature: string, slot: number, txIndex: number, blockTimeUs: number | undefined, grpcRecvUs: number): DexEvent | null;

package/dist/instr/raydium_clmm_ix.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseRaydiumClmmInstruction = parseRaydiumClmmInstruction;
 const dex_event_js_1 = require("../core/dex_event.js");
+const program_log_discriminators_js_1 = require("../logs/program_log_discriminators.js");
 const utils_js_1 = require("./utils.js");
 const Z = (0, dex_event_js_1.defaultPubkey)();
-// Discriminators (little-endian u64)
 const DISC = {
-    SWAP: 14494794552504610216n, // disc8(248, 198, 158, 145, 225, 117, 135, 200)
-    INCREASE_LIQUIDITY: 746211110853564037n, // disc8(133, 29, 89, 223, 69, 238, 176, 10)
-    DECREASE_LIQUIDITY: 100389049586398241n, // disc8(160, 38, 208, 111, 104, 91, 44, 1)
-    CREATE_POOL: 13543951572834378153n, // disc8(233, 146, 209, 142, 207, 104, 64, 188)
+    SWAP: program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CLMM_SWAP,
+    INCREASE_LIQUIDITY: program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CLMM_INCREASE_LIQUIDITY,
+    DECREASE_LIQUIDITY: program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CLMM_DECREASE_LIQUIDITY,
+    CREATE_POOL: program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CLMM_CREATE_POOL,
 };
 function discEq(data, disc) {
     if (data.length < 8)
@@ -17,22 +17,39 @@ function discEq(data, disc) {
     const v = (0, utils_js_1.readU64LE)(data, 0);
     return v === disc;
 }
+/** Whirlpool 系 swap 指令账户：0 program, 1 authority, 2 pool, 3 user_ata_a, 4 vault_a, 5 user_ata_b, … */
+const SWAP_ACC = {
+    POOL: 2,
+    SENDER: 1,
+    TOKEN_A_USER: 3,
+    TOKEN_B_USER: 5,
+};
 function parseRaydiumClmmInstruction(instructionData, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs) {
     if (instructionData.length < 8)
         return null;
     const meta = (0, utils_js_1.ixMeta)(signature, slot, txIndex, blockTimeUs, grpcRecvUs);
     if (discEq(instructionData, DISC.SWAP)) {
+        // Anchor swap：amount, other_amount_threshold, sqrt_price_limit(u128), amount_specified_is_input, a_to_b
+        if (instructionData.length < 42)
+            return null;
+        const amount = (0, utils_js_1.readU64LE)(instructionData, 8) ?? 0n;
+        const other = (0, utils_js_1.readU64LE)(instructionData, 16) ?? 0n;
+        const sqrt_limit = (0, utils_js_1.readU128LE)(instructionData, 24) ?? 0n;
+        const _amount_specified_is_input = (0, utils_js_1.readBool)(instructionData, 40);
+        const a_to_b = (0, utils_js_1.readBool)(instructionData, 41);
+        if (_amount_specified_is_input === null || a_to_b === null)
+            return null;
         return {
             RaydiumClmmSwap: {
                 metadata: meta,
-                pool_state: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
-                sender: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
-                token_account_0: Z,
-                token_account_1: Z,
-                amount_0: 0n,
-                amount_1: 0n,
-                zero_for_one: false,
-                sqrt_price_x64: 0n,
+                pool_state: (0, utils_js_1.getAccount)(accounts, SWAP_ACC.POOL) ?? Z,
+                sender: (0, utils_js_1.getAccount)(accounts, SWAP_ACC.SENDER) ?? Z,
+                token_account_0: (0, utils_js_1.getAccount)(accounts, SWAP_ACC.TOKEN_A_USER) ?? Z,
+                token_account_1: (0, utils_js_1.getAccount)(accounts, SWAP_ACC.TOKEN_B_USER) ?? Z,
+                amount_0: amount,
+                amount_1: other,
+                zero_for_one: a_to_b,
+                sqrt_price_x64: sqrt_limit,
                 liquidity: 0n,
                 transfer_fee_0: 0n,
                 transfer_fee_1: 0n,
@@ -41,43 +58,59 @@ function parseRaydiumClmmInstruction(instructionData, accounts, signature, slot,
         };
     }
     if (discEq(instructionData, DISC.INCREASE_LIQUIDITY)) {
+        // increase_liquidity_v2：liquidity (u128), token_max_a, token_max_b
+        if (instructionData.length < 8 + 16 + 8 + 8)
+            return null;
+        const liquidity = (0, utils_js_1.readU128LE)(instructionData, 8) ?? 0n;
+        const amount0_max = (0, utils_js_1.readU64LE)(instructionData, 24) ?? 0n;
+        const amount1_max = (0, utils_js_1.readU64LE)(instructionData, 32) ?? 0n;
         return {
             RaydiumClmmIncreaseLiquidity: {
                 metadata: meta,
-                pool: (0, utils_js_1.getAccount)(accounts, 3) ?? Z,
-                position_nft_mint: Z,
+                pool: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
+                position_nft_mint: (0, utils_js_1.getAccount)(accounts, 3) ?? Z,
                 user: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
-                liquidity: 0n,
-                amount0_max: 0n,
-                amount1_max: 0n,
+                liquidity,
+                amount0_max,
+                amount1_max,
             },
         };
     }
     if (discEq(instructionData, DISC.DECREASE_LIQUIDITY)) {
+        // decrease_liquidity：liquidity (u128), token_min_a, token_min_b
+        if (instructionData.length < 8 + 16 + 8 + 8)
+            return null;
+        const liquidity = (0, utils_js_1.readU128LE)(instructionData, 8) ?? 0n;
+        const amount0_min = (0, utils_js_1.readU64LE)(instructionData, 24) ?? 0n;
+        const amount1_min = (0, utils_js_1.readU64LE)(instructionData, 32) ?? 0n;
         return {
             RaydiumClmmDecreaseLiquidity: {
                 metadata: meta,
-                pool: (0, utils_js_1.getAccount)(accounts, 3) ?? Z,
-                position_nft_mint: Z,
+                pool: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
+                position_nft_mint: (0, utils_js_1.getAccount)(accounts, 3) ?? Z,
                 user: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
-                liquidity: 0n,
-                amount0_min: 0n,
-                amount1_min: 0n,
+                liquidity,
+                amount0_min,
+                amount1_min,
             },
         };
     }
     if (discEq(instructionData, DISC.CREATE_POOL)) {
+        if (instructionData.length < 8 + 16 + 8)
+            return null;
+        const sqrt_price_x64 = (0, utils_js_1.readU128LE)(instructionData, 8) ?? 0n;
+        const open_time = (0, utils_js_1.readU64LE)(instructionData, 24) ?? 0n;
         return {
             RaydiumClmmCreatePool: {
                 metadata: meta,
                 pool: (0, utils_js_1.getAccount)(accounts, 4) ?? Z,
-                creator: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
                 token_0_mint: Z,
                 token_1_mint: Z,
                 tick_spacing: 0,
                 fee_rate: 0,
-                sqrt_price_x64: 0n,
-                open_time: 0n,
+                creator: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
+                sqrt_price_x64,
+                open_time,
             },
         };
     }

package/dist/instr/raydium_cpmm_ix.d.ts

@@ -1,5 +1,5 @@
 /**
- * Raydium CPMM 指令解析
+ * Raydium CPMM 指令解析（Anchor：8 字节 discriminator + Borsh 参数）
  */
 import type { DexEvent } from "../core/dex_event.js";
 export declare function parseRaydiumCpmmInstruction(instructionData: Uint8Array, accounts: string[], signature: string, slot: number, txIndex: number, blockTimeUs: number | undefined, grpcRecvUs: number): DexEvent | null;

package/dist/instr/raydium_cpmm_ix.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseRaydiumCpmmInstruction = parseRaydiumCpmmInstruction;
 const dex_event_js_1 = require("../core/dex_event.js");
+const program_log_discriminators_js_1 = require("../logs/program_log_discriminators.js");
 const utils_js_1 = require("./utils.js");
 const Z = (0, dex_event_js_1.defaultPubkey)();
-// Discriminators (little-endian u64)
 const DISC = {
-    SWAP: 16066630856980634287n, // disc8(143, 190, 90, 218, 196, 30, 51, 222)
-    DEPOSIT: 13142033090605164850n, // disc8(242, 35, 198, 137, 82, 225, 242, 182)
-    WITHDRAW: 2464928621593348407n, // disc8(183, 18, 70, 156, 148, 109, 161, 34)
+    SWAP_BASE_IN: program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_SWAP_BASE_IN,
+    SWAP_BASE_OUT: program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_SWAP_BASE_OUT,
+    DEPOSIT: program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_DEPOSIT,
+    WITHDRAW: program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_WITHDRAW,
 };
 function discEq(data, disc) {
     if (data.length < 8)
@@ -20,12 +21,16 @@ function parseRaydiumCpmmInstruction(instructionData, accounts, signature, slot,
     if (instructionData.length < 8)
         return null;
     const meta = (0, utils_js_1.ixMeta)(signature, slot, txIndex, blockTimeUs, grpcRecvUs);
-    if (discEq(instructionData, DISC.SWAP)) {
+    if (discEq(instructionData, DISC.SWAP_BASE_IN)) {
+        if (instructionData.length < 8 + 8 + 8)
+            return null;
+        const amount_in = (0, utils_js_1.readU64LE)(instructionData, 8) ?? 0n;
+        const minimum_amount_out = (0, utils_js_1.readU64LE)(instructionData, 16) ?? 0n;
         return {
             RaydiumCpmmSwap: {
                 metadata: meta,
                 pool_id: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
-                input_amount: 0n,
+                input_amount: amount_in,
                 output_amount: 0n,
                 input_vault_before: 0n,
                 output_vault_before: 0n,
@@ -35,27 +40,56 @@ function parseRaydiumCpmmInstruction(instructionData, accounts, signature, slot,
             },
         };
     }
+    if (discEq(instructionData, DISC.SWAP_BASE_OUT)) {
+        if (instructionData.length < 8 + 8 + 8)
+            return null;
+        const max_amount_in = (0, utils_js_1.readU64LE)(instructionData, 8) ?? 0n;
+        const amount_out = (0, utils_js_1.readU64LE)(instructionData, 16) ?? 0n;
+        return {
+            RaydiumCpmmSwap: {
+                metadata: meta,
+                pool_id: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
+                input_amount: max_amount_in,
+                output_amount: amount_out,
+                input_vault_before: 0n,
+                output_vault_before: 0n,
+                input_transfer_fee: 0n,
+                output_transfer_fee: 0n,
+                base_input: false,
+            },
+        };
+    }
     if (discEq(instructionData, DISC.DEPOSIT)) {
+        if (instructionData.length < 8 + 8 + 8 + 8)
+            return null;
+        const lp_token_amount = (0, utils_js_1.readU64LE)(instructionData, 8) ?? 0n;
+        const token0_amount = (0, utils_js_1.readU64LE)(instructionData, 16) ?? 0n;
+        const token1_amount = (0, utils_js_1.readU64LE)(instructionData, 24) ?? 0n;
         return {
             RaydiumCpmmDeposit: {
                 metadata: meta,
                 pool: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
                 user: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
-                lp_token_amount: 0n,
-                token0_amount: 0n,
-                token1_amount: 0n,
+                lp_token_amount,
+                token0_amount,
+                token1_amount,
             },
         };
     }
     if (discEq(instructionData, DISC.WITHDRAW)) {
+        if (instructionData.length < 8 + 8 + 8 + 8)
+            return null;
+        const lp_token_amount = (0, utils_js_1.readU64LE)(instructionData, 8) ?? 0n;
+        const token0_amount = (0, utils_js_1.readU64LE)(instructionData, 16) ?? 0n;
+        const token1_amount = (0, utils_js_1.readU64LE)(instructionData, 24) ?? 0n;
         return {
             RaydiumCpmmWithdraw: {
                 metadata: meta,
                 pool: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
                 user: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
-                lp_token_amount: 0n,
-                token0_amount: 0n,
-                token1_amount: 0n,
+                lp_token_amount,
+                token0_amount,
+                token1_amount,
             },
         };
     }

package/dist/instr/rust_aliases.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Rust `instr` 根模块 re-export 的蛇形命名（与 `parse_pumpfun_instruction` 等对应）。
+ */
+export { parseInstructionUnified as parse_instruction_unified } from "./mod.js";
+export { parsePumpfunInstruction as parse_pumpfun_instruction } from "./pumpfun_ix.js";
+export { parsePumpswapInstruction as parse_pumpswap_instruction } from "./pumpswap_ix.js";
+export { parseMeteoraDammInstruction as parse_meteora_damm_instruction } from "./meteora_damm_ix.js";

package/dist/instr/rust_aliases.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parse_meteora_damm_instruction = exports.parse_pumpswap_instruction = exports.parse_pumpfun_instruction = exports.parse_instruction_unified = void 0;
+/**
+ * Rust `instr` 根模块 re-export 的蛇形命名（与 `parse_pumpfun_instruction` 等对应）。
+ */
+var mod_js_1 = require("./mod.js");
+Object.defineProperty(exports, "parse_instruction_unified", { enumerable: true, get: function () { return mod_js_1.parseInstructionUnified; } });
+var pumpfun_ix_js_1 = require("./pumpfun_ix.js");
+Object.defineProperty(exports, "parse_pumpfun_instruction", { enumerable: true, get: function () { return pumpfun_ix_js_1.parsePumpfunInstruction; } });
+var pumpswap_ix_js_1 = require("./pumpswap_ix.js");
+Object.defineProperty(exports, "parse_pumpswap_instruction", { enumerable: true, get: function () { return pumpswap_ix_js_1.parsePumpswapInstruction; } });
+var meteora_damm_ix_js_1 = require("./meteora_damm_ix.js");
+Object.defineProperty(exports, "parse_meteora_damm_instruction", { enumerable: true, get: function () { return meteora_damm_ix_js_1.parseMeteoraDammInstruction; } });