sol-parser-sdk 0.5.17 → 0.5.19

package/dist/instr/pumpswap_ix.js

@@ -120,6 +120,81 @@ function parsePumpswapInstruction(instructionData, accounts, signature, slot, tx
     const head = instructionData.subarray(0, 8);
     const data = instructionData.subarray(8);
     const meta = (0, utils_js_1.ixMeta)(signature, slot, txIndex, blockTimeUs, grpcRecvUs);
+    if (discEq(head, Uint8Array.from([184, 23, 238, 97, 103, 197, 211, 61]))) {
+        if (accounts.length !== 17 || data.length !== 16)
+            return null;
+        const mapped = Array(26).fill(Z);
+        mapped[0] = accounts[0];
+        mapped[1] = accounts[1];
+        mapped[2] = accounts[2];
+        mapped[3] = accounts[3];
+        mapped[4] = accounts[4];
+        mapped[5] = accounts[5];
+        mapped[6] = accounts[6];
+        mapped[7] = accounts[7];
+        mapped[8] = accounts[8];
+        mapped[11] = accounts[9];
+        mapped[12] = accounts[10];
+        mapped[13] = accounts[11];
+        mapped[15] = accounts[15];
+        mapped[16] = accounts[16];
+        mapped[20] = accounts[12];
+        mapped[21] = accounts[13];
+        mapped[25] = accounts[14];
+        const legacy = new Uint8Array(instructionData);
+        legacy.set(PS.BUY, 0);
+        return parsePumpswapInstruction(legacy, mapped, signature, slot, txIndex, blockTimeUs, grpcRecvUs);
+    }
+    if (discEq(head, Uint8Array.from([194, 171, 28, 70, 104, 77, 91, 47]))) {
+        if (accounts.length !== 17 || data.length !== 16)
+            return null;
+        const mapped = Array(26).fill(Z);
+        mapped[0] = accounts[0];
+        mapped[1] = accounts[1];
+        mapped[2] = accounts[2];
+        mapped[3] = accounts[3];
+        mapped[4] = accounts[4];
+        mapped[5] = accounts[5];
+        mapped[6] = accounts[6];
+        mapped[7] = accounts[7];
+        mapped[8] = accounts[8];
+        mapped[11] = accounts[9];
+        mapped[12] = accounts[10];
+        mapped[13] = accounts[11];
+        mapped[15] = accounts[15];
+        mapped[16] = accounts[16];
+        mapped[20] = accounts[12];
+        mapped[21] = accounts[13];
+        mapped[25] = accounts[14];
+        const legacy = new Uint8Array(instructionData);
+        legacy.set(PS.BUY_EXACT_QUOTE_IN, 0);
+        return parsePumpswapInstruction(legacy, mapped, signature, slot, txIndex, blockTimeUs, grpcRecvUs);
+    }
+    if (discEq(head, Uint8Array.from([93, 246, 130, 60, 231, 233, 64, 178]))) {
+        if (accounts.length !== 17 || data.length !== 16)
+            return null;
+        const mapped = Array(26).fill(Z);
+        mapped[0] = accounts[0];
+        mapped[1] = accounts[1];
+        mapped[2] = accounts[2];
+        mapped[3] = accounts[3];
+        mapped[4] = accounts[4];
+        mapped[5] = accounts[5];
+        mapped[6] = accounts[6];
+        mapped[7] = accounts[7];
+        mapped[8] = accounts[8];
+        mapped[11] = accounts[9];
+        mapped[12] = accounts[10];
+        mapped[13] = accounts[11];
+        mapped[15] = accounts[15];
+        mapped[16] = accounts[16];
+        mapped[20] = accounts[12];
+        mapped[21] = accounts[13];
+        mapped[25] = accounts[14];
+        const legacy = new Uint8Array(instructionData);
+        legacy.set(PS.SELL, 0);
+        return parsePumpswapInstruction(legacy, mapped, signature, slot, txIndex, blockTimeUs, grpcRecvUs);
+    }
     if (discEq(head, PS.BUY)) {
         if (accounts.length < 13)
             return null;
@@ -219,7 +294,7 @@ function parsePumpswapInstruction(instructionData, accounts, signature, slot, tx
         return { PumpSwapCreatePool: ev };
     }
     if (discEq(head, PS.DEPOSIT)) {
-        if (accounts.length < 8)
+        if (accounts.length < 15 || data.length < 24)
             return null;
         const g = (i) => (0, utils_js_1.getAccount)(accounts, i) ?? Z;
         let lp_out = 0n;
@@ -244,15 +319,15 @@ function parsePumpswapInstruction(instructionData, accounts, signature, slot, tx
             quote_amount_in: 0n,
             lp_mint_supply: 0n,
             pool: g(0),
-            user: g(1),
-            user_base_token_account: g(4),
-            user_quote_token_account: g(5),
-            user_pool_token_account: g(6),
+            user: g(2),
+            user_base_token_account: g(6),
+            user_quote_token_account: g(7),
+            user_pool_token_account: g(8),
         };
         return { PumpSwapLiquidityAdded: ev };
     }
     if (discEq(head, PS.WITHDRAW)) {
-        if (accounts.length < 8)
+        if (accounts.length < 15 || data.length < 24)
             return null;
         const g = (i) => (0, utils_js_1.getAccount)(accounts, i) ?? Z;
         let lp_in = 0n;
@@ -277,10 +352,10 @@ function parsePumpswapInstruction(instructionData, accounts, signature, slot, tx
             quote_amount_out: 0n,
             lp_mint_supply: 0n,
             pool: g(0),
-            user: g(1),
-            user_base_token_account: g(4),
-            user_quote_token_account: g(5),
-            user_pool_token_account: g(6),
+            user: g(2),
+            user_base_token_account: g(6),
+            user_quote_token_account: g(7),
+            user_pool_token_account: g(8),
         };
         return { PumpSwapLiquidityRemoved: ev };
     }

package/dist/instr/raydium_clmm_ix.js

@@ -63,7 +63,8 @@ function parseRaydiumClmmInstruction(instructionData, accounts, signature, slot,
             RaydiumClmmIncreaseLiquidity: {
                 metadata: meta,
                 pool: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
-                position_nft_mint: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+                position_nft_mint: Z, // Account 1 is the NFT token account.
+                personal_position: (0, utils_js_1.getAccount)(accounts, 4) ?? Z,
                 user: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
                 liquidity,
                 amount_0: 0n,
@@ -85,7 +86,8 @@ function parseRaydiumClmmInstruction(instructionData, accounts, signature, slot,
             RaydiumClmmDecreaseLiquidity: {
                 metadata: meta,
                 pool: (0, utils_js_1.getAccount)(accounts, 3) ?? Z,
-                position_nft_mint: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+                position_nft_mint: Z, // Account 1 is the NFT token account.
+                personal_position: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
                 user: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
                 liquidity,
                 decrease_amount_0: 0n,
@@ -123,7 +125,7 @@ function parseRaydiumClmmInstruction(instructionData, accounts, signature, slot,
         };
     }
     if (discEq(instructionData, DISC.CREATE_CUSTOMIZABLE_POOL)) {
-        if (instructionData.length < 8 + 16)
+        if (instructionData.length !== 26 || accounts.length < 13 || instructionData[24] > 2 || instructionData[25] > 1)
             return null;
         const sqrt_price_x64 = (0, binary_js_1.readU128LE)(instructionData, 8) ?? 0n;
         return {

package/dist/instr/raydium_cpmm_ix.js

@@ -8,6 +8,7 @@ const Z = (0, dex_event_js_1.defaultPubkey)();
 const DISC = {
     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,
+    INITIALIZE_PERMISSION: (0, program_log_discriminators_js_1.u64leDiscriminator)([63, 55, 254, 65, 49, 178, 89, 121]),
     INITIALIZE: (0, program_log_discriminators_js_1.u64leDiscriminator)([175, 175, 109, 31, 13, 152, 155, 237]),
     DEPOSIT: program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_DEPOSIT,
     WITHDRAW: program_log_discriminators_js_1.PROGRAM_LOG_DISC.RAYDIUM_CPMM_WITHDRAW,
@@ -56,21 +57,23 @@ function parseRaydiumCpmmInstruction(instructionData, accounts, signature, slot,
             },
         };
     }
-    if (discEq(instructionData, DISC.INITIALIZE)) {
-        if (instructionData.length < 8 + 8 + 8 + 8)
+    if (discEq(instructionData, DISC.INITIALIZE) || discEq(instructionData, DISC.INITIALIZE_PERMISSION)) {
+        const permission = discEq(instructionData, DISC.INITIALIZE_PERMISSION);
+        if (instructionData.length < (permission ? 33 : 32) || accounts.length < (permission ? 21 : 20))
             return null;
         const init_amount0 = (0, utils_js_1.readU64LE)(instructionData, 8) ?? 0n;
         const init_amount1 = (0, utils_js_1.readU64LE)(instructionData, 16) ?? 0n;
         return {
             RaydiumCpmmInitialize: {
                 metadata: meta,
-                pool: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
-                creator: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+                pool: (0, utils_js_1.getAccount)(accounts, permission ? 4 : 3) ?? Z,
+                creator: (0, utils_js_1.getAccount)(accounts, permission ? 1 : 0) ?? Z,
                 init_amount0,
                 init_amount1,
             },
         };
     }
+    // Instruction token amounts are deposit maxima / withdrawal minima, not executed fills.
     if (discEq(instructionData, DISC.DEPOSIT)) {
         if (instructionData.length < 8 + 8 + 8 + 8)
             return null;
@@ -80,8 +83,8 @@ function parseRaydiumCpmmInstruction(instructionData, accounts, signature, slot,
         return {
             RaydiumCpmmDeposit: {
                 metadata: meta,
-                pool: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
-                user: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+                pool: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
+                user: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
                 lp_token_amount,
                 token0_amount,
                 token1_amount,
@@ -97,8 +100,8 @@ function parseRaydiumCpmmInstruction(instructionData, accounts, signature, slot,
         return {
             RaydiumCpmmWithdraw: {
                 metadata: meta,
-                pool: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
-                user: (0, utils_js_1.getAccount)(accounts, 1) ?? Z,
+                pool: (0, utils_js_1.getAccount)(accounts, 2) ?? Z,
+                user: (0, utils_js_1.getAccount)(accounts, 0) ?? Z,
                 lp_token_amount,
                 token0_amount,
                 token1_amount,

package/dist/logs/meteora_damm.d.ts

@@ -13,9 +13,16 @@ export declare function parseRemoveLiquidityFromData(data: Uint8Array, meta: Eve
 export declare function parseLiquidityChangeFromData(data: Uint8Array, meta: EventMetadata): DexEvent | null;
 export declare function parseUpdateDelegatePermissionFromData(data: Uint8Array, meta: EventMetadata): DexEvent | null;
 export declare function parseWithdrawDeadLiquidityRewardFromData(data: Uint8Array, meta: EventMetadata): DexEvent | null;
+export declare function parseWithdrawIneligibleRewardFromData(data: Uint8Array, meta: EventMetadata): DexEvent | null;
+export declare function parseUpdateRewardFunderFromData(data: Uint8Array, meta: EventMetadata): DexEvent | null;
+export declare function parseUpdateRewardDurationFromData(data: Uint8Array, meta: EventMetadata): DexEvent | null;
+export declare function parseInitializeRewardFromData(data: Uint8Array, meta: EventMetadata): DexEvent | null;
+export declare function parseFundRewardFromData(data: Uint8Array, meta: EventMetadata): DexEvent | null;
 export declare function parseCreateConfigFromData(data: Uint8Array, meta: EventMetadata): DexEvent | null;
 export declare function parseCreateDynamicConfigFromData(data: Uint8Array, meta: EventMetadata): DexEvent | null;
 /**
  * Meteora DAMM Program data 入口；与 Rust `logs/meteora_damm.rs` 一致。
  */
 export declare function parseMeteoraDammLog(log: string, signature: string, slot: number | bigint | string, txIndex: number | bigint | string, blockTimeUs: number | bigint | string | undefined, grpcRecvUs: number | bigint | string): DexEvent | null;
+export declare function parseClaimPositionFee(data: Uint8Array, meta: EventMetadata): DexEvent | null;
+export declare function parseClaimReward(data: Uint8Array, meta: EventMetadata): DexEvent | null;

package/dist/logs/meteora_damm.js

@@ -7,9 +7,16 @@ exports.parseRemoveLiquidityFromData = parseRemoveLiquidityFromData;
 exports.parseLiquidityChangeFromData = parseLiquidityChangeFromData;
 exports.parseUpdateDelegatePermissionFromData = parseUpdateDelegatePermissionFromData;
 exports.parseWithdrawDeadLiquidityRewardFromData = parseWithdrawDeadLiquidityRewardFromData;
+exports.parseWithdrawIneligibleRewardFromData = parseWithdrawIneligibleRewardFromData;
+exports.parseUpdateRewardFunderFromData = parseUpdateRewardFunderFromData;
+exports.parseUpdateRewardDurationFromData = parseUpdateRewardDurationFromData;
+exports.parseInitializeRewardFromData = parseInitializeRewardFromData;
+exports.parseFundRewardFromData = parseFundRewardFromData;
 exports.parseCreateConfigFromData = parseCreateConfigFromData;
 exports.parseCreateDynamicConfigFromData = parseCreateDynamicConfigFromData;
 exports.parseMeteoraDammLog = parseMeteoraDammLog;
+exports.parseClaimPositionFee = parseClaimPositionFee;
+exports.parseClaimReward = parseClaimReward;
 const metadata_js_1 = require("../core/metadata.js");
 const metadata_js_2 = require("../core/metadata.js");
 const dex_event_js_1 = require("../core/dex_event.js");
@@ -28,9 +35,16 @@ const REMOVE_LIQUIDITY = discOf([87, 46, 88, 98, 175, 96, 34, 91]);
 const LIQUIDITY_CHANGE = discOf([197, 171, 78, 127, 224, 211, 87, 13]);
 const INITIALIZE_POOL = discOf([228, 50, 246, 85, 203, 66, 134, 37]);
 const CREATE_POSITION = discOf([156, 15, 119, 198, 29, 181, 221, 55]);
+const CLAIM_POSITION_FEE = discOf([198, 182, 183, 52, 97, 12, 49, 56]);
+const CLAIM_REWARD = discOf([218, 86, 147, 200, 235, 188, 215, 231]);
 const CLOSE_POSITION = discOf([20, 145, 144, 68, 143, 142, 214, 178]);
 const UPDATE_DELEGATE_PERMISSION = discOf([66, 188, 75, 151, 150, 232, 87, 93]);
 const WITHDRAW_DEAD_LIQUIDITY_REWARD = discOf([228, 66, 150, 195, 42, 62, 163, 13]);
+const WITHDRAW_INELIGIBLE_REWARD = discOf([248, 215, 184, 78, 31, 180, 179, 168]);
+const UPDATE_REWARD_FUNDER = discOf([76, 154, 208, 13, 40, 115, 246, 146]);
+const UPDATE_REWARD_DURATION = discOf([149, 135, 65, 231, 129, 153, 65, 57]);
+const INITIALIZE_REWARD = discOf([129, 91, 188, 3, 246, 52, 185, 249]);
+const FUND_REWARD = discOf([104, 233, 237, 122, 199, 191, 121, 85]);
 const CREATE_CONFIG = discOf([131, 207, 180, 174, 180, 73, 165, 54]);
 const CREATE_DYNAMIC_CONFIG = discOf([231, 197, 13, 164, 248, 213, 133, 152]);
 /**
@@ -554,6 +568,155 @@ function parseWithdrawDeadLiquidityRewardFromData(data, meta) {
     };
     return { MeteoraDammV2WithdrawDeadLiquidityReward: ev };
 }
+function parseWithdrawIneligibleRewardFromData(data, meta) {
+    let o = 0;
+    const pool = (0, binary_js_1.readPubkey)(data, o);
+    if (!pool)
+        return null;
+    o += 32;
+    const reward_mint = (0, binary_js_1.readPubkey)(data, o);
+    if (!reward_mint)
+        return null;
+    o += 32;
+    const amount = (0, binary_js_1.readU64LE)(data, o);
+    if (amount === null)
+        return null;
+    const ev = {
+        metadata: meta,
+        pool,
+        reward_mint,
+        amount,
+    };
+    return { MeteoraDammV2WithdrawIneligibleReward: ev };
+}
+function parseUpdateRewardFunderFromData(data, meta) {
+    if (data.length < 97)
+        return null;
+    const pool = (0, binary_js_1.readPubkey)(data, 0);
+    if (pool === null)
+        return null;
+    const reward_index = (0, binary_js_1.readU8)(data, 32);
+    if (reward_index === null)
+        return null;
+    const old_funder = (0, binary_js_1.readPubkey)(data, 33);
+    if (old_funder === null)
+        return null;
+    const new_funder = (0, binary_js_1.readPubkey)(data, 65);
+    if (new_funder === null)
+        return null;
+    return {
+        MeteoraDammV2UpdateRewardFunder: {
+            metadata: meta,
+            pool,
+            reward_index,
+            old_funder,
+            new_funder,
+        },
+    };
+}
+function parseUpdateRewardDurationFromData(data, meta) {
+    if (data.length < 49)
+        return null;
+    const pool = (0, binary_js_1.readPubkey)(data, 0);
+    if (pool === null)
+        return null;
+    const reward_index = (0, binary_js_1.readU8)(data, 32);
+    if (reward_index === null)
+        return null;
+    const old_reward_duration = (0, binary_js_1.readU64LE)(data, 33);
+    if (old_reward_duration === null)
+        return null;
+    const new_reward_duration = (0, binary_js_1.readU64LE)(data, 41);
+    if (new_reward_duration === null)
+        return null;
+    return {
+        MeteoraDammV2UpdateRewardDuration: {
+            metadata: meta,
+            pool,
+            reward_index,
+            old_reward_duration,
+            new_reward_duration,
+        },
+    };
+}
+function parseInitializeRewardFromData(data, meta) {
+    if (data.length < 137)
+        return null;
+    const pool = (0, binary_js_1.readPubkey)(data, 0);
+    if (pool === null)
+        return null;
+    const reward_mint = (0, binary_js_1.readPubkey)(data, 32);
+    if (reward_mint === null)
+        return null;
+    const funder = (0, binary_js_1.readPubkey)(data, 64);
+    if (funder === null)
+        return null;
+    const creator = (0, binary_js_1.readPubkey)(data, 96);
+    if (creator === null)
+        return null;
+    const reward_index = (0, binary_js_1.readU8)(data, 128);
+    if (reward_index === null)
+        return null;
+    const reward_duration = (0, binary_js_1.readU64LE)(data, 129);
+    if (reward_duration === null)
+        return null;
+    return {
+        MeteoraDammV2InitializeReward: {
+            metadata: meta,
+            pool,
+            reward_mint,
+            funder,
+            creator,
+            reward_index,
+            reward_duration,
+        },
+    };
+}
+function parseFundRewardFromData(data, meta) {
+    if (data.length < 153)
+        return null;
+    const pool = (0, binary_js_1.readPubkey)(data, 0);
+    if (pool === null)
+        return null;
+    const funder = (0, binary_js_1.readPubkey)(data, 32);
+    if (funder === null)
+        return null;
+    const mint_reward = (0, binary_js_1.readPubkey)(data, 64);
+    if (mint_reward === null)
+        return null;
+    const reward_index = (0, binary_js_1.readU8)(data, 96);
+    if (reward_index === null)
+        return null;
+    const amount = (0, binary_js_1.readU64LE)(data, 97);
+    if (amount === null)
+        return null;
+    const transfer_fee_excluded_amount_in = (0, binary_js_1.readU64LE)(data, 105);
+    if (transfer_fee_excluded_amount_in === null)
+        return null;
+    const reward_duration_end = (0, binary_js_1.readU64LE)(data, 113);
+    if (reward_duration_end === null)
+        return null;
+    const pre_reward_rate = (0, binary_js_1.readU128LE)(data, 121);
+    if (pre_reward_rate === null)
+        return null;
+    const post_reward_rate = (0, binary_js_1.readU128LE)(data, 137);
+    if (post_reward_rate === null)
+        return null;
+    return {
+        MeteoraDammV2FundReward: {
+            metadata: meta,
+            pool,
+            funder,
+            mint_reward,
+            reward_index,
+            amount,
+            transfer_fee_excluded_amount_in,
+            reward_duration_end,
+            pre_reward_rate,
+            post_reward_rate,
+        },
+    };
+}
 function parseDynamicFeeParameters(data, offset) {
     let o = offset;
     const bin_step = (0, binary_js_1.readU16LE)(data, o);
@@ -724,6 +887,10 @@ function parseMeteoraDammLog(log, signature, slot, txIndex, blockTimeUs, grpcRec
         return parseLiquidityChangeFromData(data, meta);
     if (disc === INITIALIZE_POOL)
         return parseInitializePoolEvent(data, meta);
+    if (disc === CLAIM_POSITION_FEE)
+        return parseClaimPositionFee(data, meta);
+    if (disc === CLAIM_REWARD)
+        return parseClaimReward(data, meta);
     if (disc === CREATE_POSITION)
         return parseCreatePositionEvent(data, meta);
     if (disc === CLOSE_POSITION)
@@ -733,9 +900,53 @@ function parseMeteoraDammLog(log, signature, slot, txIndex, blockTimeUs, grpcRec
     if (disc === WITHDRAW_DEAD_LIQUIDITY_REWARD) {
         return parseWithdrawDeadLiquidityRewardFromData(data, meta);
     }
+    if (disc === WITHDRAW_INELIGIBLE_REWARD) {
+        return parseWithdrawIneligibleRewardFromData(data, meta);
+    }
+    if (disc === UPDATE_REWARD_FUNDER) {
+        return parseUpdateRewardFunderFromData(data, meta);
+    }
+    if (disc === UPDATE_REWARD_DURATION) {
+        return parseUpdateRewardDurationFromData(data, meta);
+    }
+    if (disc === INITIALIZE_REWARD) {
+        return parseInitializeRewardFromData(data, meta);
+    }
+    if (disc === FUND_REWARD) {
+        return parseFundRewardFromData(data, meta);
+    }
     if (disc === CREATE_CONFIG)
         return parseCreateConfigFromData(data, meta);
     if (disc === CREATE_DYNAMIC_CONFIG)
         return parseCreateDynamicConfigFromData(data, meta);
     return null;
 }
+function parseClaimPositionFee(data, meta) {
+    if (data.length < 112)
+        return null;
+    return {
+        MeteoraDammV2ClaimPositionFee: {
+            metadata: meta,
+            pool: (0, binary_js_1.readPubkey)(data, 0),
+            position: (0, binary_js_1.readPubkey)(data, 32),
+            owner: (0, binary_js_1.readPubkey)(data, 64),
+            fee_a_claimed: (0, binary_js_1.readU64LE)(data, 96),
+            fee_b_claimed: (0, binary_js_1.readU64LE)(data, 104),
+        },
+    };
+}
+function parseClaimReward(data, meta) {
+    if (data.length < 137)
+        return null;
+    return {
+        MeteoraDammV2ClaimReward: {
+            metadata: meta,
+            pool: (0, binary_js_1.readPubkey)(data, 0),
+            position: (0, binary_js_1.readPubkey)(data, 32),
+            owner: (0, binary_js_1.readPubkey)(data, 64),
+            mint_reward: (0, binary_js_1.readPubkey)(data, 96),
+            reward_index: data[128],
+            total_reward: (0, binary_js_1.readU64LE)(data, 129),
+        },
+    };
+}

package/dist/logs/meteora_dbc.d.ts

@@ -1,6 +1,8 @@
 import type { DexEvent } from "../core/dex_event.js";
 import type { EventMetadata } from "../core/metadata.js";
 export declare const METEORA_DBC_DISC: {
+    readonly SWAP2: bigint;
+    readonly SWAP2_TRANSFER_HOOK: bigint;
     readonly SWAP: bigint;
     readonly INITIALIZE_POOL: bigint;
     readonly CURVE_COMPLETE: bigint;
@@ -9,3 +11,4 @@ export declare function parseMeteoraDbcSwapFromData(data: Uint8Array, metadata:
 export declare function parseMeteoraDbcInitializePoolFromData(data: Uint8Array, metadata: EventMetadata): DexEvent | null;
 export declare function parseMeteoraDbcCurveCompleteFromData(data: Uint8Array, metadata: EventMetadata): DexEvent | null;
 export declare function parseMeteoraDbcFromDiscriminator(discriminator: bigint, data: Uint8Array, metadata: EventMetadata): DexEvent | null;
+export declare function parseMeteoraDbcSwap2FromData(data: Uint8Array, metadata: EventMetadata, has_transfer_hook: boolean): DexEvent | null;

package/dist/logs/meteora_dbc.js

@@ -5,6 +5,7 @@ exports.parseMeteoraDbcSwapFromData = parseMeteoraDbcSwapFromData;
 exports.parseMeteoraDbcInitializePoolFromData = parseMeteoraDbcInitializePoolFromData;
 exports.parseMeteoraDbcCurveCompleteFromData = parseMeteoraDbcCurveCompleteFromData;
 exports.parseMeteoraDbcFromDiscriminator = parseMeteoraDbcFromDiscriminator;
+exports.parseMeteoraDbcSwap2FromData = parseMeteoraDbcSwap2FromData;
 const binary_js_1 = require("../util/binary.js");
 function disc(bytes) {
     const u8 = new Uint8Array(8);
@@ -13,6 +14,8 @@ function disc(bytes) {
     return new DataView(u8.buffer).getBigUint64(0, true);
 }
 exports.METEORA_DBC_DISC = {
+    SWAP2: disc([189, 66, 51, 168, 38, 80, 117, 153]),
+    SWAP2_TRANSFER_HOOK: disc([134, 59, 168, 120, 94, 51, 114, 231]),
     SWAP: disc([27, 60, 21, 213, 138, 170, 187, 147]),
     INITIALIZE_POOL: disc([228, 50, 246, 85, 203, 66, 134, 37]),
     CURVE_COMPLETE: disc([229, 231, 86, 84, 156, 134, 75, 24]),
@@ -130,6 +133,8 @@ function parseMeteoraDbcCurveCompleteFromData(data, metadata) {
     return { MeteoraDbcCurveComplete: ev };
 }
 function parseMeteoraDbcFromDiscriminator(discriminator, data, metadata) {
+    if (discriminator === exports.METEORA_DBC_DISC.SWAP2 || discriminator === exports.METEORA_DBC_DISC.SWAP2_TRANSFER_HOOK)
+        return parseMeteoraDbcSwap2FromData(data, metadata, discriminator === exports.METEORA_DBC_DISC.SWAP2_TRANSFER_HOOK);
     if (discriminator === exports.METEORA_DBC_DISC.SWAP)
         return parseMeteoraDbcSwapFromData(data, metadata);
     if (discriminator === exports.METEORA_DBC_DISC.INITIALIZE_POOL) {
@@ -140,3 +145,21 @@ function parseMeteoraDbcFromDiscriminator(discriminator, data, metadata) {
     }
     return null;
 }
+function parseMeteoraDbcSwap2FromData(data, metadata, has_transfer_hook) {
+    if (data.length < 179 || data[82] > 2 || data[64] > 1 || data[65] > 1)
+        return null;
+    const swap_mode = data[82];
+    const u64 = (offset) => (0, binary_js_1.readU64LE)(data, offset);
+    const amount_0 = u64(66), amount_1 = u64(74), included_fee_input_amount = u64(83);
+    return { MeteoraDbcSwap: {
+            metadata, pool: (0, binary_js_1.readPubkey)(data, 0), config: (0, binary_js_1.readPubkey)(data, 32),
+            trade_direction: data[64], has_referral: Boolean(data[65]), event_version: 2,
+            swap_mode, amount_0, amount_1, has_transfer_hook,
+            amount_in: included_fee_input_amount, minimum_amount_out: swap_mode === 2 ? 0n : amount_1,
+            maximum_amount_in: swap_mode === 2 ? amount_1 : 0n,
+            included_fee_input_amount, actual_input_amount: u64(91), amount_left: u64(99),
+            output_amount: u64(107), next_sqrt_price: (0, binary_js_1.readU128LE)(data, 115),
+            trading_fee: u64(131), protocol_fee: u64(139), referral_fee: u64(147),
+            quote_reserve_amount: u64(155), migration_threshold: u64(163), current_timestamp: u64(171),
+        } };
+}

package/dist/logs/meteora_dlmm.js

@@ -92,7 +92,7 @@ function parseDlmmEventFromData(discriminator, data, metadata) {
         return { MeteoraDlmmSwap: ev };
     }
     if (discriminator === DLMM.SWAP2) {
-        if (data.length < 147)
+        if (data.length < 147 || data[72] > 1 || data[145] > 1 || data[146] > 1)
             return null;
         let o = 0;
         const pool = (0, binary_js_1.readPubkey)(data, o);
@@ -109,17 +109,24 @@ function parseDlmmEventFromData(discriminator, data, metadata) {
         o += 16;
         const amount_in = bn64((0, binary_js_1.readU64LE)(data, o));
         o += 8;
-        o += 8; // amount_left
+        const amount_left = bn64((0, binary_js_1.readU64LE)(data, o));
+        o += 8;
         const amount_out = bn64((0, binary_js_1.readU64LE)(data, o));
         o += 8;
-        const fee = bn64((0, binary_js_1.readU64LE)(data, o));
+        const mm_fee = bn64((0, binary_js_1.readU64LE)(data, o));
         o += 8;
         const protocol_fee = bn64((0, binary_js_1.readU64LE)(data, o));
         o += 8;
-        o += 8; // limit_order_fee
+        const limit_order_fee = bn64((0, binary_js_1.readU64LE)(data, o));
+        o += 8;
         const host_fee = bn64((0, binary_js_1.readU64LE)(data, o));
+        const fee = mm_fee + protocol_fee + limit_order_fee;
+        if (fee > 0xffffffffffffffffn)
+            return null;
         const ev = {
             metadata,
+            event_version: 2, amount_left, mm_fee, limit_order_fee,
+            fees_on_input: data[145] !== 0, fees_on_token_x: data[146] !== 0,
             token_x_mint: (0, dex_event_js_1.defaultPubkey)(),
             token_y_mint: (0, dex_event_js_1.defaultPubkey)(),
             user_token_in: (0, dex_event_js_1.defaultPubkey)(),
@@ -306,6 +313,11 @@ function parseDlmmEventFromData(discriminator, data, metadata) {
         const ev = { metadata, pool, position, owner };
         return { MeteoraDlmmClosePosition: ev };
     }
+    if (discriminator === disc([27, 143, 244, 33, 80, 43, 110, 146])) {
+        if (data.length < 116)
+            return null;
+        return { MeteoraDlmmClaimReward: { metadata, pool: (0, binary_js_1.readPubkey)(data, 0), position: (0, binary_js_1.readPubkey)(data, 32), owner: (0, binary_js_1.readPubkey)(data, 64), reward_index: (0, binary_js_1.readU64LE)(data, 96), total_reward: (0, binary_js_1.readU64LE)(data, 104), active_bin_id: new DataView(data.buffer, data.byteOffset, data.byteLength).getInt32(112, true) } };
+    }
     if (discriminator === DLMM.CLAIM_FEE || discriminator === DLMM.CLAIM_FEE2 || discriminator === DLMM.LEGACY_CLAIM_FEE) {
         const requiredLength = discriminator === DLMM.CLAIM_FEE2 ? 116 : 112;
         if (data.length < requiredLength)