sol-parser-sdk-nodejs 0.3.0 → 0.4.4

package/dist/instr/meteora_damm_ix.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseMeteoraDammInstruction = parseMeteoraDammInstruction;
 const dex_event_js_1 = require("../core/dex_event.js");
-const meteora_damm_js_1 = require("../logs/meteora_damm.js");
 const utils_js_1 = require("./utils.js");
 const Z = (0, dex_event_js_1.defaultPubkey)();
 function disc8(a) {
@@ -15,8 +14,28 @@ const CPI = {
     CLOSE_POSITION_LOG: disc8([20, 145, 144, 68, 143, 142, 214, 178]),
     ADD_LIQUIDITY_LOG: disc8([175, 242, 8, 157, 30, 247, 185, 169]),
     REMOVE_LIQUIDITY_LOG: disc8([87, 46, 88, 98, 175, 96, 34, 91]),
-    INITIALIZE_POOL_LOG: disc8([228, 50, 246, 85, 203, 66, 134, 37]),
 };
+/** 与 cp_amm Anchor IDL `instructions[].discriminator` 一致（用户直接调用的外层指令） */
+const ANCHOR = {
+    SWAP: disc8([248, 198, 158, 145, 225, 117, 135, 200]),
+    /** `swap2` — `SwapParameters2`（amount_0, amount_1, swap_mode） */
+    SWAP2: disc8([65, 75, 63, 76, 235, 91, 91, 136]),
+    ADD_LIQUIDITY: disc8([181, 157, 89, 67, 143, 182, 52, 72]),
+    REMOVE_LIQUIDITY: disc8([80, 85, 209, 72, 24, 206, 177, 108]),
+    REMOVE_ALL_LIQUIDITY: disc8([10, 51, 61, 35, 112, 105, 24, 85]),
+    INITIALIZE_POOL: disc8([95, 180, 10, 172, 84, 174, 232, 40]),
+    /** `create_position` / `close_position` 无额外 Borsh 参数，仅 8 字节 disc */
+    CREATE_POSITION: disc8([48, 215, 197, 153, 96, 203, 180, 133]),
+    CLOSE_POSITION: disc8([123, 134, 81, 0, 49, 68, 98, 98]),
+};
+function headEq(data, disc) {
+    if (data.length < 8)
+        return false;
+    for (let i = 0; i < 8; i++)
+        if (data[i] !== disc[i])
+            return false;
+    return true;
+}
 function discEq(h, d) {
     for (let i = 0; i < 8; i++)
         if (h[i] !== d[i])
@@ -33,7 +52,200 @@ function vaults() {
         token_b_program: Z,
     };
 }
-function parseSwapCpi(data, meta) {
+/**
+ * cp_amm 外层 `swap` / `swap2` 账户顺序（见 `idls/meteora_damm_v2.json`）：
+ * 0 pool_authority, 1 pool, 2 input_token_account, 3 output_token_account,
+ * 4 token_a_vault, 5 token_b_vault, 6–7 mints, 8 payer, 9–10 token programs；
+ * 11 起为可选 referral、event_authority、program 等。
+ */
+function meteoraSwapVaultsFromAccounts(accounts) {
+    if (accounts.length < 11) {
+        return vaults();
+    }
+    return {
+        token_a_vault: (0, utils_js_1.getAccount)(accounts, 4) ?? Z,
+        token_b_vault: (0, utils_js_1.getAccount)(accounts, 5) ?? Z,
+        token_a_mint: (0, utils_js_1.getAccount)(accounts, 6) ?? Z,
+        token_b_mint: (0, utils_js_1.getAccount)(accounts, 7) ?? Z,
+        token_a_program: (0, utils_js_1.getAccount)(accounts, 9) ?? Z,
+        token_b_program: (0, utils_js_1.getAccount)(accounts, 10) ?? Z,
+    };
+}
+/**
+ * 外层 `swap`：`SwapParameters` = amount_in (u64) + minimum_amount_out (u64)。
+ * 成交额、手续费、`next_sqrt_price` 等仅在程序 `emit!`（日志 / 内联 CPI 载荷）中；**仅解析外层指令时这些字段保持 0**（与无日志的 ShredStream 一致）。
+ */
+function parseOuterSwapIx(instructionData, accounts, meta) {
+    const amount_in = (0, utils_js_1.readU64LE)(instructionData, 8) ?? 0n;
+    const minimum_amount_out = (0, utils_js_1.readU64LE)(instructionData, 16) ?? 0n;
+    const pool = (0, utils_js_1.getAccount)(accounts, 1) ?? Z;
+    const ev = {
+        metadata: meta,
+        pool,
+        trade_direction: 0,
+        has_referral: false,
+        amount_in,
+        minimum_amount_out,
+        output_amount: 0n,
+        next_sqrt_price: 0n,
+        lp_fee: 0n,
+        protocol_fee: 0n,
+        partner_fee: 0n,
+        referral_fee: 0n,
+        actual_amount_in: amount_in,
+        current_timestamp: 0n,
+        ...meteoraSwapVaultsFromAccounts(accounts),
+    };
+    return { MeteoraDammV2Swap: ev };
+}
+/** 外层 `swap2`：`SwapParameters2` = amount_0 + amount_1 + swap_mode (u8) */
+function parseOuterSwap2Ix(instructionData, accounts, meta) {
+    if (instructionData.length < 25)
+        return null;
+    const amount_0 = (0, utils_js_1.readU64LE)(instructionData, 8) ?? 0n;
+    const amount_1 = (0, utils_js_1.readU64LE)(instructionData, 16) ?? 0n;
+    const swap_mode = (0, utils_js_1.readU8)(instructionData, 24);
+    if (swap_mode === null)
+        return null;
+    const [amount_in, minimum_amount_out] = swap_mode === 0 ? [amount_0, amount_1] : [amount_1, amount_0];
+    const pool = (0, utils_js_1.getAccount)(accounts, 1) ?? Z;
+    const ev = {
+        metadata: meta,
+        pool,
+        trade_direction: 0,
+        has_referral: false,
+        amount_in,
+        minimum_amount_out,
+        output_amount: 0n,
+        next_sqrt_price: 0n,
+        lp_fee: 0n,
+        protocol_fee: 0n,
+        partner_fee: 0n,
+        referral_fee: 0n,
+        actual_amount_in: amount_in,
+        current_timestamp: 0n,
+        ...meteoraSwapVaultsFromAccounts(accounts),
+    };
+    return { MeteoraDammV2Swap: ev };
+}
+/** 外层 `add_liquidity`：`AddLiquidityParameters` = u128 + u64 + u64；pool(0), position(1), owner(9) */
+function parseOuterAddLiquidityIx(instructionData, accounts, meta) {
+    const liquidity_delta = (0, utils_js_1.readU128LE)(instructionData, 8) ?? 0n;
+    const token_a_amount_threshold = (0, utils_js_1.readU64LE)(instructionData, 24) ?? 0n;
+    const token_b_amount_threshold = (0, utils_js_1.readU64LE)(instructionData, 32) ?? 0n;
+    return {
+        MeteoraDammV2AddLiquidity: {
+            metadata: meta,
+            pool: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
+            position: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+            owner: (0, utils_js_1.getAccount)(accounts, 9) ?? Z,
+            liquidity_delta,
+            token_a_amount_threshold,
+            token_b_amount_threshold,
+            token_a_amount: 0n,
+            token_b_amount: 0n,
+            total_amount_a: 0n,
+            total_amount_b: 0n,
+        },
+    };
+}
+/** 外层 `remove_all_liquidity`：两 u64 阈值；账户顺序同 `remove_liquidity` */
+function parseOuterRemoveAllLiquidityIx(instructionData, accounts, meta) {
+    const token_a_amount_threshold = (0, utils_js_1.readU64LE)(instructionData, 8) ?? 0n;
+    const token_b_amount_threshold = (0, utils_js_1.readU64LE)(instructionData, 16) ?? 0n;
+    return {
+        MeteoraDammV2RemoveAllLiquidity: {
+            metadata: meta,
+            pool: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+            position: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
+            owner: (0, utils_js_1.getAccount)(accounts, 10) ?? Z,
+            token_a_amount_threshold,
+            token_b_amount_threshold,
+        },
+    };
+}
+/** 外层 `initialize_pool`：`InitializePoolParameters` = u128 + u128 + Option(u64)；creator(0), pool(6), position(7), mints(8,9) */
+function parseOuterInitializePoolIx(instructionData, accounts, meta) {
+    if (instructionData.length < 41)
+        return null;
+    const liquidity = (0, utils_js_1.readU128LE)(instructionData, 8) ?? 0n;
+    const sqrt_price = (0, utils_js_1.readU128LE)(instructionData, 24) ?? 0n;
+    const tag = (0, utils_js_1.readU8)(instructionData, 40);
+    if (tag === null)
+        return null;
+    let activation_point = null;
+    if (tag === 1) {
+        if (instructionData.length < 49)
+            return null;
+        activation_point = (0, utils_js_1.readU64LE)(instructionData, 41) ?? 0n;
+    }
+    else if (tag !== 0)
+        return null;
+    if (accounts.length < 10)
+        return null;
+    return {
+        MeteoraDammV2InitializePool: {
+            metadata: meta,
+            creator: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
+            position_nft_mint: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+            pool: (0, utils_js_1.getAccount)(accounts, 6) ?? Z,
+            position: (0, utils_js_1.getAccount)(accounts, 7) ?? Z,
+            token_a_mint: (0, utils_js_1.getAccount)(accounts, 8) ?? Z,
+            token_b_mint: (0, utils_js_1.getAccount)(accounts, 9) ?? Z,
+            liquidity,
+            sqrt_price,
+            activation_point,
+        },
+    };
+}
+/** 外层 `remove_liquidity`：同上 Borsh；pool_authority(0), pool(1), position(2), owner(10) */
+function parseOuterRemoveLiquidityIx(instructionData, accounts, meta) {
+    const liquidity_delta = (0, utils_js_1.readU128LE)(instructionData, 8) ?? 0n;
+    const token_a_amount_threshold = (0, utils_js_1.readU64LE)(instructionData, 24) ?? 0n;
+    const token_b_amount_threshold = (0, utils_js_1.readU64LE)(instructionData, 32) ?? 0n;
+    return {
+        MeteoraDammV2RemoveLiquidity: {
+            metadata: meta,
+            pool: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+            position: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
+            owner: (0, utils_js_1.getAccount)(accounts, 10) ?? Z,
+            liquidity_delta,
+            token_a_amount_threshold,
+            token_b_amount_threshold,
+            token_a_amount: 0n,
+            token_b_amount: 0n,
+        },
+    };
+}
+/** 外层 `create_position`：无 args；owner(0), position_nft_mint(1), position_nft_account(2), pool(3), position(4) */
+function parseOuterCreatePositionIx(accounts, meta) {
+    if (accounts.length < 5)
+        return null;
+    return {
+        MeteoraDammV2CreatePosition: {
+            metadata: meta,
+            owner: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
+            position_nft_mint: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+            pool: (0, utils_js_1.getAccount)(accounts, 3) ?? Z,
+            position: (0, utils_js_1.getAccount)(accounts, 4) ?? Z,
+        },
+    };
+}
+/** 外层 `close_position`：无 args；position_nft_mint(0), …, pool(2), position(3), …, owner(6) */
+function parseOuterClosePositionIx(accounts, meta) {
+    if (accounts.length < 7)
+        return null;
+    return {
+        MeteoraDammV2ClosePosition: {
+            metadata: meta,
+            position_nft_mint: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
+            pool: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
+            position: (0, utils_js_1.getAccount)(accounts, 3) ?? Z,
+            owner: (0, utils_js_1.getAccount)(accounts, 6) ?? Z,
+        },
+    };
+}
+function parseSwapCpi(data, accounts, meta) {
     let o = 0;
     const pool = (0, utils_js_1.readPubkeyIx)(data, o);
     if (!pool)
@@ -101,11 +313,11 @@ function parseSwapCpi(data, meta) {
         referral_fee,
         actual_amount_in,
         current_timestamp,
-        ...vaults(),
+        ...meteoraSwapVaultsFromAccounts(accounts),
     };
     return { MeteoraDammV2Swap: ev };
 }
-function parseSwap2Cpi(data, meta) {
+function parseSwap2Cpi(data, accounts, meta) {
     let o = 0;
     const pool = (0, utils_js_1.readPubkeyIx)(data, o);
     if (!pool)
@@ -182,20 +394,46 @@ function parseSwap2Cpi(data, meta) {
         referral_fee,
         actual_amount_in: included_fee_input_amount,
         current_timestamp,
-        ...vaults(),
+        ...meteoraSwapVaultsFromAccounts(accounts),
     };
     return { MeteoraDammV2Swap: ev };
 }
-function parseMeteoraDammInstruction(instructionData, _accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs) {
+function parseMeteoraDammInstruction(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 (instructionData.length >= 24 && headEq(instructionData, ANCHOR.SWAP)) {
+        return parseOuterSwapIx(instructionData, accounts, meta);
+    }
+    if (instructionData.length >= 25 && headEq(instructionData, ANCHOR.SWAP2)) {
+        return parseOuterSwap2Ix(instructionData, accounts, meta);
+    }
+    if (instructionData.length >= 41 && headEq(instructionData, ANCHOR.INITIALIZE_POOL)) {
+        return parseOuterInitializePoolIx(instructionData, accounts, meta);
+    }
+    if (instructionData.length >= 40 && headEq(instructionData, ANCHOR.ADD_LIQUIDITY)) {
+        return parseOuterAddLiquidityIx(instructionData, accounts, meta);
+    }
+    if (instructionData.length >= 40 && headEq(instructionData, ANCHOR.REMOVE_LIQUIDITY)) {
+        return parseOuterRemoveLiquidityIx(instructionData, accounts, meta);
+    }
+    if (instructionData.length >= 24 && headEq(instructionData, ANCHOR.REMOVE_ALL_LIQUIDITY)) {
+        return parseOuterRemoveAllLiquidityIx(instructionData, accounts, meta);
+    }
+    if (instructionData.length >= 8 && headEq(instructionData, ANCHOR.CREATE_POSITION)) {
+        return parseOuterCreatePositionIx(accounts, meta);
+    }
+    if (instructionData.length >= 8 && headEq(instructionData, ANCHOR.CLOSE_POSITION)) {
+        return parseOuterClosePositionIx(accounts, meta);
+    }
     if (instructionData.length < 16)
         return null;
     const cpiHead = instructionData.subarray(8, 16);
     const cpiData = instructionData.subarray(16);
-    const meta = (0, utils_js_1.ixMeta)(signature, slot, txIndex, blockTimeUs, grpcRecvUs);
     if (discEq(cpiHead, CPI.SWAP_LOG))
-        return parseSwapCpi(cpiData, meta);
+        return parseSwapCpi(cpiData, accounts, meta);
     if (discEq(cpiHead, CPI.SWAP2_LOG))
-        return parseSwap2Cpi(cpiData, meta);
+        return parseSwap2Cpi(cpiData, accounts, meta);
     if (discEq(cpiHead, CPI.CREATE_POSITION_LOG)) {
         let o = 0;
         const pool = (0, utils_js_1.readPubkeyIx)(cpiData, o);
@@ -342,8 +580,5 @@ function parseMeteoraDammInstruction(instructionData, _accounts, signature, slot
             },
         };
     }
-    if (discEq(cpiHead, CPI.INITIALIZE_POOL_LOG)) {
-        return (0, meteora_damm_js_1.parseInitializePoolEvent)(cpiData, meta);
-    }
     return null;
 }

package/dist/instr/mod.d.ts

@@ -11,5 +11,6 @@ export { parseRaydiumCpmmInstruction } from "./raydium_cpmm_ix.js";
 export { parseRaydiumAmmV4Instruction } from "./raydium_amm_v4_ix.js";
 export { parseOrcaWhirlpoolInstruction } from "./orca_whirlpool_ix.js";
 export { parseBonkInstruction } from "./bonk_ix.js";
+export { parsePumpFeesInstruction } from "./pump_fees_ix.js";
 export * from "./program_ids.js";
 export declare function parseInstructionUnified(instructionData: Uint8Array, accounts: string[], signature: string, slot: number, txIndex: number, blockTimeUs: number | undefined, grpcRecvUs: number, eventTypeFilter: EventTypeFilter | undefined, programId: string): DexEvent | null;

package/dist/instr/mod.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseBonkInstruction = exports.parseOrcaWhirlpoolInstruction = exports.parseRaydiumAmmV4Instruction = exports.parseRaydiumCpmmInstruction = exports.parseRaydiumClmmInstruction = exports.parseMeteoraDammInstruction = exports.parsePumpswapInstruction = exports.parsePumpfunInstruction = void 0;
+exports.parsePumpFeesInstruction = exports.parseBonkInstruction = exports.parseOrcaWhirlpoolInstruction = exports.parseRaydiumAmmV4Instruction = exports.parseRaydiumCpmmInstruction = exports.parseRaydiumClmmInstruction = exports.parseMeteoraDammInstruction = exports.parsePumpswapInstruction = exports.parsePumpfunInstruction = void 0;
 exports.parseInstructionUnified = parseInstructionUnified;
 const types_js_1 = require("../grpc/types.js");
 const program_ids_js_1 = require("./program_ids.js");
@@ -26,6 +26,12 @@ const raydium_cpmm_ix_js_1 = require("./raydium_cpmm_ix.js");
 const raydium_amm_v4_ix_js_1 = require("./raydium_amm_v4_ix.js");
 const orca_whirlpool_ix_js_1 = require("./orca_whirlpool_ix.js");
 const bonk_ix_js_1 = require("./bonk_ix.js");
+const pump_fees_ix_js_1 = require("./pump_fees_ix.js");
+function isBonkProgram(programId) {
+    return (programId === program_ids_js_1.BONK_PROGRAM_ID ||
+        programId === program_ids_js_1.BONK_LAUNCHPAD_PROGRAM_ID ||
+        programId === program_ids_js_1.BONK_PROGRAM_ID_LEGACY);
+}
 var pumpfun_ix_js_2 = require("./pumpfun_ix.js");
 Object.defineProperty(exports, "parsePumpfunInstruction", { enumerable: true, get: function () { return pumpfun_ix_js_2.parsePumpfunInstruction; } });
 var pumpswap_ix_js_2 = require("./pumpswap_ix.js");
@@ -42,6 +48,8 @@ var orca_whirlpool_ix_js_2 = require("./orca_whirlpool_ix.js");
 Object.defineProperty(exports, "parseOrcaWhirlpoolInstruction", { enumerable: true, get: function () { return orca_whirlpool_ix_js_2.parseOrcaWhirlpoolInstruction; } });
 var bonk_ix_js_2 = require("./bonk_ix.js");
 Object.defineProperty(exports, "parseBonkInstruction", { enumerable: true, get: function () { return bonk_ix_js_2.parseBonkInstruction; } });
+var pump_fees_ix_js_2 = require("./pump_fees_ix.js");
+Object.defineProperty(exports, "parsePumpFeesInstruction", { enumerable: true, get: function () { return pump_fees_ix_js_2.parsePumpFeesInstruction; } });
 __exportStar(require("./program_ids.js"), exports);
 function parseInstructionUnified(instructionData, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs, eventTypeFilter, programId) {
     if (instructionData.length === 0)
@@ -59,13 +67,18 @@ function parseInstructionUnified(instructionData, accounts, signature, slot, txI
     if (programId === program_ids_js_1.PUMPSWAP_PROGRAM_ID) {
         if (eventTypeFilter && !(0, types_js_1.eventTypeFilterIncludesPumpswap)(eventTypeFilter))
             return null;
-        return (0, pumpswap_ix_js_1.parsePumpswapInstruction)(instructionData, accounts, signature, slot, txIndex, blockTimeUs);
+        return (0, pumpswap_ix_js_1.parsePumpswapInstruction)(instructionData, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs);
     }
     if (programId === program_ids_js_1.METEORA_DAMM_V2_PROGRAM_ID) {
         if (eventTypeFilter && !(0, types_js_1.eventTypeFilterIncludesMeteoraDammV2)(eventTypeFilter))
             return null;
         return (0, meteora_damm_ix_js_1.parseMeteoraDammInstruction)(instructionData, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs);
     }
+    if (programId === program_ids_js_1.PUMP_FEES_PROGRAM_ID) {
+        if (eventTypeFilter && !(0, types_js_1.eventTypeFilterIncludesPumpFees)(eventTypeFilter))
+            return null;
+        return (0, pump_fees_ix_js_1.parsePumpFeesInstruction)(instructionData, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs);
+    }
     if (programId === program_ids_js_1.RAYDIUM_CLMM_PROGRAM_ID) {
         if (eventTypeFilter && !(0, types_js_1.eventTypeFilterIncludesRaydiumClmm)(eventTypeFilter))
             return null;
@@ -86,7 +99,7 @@ function parseInstructionUnified(instructionData, accounts, signature, slot, txI
             return null;
         return (0, orca_whirlpool_ix_js_1.parseOrcaWhirlpoolInstruction)(instructionData, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs);
     }
-    if (programId === program_ids_js_1.BONK_LAUNCHPAD_PROGRAM_ID) {
+    if (isBonkProgram(programId)) {
         if (eventTypeFilter && !(0, types_js_1.eventTypeFilterIncludesBonk)(eventTypeFilter))
             return null;
         return (0, bonk_ix_js_1.parseBonkInstruction)(instructionData, accounts, signature, slot, txIndex, blockTimeUs, grpcRecvUs);

package/dist/instr/orca_whirlpool_ix.d.ts

@@ -1,5 +1,8 @@
 /**
- * Orca Whirlpool 指令解析
+ * Orca Whirlpool 指令解析（Anchor swap / 增减流动性）
+ *
+ * 注意：链上指令 discriminator 与 `emit!` 的 Program data 日志 discriminator 不同；
+ * Whirlpool 的 `swap` / `increase_liquidity_v2` / `decrease_liquidity` 与 Raydium CLMM 同源，复用同一组 Anchor 前 8 字节。
  */
 import type { DexEvent } from "../core/dex_event.js";
 export declare function parseOrcaWhirlpoolInstruction(instructionData: Uint8Array, accounts: string[], signature: string, slot: number, txIndex: number, blockTimeUs: number | undefined, grpcRecvUs: number): DexEvent | null;

package/dist/instr/orca_whirlpool_ix.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseOrcaWhirlpoolInstruction = parseOrcaWhirlpoolInstruction;
 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: 10853759504616839521n, // disc8(225, 202, 73, 175, 147, 43, 160, 150)
-    INCREASE_LIQUIDITY: 11605574446925869086n, // disc8(30, 7, 144, 181, 102, 254, 155, 161)
-    DECREASE_LIQUIDITY: 12404363784710077478n, // disc8(166, 1, 36, 71, 112, 202, 181, 171)
+    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,
 };
 function discEq(data, disc) {
     if (data.length < 8)
@@ -16,20 +16,37 @@ function discEq(data, disc) {
     const v = (0, utils_js_1.readU64LE)(data, 0);
     return v === disc;
 }
+const SWAP_ACC = {
+    WHIRLPOOL: 2,
+    SENDER: 1,
+    TOKEN_A_USER: 3,
+    TOKEN_B_USER: 5,
+};
 function parseOrcaWhirlpoolInstruction(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)) {
+        if (instructionData.length < 42)
+            return null;
+        const amount = (0, utils_js_1.readU64LE)(instructionData, 8) ?? 0n;
+        const other_threshold = (0, utils_js_1.readU64LE)(instructionData, 16) ?? 0n;
+        const sqrt_price_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;
+        const input_amount = amount_specified_is_input ? amount : other_threshold;
+        const output_amount = amount_specified_is_input ? other_threshold : amount;
         return {
             OrcaWhirlpoolSwap: {
                 metadata: meta,
-                whirlpool: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
-                a_to_b: true,
+                whirlpool: (0, utils_js_1.getAccount)(accounts, SWAP_ACC.WHIRLPOOL) ?? Z,
+                a_to_b,
                 pre_sqrt_price: 0n,
                 post_sqrt_price: 0n,
-                input_amount: 0n,
-                output_amount: 0n,
+                input_amount,
+                output_amount,
                 input_transfer_fee: 0n,
                 output_transfer_fee: 0n,
                 lp_fee: 0n,
@@ -38,32 +55,44 @@ function parseOrcaWhirlpoolInstruction(instructionData, accounts, signature, slo
         };
     }
     if (discEq(instructionData, DISC.INCREASE_LIQUIDITY)) {
+        // increase_liquidity_v2：liquidity_amount (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 token_max_a = (0, utils_js_1.readU64LE)(instructionData, 24) ?? 0n;
+        const token_max_b = (0, utils_js_1.readU64LE)(instructionData, 32) ?? 0n;
         return {
             OrcaWhirlpoolLiquidityIncreased: {
                 metadata: meta,
-                whirlpool: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+                whirlpool: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
                 position: (0, utils_js_1.getAccount)(accounts, 3) ?? Z,
                 tick_lower_index: 0,
                 tick_upper_index: 0,
-                liquidity: 0n,
-                token_a_amount: 0n,
-                token_b_amount: 0n,
+                liquidity,
+                token_a_amount: token_max_a,
+                token_b_amount: token_max_b,
                 token_a_transfer_fee: 0n,
                 token_b_transfer_fee: 0n,
             },
         };
     }
     if (discEq(instructionData, DISC.DECREASE_LIQUIDITY)) {
+        // decrease_liquidity：liquidity_amount (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 token_min_a = (0, utils_js_1.readU64LE)(instructionData, 24) ?? 0n;
+        const token_min_b = (0, utils_js_1.readU64LE)(instructionData, 32) ?? 0n;
         return {
             OrcaWhirlpoolLiquidityDecreased: {
                 metadata: meta,
-                whirlpool: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+                whirlpool: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
                 position: (0, utils_js_1.getAccount)(accounts, 3) ?? Z,
                 tick_lower_index: 0,
                 tick_upper_index: 0,
-                liquidity: 0n,
-                token_a_amount: 0n,
-                token_b_amount: 0n,
+                liquidity,
+                token_a_amount: token_min_a,
+                token_b_amount: token_min_b,
                 token_a_transfer_fee: 0n,
                 token_b_transfer_fee: 0n,
             },

package/dist/instr/program_ids.d.ts

@@ -1,14 +1,8 @@
-/** 各 DEX 程序 ID（Base58） */
-export declare const PUMPFUN_PROGRAM_ID = "6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P";
-/** Pump AMM（PumpSwap），与 `sol-parser-sdk` / `pump_amm.json` 一致 */
-export declare const PUMPSWAP_PROGRAM_ID = "pAMMBay6oceH9fJKBRHGP5D4bD4sWpmSwMn52FMfXEA";
-export declare const METEORA_DAMM_V2_PROGRAM_ID = "cpamdpZCGKUy5JxQXB2MWgCm3hcnGjEJbYTJgfm4E8a";
-export declare const RAYDIUM_CLMM_PROGRAM_ID = "CAMMCzo5YL8w4VFF8KVHrK22GGUsp5VTaW7grrKgrWqK";
-export declare const RAYDIUM_CPMM_PROGRAM_ID = "CPMMoo8L3F4NbTegBCKVNunggL7H1ZpdTHKxQB5qKP1C";
-export declare const RAYDIUM_AMM_V4_PROGRAM_ID = "675kPX9MHTjS2zt1qfr1NYHuzeLXfQM9H24wFSUt1Mp8";
-export declare const ORCA_WHIRLPOOL_PROGRAM_ID = "whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc";
+/**
+ * 各 DEX 程序 ID（Base58）。与 Rust 对齐的常量来自 `grpc/program_ids.ts`。
+ */
+export { PUMPFUN_PROGRAM_ID, PUMPSWAP_PROGRAM_ID, PUMPSWAP_FEES_PROGRAM_ID, PUMP_FEES_PROGRAM_ID, BONK_PROGRAM_ID, RAYDIUM_CPMM_PROGRAM_ID, RAYDIUM_CLMM_PROGRAM_ID, RAYDIUM_AMM_V4_PROGRAM_ID, ORCA_WHIRLPOOL_PROGRAM_ID, METEORA_POOLS_PROGRAM_ID, METEORA_DAMM_V2_PROGRAM_ID, METEORA_DLMM_PROGRAM_ID, } from "../grpc/program_ids.js";
+/** Launchpad 等场景使用的程序 ID（非 Rust `Protocol` 映射项） */
 export declare const BONK_LAUNCHPAD_PROGRAM_ID = "LanCh3hDdY7M6x8urBSLJhsQBgPNGKHNqJqGwzAEmBm";
-export declare const BONK_PROGRAM_ID = "DjVE6JNiYqPL2QXyCUUh8rNjHrbz9hXHNYt99MQ59qw1";
-export declare const PUMPSWAP_FEES_PROGRAM_ID = "pfeeUxB6jkeY1Hxd7CsFCAjcbHA9rWtchMGdZ6VojVZ";
-export declare const METEORA_POOLS_PROGRAM_ID = "Eo7WjKq67rjJQSZxS6z3YkapzY3eMj6Xy8X5EQVn5UaB";
-export declare const METEORA_DLMM_PROGRAM_ID = "LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo";
+/** 旧版 TS 包中的 Bonk ID，仅作兼容保留 */
+export declare const BONK_PROGRAM_ID_LEGACY = "DjVE6JNiYqPL2QXyCUUh8rNjHrbz9hXHNYt99MQ59qw1";

package/dist/instr/program_ids.js

@@ -1,18 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.METEORA_DLMM_PROGRAM_ID = exports.METEORA_POOLS_PROGRAM_ID = exports.PUMPSWAP_FEES_PROGRAM_ID = exports.BONK_PROGRAM_ID = exports.BONK_LAUNCHPAD_PROGRAM_ID = exports.ORCA_WHIRLPOOL_PROGRAM_ID = exports.RAYDIUM_AMM_V4_PROGRAM_ID = exports.RAYDIUM_CPMM_PROGRAM_ID = exports.RAYDIUM_CLMM_PROGRAM_ID = exports.METEORA_DAMM_V2_PROGRAM_ID = exports.PUMPSWAP_PROGRAM_ID = exports.PUMPFUN_PROGRAM_ID = void 0;
-/** 各 DEX 程序 ID（Base58） */
-exports.PUMPFUN_PROGRAM_ID = "6EF8rrecthR5Dkzon8Nwu78hRvfCKubJ14M5uBEwF6P";
-/** Pump AMM（PumpSwap），与 `sol-parser-sdk` / `pump_amm.json` 一致 */
-exports.PUMPSWAP_PROGRAM_ID = "pAMMBay6oceH9fJKBRHGP5D4bD4sWpmSwMn52FMfXEA";
-exports.METEORA_DAMM_V2_PROGRAM_ID = "cpamdpZCGKUy5JxQXB2MWgCm3hcnGjEJbYTJgfm4E8a";
-exports.RAYDIUM_CLMM_PROGRAM_ID = "CAMMCzo5YL8w4VFF8KVHrK22GGUsp5VTaW7grrKgrWqK";
-exports.RAYDIUM_CPMM_PROGRAM_ID = "CPMMoo8L3F4NbTegBCKVNunggL7H1ZpdTHKxQB5qKP1C";
-exports.RAYDIUM_AMM_V4_PROGRAM_ID = "675kPX9MHTjS2zt1qfr1NYHuzeLXfQM9H24wFSUt1Mp8";
-exports.ORCA_WHIRLPOOL_PROGRAM_ID = "whirLbMiicVdio4qvUfM5KAg6Ct8VwpYzGff3uctyCc";
+exports.BONK_PROGRAM_ID_LEGACY = exports.BONK_LAUNCHPAD_PROGRAM_ID = exports.METEORA_DLMM_PROGRAM_ID = exports.METEORA_DAMM_V2_PROGRAM_ID = exports.METEORA_POOLS_PROGRAM_ID = exports.ORCA_WHIRLPOOL_PROGRAM_ID = exports.RAYDIUM_AMM_V4_PROGRAM_ID = exports.RAYDIUM_CLMM_PROGRAM_ID = exports.RAYDIUM_CPMM_PROGRAM_ID = exports.BONK_PROGRAM_ID = exports.PUMP_FEES_PROGRAM_ID = exports.PUMPSWAP_FEES_PROGRAM_ID = exports.PUMPSWAP_PROGRAM_ID = exports.PUMPFUN_PROGRAM_ID = void 0;
+/**
+ * 各 DEX 程序 ID（Base58）。与 Rust 对齐的常量来自 `grpc/program_ids.ts`。
+ */
+var program_ids_js_1 = require("../grpc/program_ids.js");
+Object.defineProperty(exports, "PUMPFUN_PROGRAM_ID", { enumerable: true, get: function () { return program_ids_js_1.PUMPFUN_PROGRAM_ID; } });
+Object.defineProperty(exports, "PUMPSWAP_PROGRAM_ID", { enumerable: true, get: function () { return program_ids_js_1.PUMPSWAP_PROGRAM_ID; } });
+Object.defineProperty(exports, "PUMPSWAP_FEES_PROGRAM_ID", { enumerable: true, get: function () { return program_ids_js_1.PUMPSWAP_FEES_PROGRAM_ID; } });
+Object.defineProperty(exports, "PUMP_FEES_PROGRAM_ID", { enumerable: true, get: function () { return program_ids_js_1.PUMP_FEES_PROGRAM_ID; } });
+Object.defineProperty(exports, "BONK_PROGRAM_ID", { enumerable: true, get: function () { return program_ids_js_1.BONK_PROGRAM_ID; } });
+Object.defineProperty(exports, "RAYDIUM_CPMM_PROGRAM_ID", { enumerable: true, get: function () { return program_ids_js_1.RAYDIUM_CPMM_PROGRAM_ID; } });
+Object.defineProperty(exports, "RAYDIUM_CLMM_PROGRAM_ID", { enumerable: true, get: function () { return program_ids_js_1.RAYDIUM_CLMM_PROGRAM_ID; } });
+Object.defineProperty(exports, "RAYDIUM_AMM_V4_PROGRAM_ID", { enumerable: true, get: function () { return program_ids_js_1.RAYDIUM_AMM_V4_PROGRAM_ID; } });
+Object.defineProperty(exports, "ORCA_WHIRLPOOL_PROGRAM_ID", { enumerable: true, get: function () { return program_ids_js_1.ORCA_WHIRLPOOL_PROGRAM_ID; } });
+Object.defineProperty(exports, "METEORA_POOLS_PROGRAM_ID", { enumerable: true, get: function () { return program_ids_js_1.METEORA_POOLS_PROGRAM_ID; } });
+Object.defineProperty(exports, "METEORA_DAMM_V2_PROGRAM_ID", { enumerable: true, get: function () { return program_ids_js_1.METEORA_DAMM_V2_PROGRAM_ID; } });
+Object.defineProperty(exports, "METEORA_DLMM_PROGRAM_ID", { enumerable: true, get: function () { return program_ids_js_1.METEORA_DLMM_PROGRAM_ID; } });
+/** Launchpad 等场景使用的程序 ID（非 Rust `Protocol` 映射项） */
 exports.BONK_LAUNCHPAD_PROGRAM_ID = "LanCh3hDdY7M6x8urBSLJhsQBgPNGKHNqJqGwzAEmBm";
-// Legacy/alternative program IDs (kept for compatibility)
-exports.BONK_PROGRAM_ID = "DjVE6JNiYqPL2QXyCUUh8rNjHrbz9hXHNYt99MQ59qw1";
-exports.PUMPSWAP_FEES_PROGRAM_ID = "pfeeUxB6jkeY1Hxd7CsFCAjcbHA9rWtchMGdZ6VojVZ";
-exports.METEORA_POOLS_PROGRAM_ID = "Eo7WjKq67rjJQSZxS6z3YkapzY3eMj6Xy8X5EQVn5UaB";
-exports.METEORA_DLMM_PROGRAM_ID = "LBUZKhRxPF3XUpBCjp4YzTKgLccjZhTSDM9YuVaPwxo";
+/** 旧版 TS 包中的 Bonk ID，仅作兼容保留 */
+exports.BONK_PROGRAM_ID_LEGACY = "DjVE6JNiYqPL2QXyCUUh8rNjHrbz9hXHNYt99MQ59qw1";

package/dist/instr/pump_fees_ix.d.ts

@@ -0,0 +1,2 @@
+import type { DexEvent } from "../core/dex_event.js";
+export declare function parsePumpFeesInstruction(instructionData: Uint8Array, accounts: string[], signature: string, slot: number, txIndex: number, blockTimeUs: number | undefined, grpcRecvUs: number): DexEvent | null;