sol-parser-sdk-nodejs 0.3.0 → 0.4.4

package/dist/instr/pump_fees_ix.js

@@ -0,0 +1,166 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parsePumpFeesInstruction = parsePumpFeesInstruction;
+const metadata_js_1 = require("../core/metadata.js");
+const dex_event_js_1 = require("../core/dex_event.js");
+const binary_js_1 = require("../util/binary.js");
+const pump_fees_js_1 = require("../logs/pump_fees.js");
+const program_log_discriminators_js_1 = require("../logs/program_log_discriminators.js");
+const CREATE_FEE_SHARING_IX = (0, program_log_discriminators_js_1.u64leDiscriminator)([195, 78, 86, 76, 111, 52, 251, 213]);
+const INITIALIZE_FEE_CONFIG_IX = (0, program_log_discriminators_js_1.u64leDiscriminator)([62, 162, 20, 133, 121, 65, 145, 27]);
+const RESET_FEE_SHARING_IX = (0, program_log_discriminators_js_1.u64leDiscriminator)([10, 2, 182, 95, 16, 127, 129, 186]);
+const REVOKE_FEE_SHARING_IX = (0, program_log_discriminators_js_1.u64leDiscriminator)([18, 233, 158, 39, 185, 207, 58, 104]);
+const TRANSFER_FEE_SHARING_IX = (0, program_log_discriminators_js_1.u64leDiscriminator)([202, 10, 75, 200, 164, 34, 210, 96]);
+const UPDATE_ADMIN_IX = (0, program_log_discriminators_js_1.u64leDiscriminator)([161, 176, 40, 213, 60, 184, 179, 228]);
+const UPDATE_FEE_CONFIG_IX = (0, program_log_discriminators_js_1.u64leDiscriminator)([104, 184, 103, 242, 88, 151, 107, 20]);
+const UPDATE_FEE_SHARES_IX = (0, program_log_discriminators_js_1.u64leDiscriminator)([189, 13, 136, 99, 187, 164, 237, 35]);
+const UPSERT_FEE_TIERS_IX = (0, program_log_discriminators_js_1.u64leDiscriminator)([227, 23, 150, 12, 77, 86, 94, 4]);
+function account(accounts, index) {
+    return accounts[index] ?? null;
+}
+function accountOrDefault(accounts, index) {
+    return accounts[index] ?? (0, dex_event_js_1.defaultPubkey)();
+}
+function parsePumpFeesInstruction(instructionData, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs) {
+    const disc = (0, binary_js_1.readDiscriminatorU64)(instructionData);
+    if (disc === null)
+        return null;
+    const metadata = (0, metadata_js_1.makeMetadata)(signature, slot, txIndex, blockTimeUs, grpcRecvUs);
+    if (disc === CREATE_FEE_SHARING_IX) {
+        const admin = account(accounts, 2);
+        const mint = account(accounts, 4);
+        if (!admin || !mint)
+            return null;
+        return {
+            PumpFeesCreateFeeSharingConfig: {
+                metadata,
+                timestamp: 0n,
+                mint,
+                bonding_curve: accountOrDefault(accounts, 7),
+                pool: account(accounts, 10) ?? undefined,
+                sharing_config: accountOrDefault(accounts, 5),
+                admin,
+                initial_shareholders: [],
+                status: "Active",
+            },
+        };
+    }
+    if (disc === UPDATE_FEE_SHARES_IX) {
+        const admin = account(accounts, 2);
+        const mint = account(accounts, 4);
+        const sharing_config = account(accounts, 5);
+        if (!admin || !mint || !sharing_config)
+            return null;
+        const shareholders = (0, pump_fees_js_1.readShareholdersVec)(instructionData, 8);
+        if (!shareholders || shareholders.next !== instructionData.length)
+            return null;
+        return {
+            PumpFeesUpdateFeeShares: {
+                metadata,
+                timestamp: 0n,
+                mint,
+                sharing_config,
+                admin,
+                bonding_curve: accountOrDefault(accounts, 6),
+                pump_creator_vault: accountOrDefault(accounts, 7),
+                new_shareholders: shareholders.value,
+            },
+        };
+    }
+    if (disc === INITIALIZE_FEE_CONFIG_IX) {
+        const admin = account(accounts, 0);
+        const fee_config = account(accounts, 1);
+        if (!admin || !fee_config)
+            return null;
+        return { PumpFeesInitializeFeeConfig: { metadata, timestamp: 0n, admin, fee_config } };
+    }
+    if (disc === RESET_FEE_SHARING_IX) {
+        const old_admin = account(accounts, 0);
+        const new_admin = account(accounts, 2);
+        const mint = account(accounts, 3);
+        const sharing_config = account(accounts, 4);
+        if (!old_admin || !new_admin || !mint || !sharing_config)
+            return null;
+        return {
+            PumpFeesResetFeeSharingConfig: {
+                metadata,
+                timestamp: 0n,
+                mint,
+                sharing_config,
+                old_admin,
+                old_shareholders: [],
+                new_admin,
+                new_shareholders: [],
+            },
+        };
+    }
+    if (disc === REVOKE_FEE_SHARING_IX) {
+        const admin = account(accounts, 0);
+        const mint = account(accounts, 2);
+        const sharing_config = account(accounts, 3);
+        if (!admin || !mint || !sharing_config)
+            return null;
+        return { PumpFeesRevokeFeeSharingAuthority: { metadata, timestamp: 0n, mint, sharing_config, admin } };
+    }
+    if (disc === TRANSFER_FEE_SHARING_IX) {
+        const old_admin = account(accounts, 0);
+        const mint = account(accounts, 2);
+        const sharing_config = account(accounts, 3);
+        const new_admin = account(accounts, 4);
+        if (!old_admin || !mint || !sharing_config || !new_admin)
+            return null;
+        return {
+            PumpFeesTransferFeeSharingAuthority: {
+                metadata,
+                timestamp: 0n,
+                mint,
+                sharing_config,
+                old_admin,
+                new_admin,
+            },
+        };
+    }
+    if (disc === UPDATE_ADMIN_IX) {
+        const old_admin = account(accounts, 0);
+        const new_admin = account(accounts, 2);
+        if (!old_admin || !new_admin)
+            return null;
+        return { PumpFeesUpdateAdmin: { metadata, timestamp: 0n, old_admin, new_admin } };
+    }
+    if (disc === UPDATE_FEE_CONFIG_IX) {
+        const fee_config = account(accounts, 0);
+        const admin = account(accounts, 1);
+        if (!fee_config || !admin)
+            return null;
+        const fee_tiers = (0, pump_fees_js_1.readFeeTiersVec)(instructionData, 8);
+        if (!fee_tiers)
+            return null;
+        const flat_fees = (0, pump_fees_js_1.readFeesAt)(instructionData, fee_tiers.next);
+        if (!flat_fees || flat_fees.next !== instructionData.length)
+            return null;
+        return {
+            PumpFeesUpdateFeeConfig: {
+                metadata,
+                timestamp: 0n,
+                admin,
+                fee_config,
+                fee_tiers: fee_tiers.value,
+                flat_fees: flat_fees.value,
+            },
+        };
+    }
+    if (disc === UPSERT_FEE_TIERS_IX) {
+        const fee_config = account(accounts, 0);
+        const admin = account(accounts, 1);
+        if (!fee_config || !admin)
+            return null;
+        const fee_tiers = (0, pump_fees_js_1.readFeeTiersVec)(instructionData, 8);
+        if (!fee_tiers)
+            return null;
+        const offset = (0, binary_js_1.readU8)(instructionData, fee_tiers.next);
+        if (offset === null || fee_tiers.next + 1 !== instructionData.length)
+            return null;
+        return { PumpFeesUpsertFeeTiers: { metadata, timestamp: 0n, admin, fee_config, fee_tiers: fee_tiers.value, offset } };
+    }
+    return null;
+}

package/dist/instr/pumpfun_ix.js

@@ -8,6 +8,9 @@ const Z = (0, dex_event_js_1.defaultPubkey)();
 const DISC = {
     CREATE: Uint8Array.from([24, 30, 200, 40, 5, 28, 7, 119]),
     CREATE_V2: Uint8Array.from([214, 144, 76, 236, 95, 139, 49, 180]),
+    BUY_V2: Uint8Array.from([184, 23, 238, 97, 103, 197, 211, 61]),
+    SELL_V2: Uint8Array.from([93, 246, 130, 60, 231, 233, 64, 178]),
+    BUY_EXACT_QUOTE_IN_V2: Uint8Array.from([194, 171, 28, 70, 104, 77, 91, 47]),
     MIGRATE_EVENT_LOG: Uint8Array.from([189, 233, 93, 185, 92, 148, 234, 148]),
 };
 function discEq(data, disc) {
@@ -29,6 +32,50 @@ function createNumericDefaults() {
         is_cashback_enabled: false,
     };
 }
+function parsePumpfunTradeV2Instruction(ixName, data, accounts, metadata) {
+    const minAccounts = ixName === "sell_v2" ? 26 : 27;
+    if (accounts.length < minAccounts)
+        return null;
+    const first = data.length >= 8 ? (0, utils_js_1.readU64LE)(data, 0) ?? 0n : 0n;
+    const second = data.length >= 16 ? (0, utils_js_1.readU64LE)(data, 8) ?? 0n : 0n;
+    const tokenAmount = ixName === "buy_exact_quote_in_v2" ? second : first;
+    const solAmount = ixName === "buy_exact_quote_in_v2" ? first : second;
+    const trade = {
+        metadata,
+        mint: accounts[1] ?? Z,
+        bonding_curve: accounts[10] ?? Z,
+        user: accounts[13] ?? Z,
+        sol_amount: solAmount,
+        token_amount: tokenAmount,
+        fee_recipient: accounts[6] ?? Z,
+        is_buy: ixName !== "sell_v2",
+        is_created_buy: false,
+        timestamp: 0n,
+        virtual_sol_reserves: 0n,
+        virtual_token_reserves: 0n,
+        real_sol_reserves: 0n,
+        real_token_reserves: 0n,
+        fee_basis_points: 0n,
+        fee: 0n,
+        creator: Z,
+        creator_fee_basis_points: 0n,
+        creator_fee: 0n,
+        track_volume: false,
+        total_unclaimed_tokens: 0n,
+        total_claimed_tokens: 0n,
+        current_sol_volume: 0n,
+        last_update_timestamp: 0n,
+        ix_name: ixName,
+        mayhem_mode: false,
+        cashback_fee_basis_points: 0n,
+        cashback: 0n,
+        is_cashback_coin: false,
+        associated_bonding_curve: accounts[11] ?? Z,
+        token_program: accounts[3] ?? Z,
+        creator_vault: accounts[16] ?? Z,
+    };
+    return { PumpFunTrade: trade };
+}
 function parsePumpfunInstruction(instructionData, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs) {
     if (instructionData.length < 8)
         return null;
@@ -75,10 +122,20 @@ function parsePumpfunInstruction(instructionData, accounts, signature, slot, txI
             mayhem_token_vault: accounts[13] ?? Z,
             event_authority: accounts[14] ?? Z,
             program: accounts[15] ?? Z,
+            observed_fee_recipient: Z,
             ...createNumericDefaults(),
         };
         return { PumpFunCreateV2: ev };
     }
+    if (discEq(outer, DISC.BUY_V2)) {
+        return parsePumpfunTradeV2Instruction("buy_v2", data, accounts, meta);
+    }
+    if (discEq(outer, DISC.BUY_EXACT_QUOTE_IN_V2)) {
+        return parsePumpfunTradeV2Instruction("buy_exact_quote_in_v2", data, accounts, meta);
+    }
+    if (discEq(outer, DISC.SELL_V2)) {
+        return parsePumpfunTradeV2Instruction("sell_v2", data, accounts, meta);
+    }
     if (discEq(outer, DISC.CREATE)) {
         if (accounts.length < 8)
             return null;

package/dist/instr/pumpswap_ix.d.ts

@@ -2,4 +2,4 @@
  * PumpSwap 指令解析
  */
 import type { DexEvent } from "../core/dex_event.js";
-export declare function parsePumpswapInstruction(instructionData: Uint8Array, accounts: string[], signature: string, slot: number, txIndex: number, blockTimeUs: number | undefined): DexEvent | null;
+export declare function parsePumpswapInstruction(instructionData: Uint8Array, accounts: string[], signature: string, slot: number, txIndex: number, blockTimeUs: number | undefined, grpcRecvUs?: number): DexEvent | null;

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;