sol-parser-sdk-python 0.5.7__py3-none-any.whl → 0.5.8__py3-none-any.whl

sol_parser/event_type_parity.py

@@ -75,6 +75,10 @@ RUST_EVENT_TYPES = [
     "MeteoraDammV2InitializePool",
     "MeteoraDammV2CreatePosition",
     "MeteoraDammV2ClosePosition",
+    "MeteoraDammV2UpdateDelegatePermission",
+    "MeteoraDammV2WithdrawDeadLiquidityReward",
+    "MeteoraDammV2CreateConfig",
+    "MeteoraDammV2CreateDynamicConfig",
     "MeteoraDbcSwap",
     "MeteoraDbcInitializePool",
     "MeteoraDbcCurveComplete",

sol_parser/event_types.py

@@ -153,6 +153,8 @@ class PumpFunTradeEvent(DexEventBase):
     quote_amount: int = 0
     virtual_quote_reserves: int = 0
     real_quote_reserves: int = 0
+    holder_rewards_bps: int = 0
+    holder_rewards: int = 0
     is_cashback_coin: bool = False
     amount: int = 0
     max_sol_cost: int = 0
@@ -160,6 +162,11 @@ class PumpFunTradeEvent(DexEventBase):
     spendable_sol_in: int = 0
     spendable_quote_in: int = 0
     min_tokens_out: int = 0
+    # Transaction balance fields (raw units; None when meta unavailable)
+    pre_token_balance: Optional[int] = None
+    post_token_balance: Optional[int] = None
+    pre_sol_balance: Optional[int] = None
+    post_sol_balance: Optional[int] = None
     global_account: str = ""
     bonding_curve: str = ""
     bonding_curve_v2: str = ""
@@ -210,6 +217,8 @@ class PumpFunCreateEvent(DexEventBase):
     quote_vault: str = ""
     quote_token_program: str = ""
     virtual_quote_reserves: int = 0
+    creator_fee_bps: int = 0
+    is_holder_reward: bool = False
 
 
 @dataclass
@@ -238,6 +247,8 @@ class PumpFunCreateV2TokenEvent(DexEventBase):
     quote_vault: str = ""
     quote_token_program: str = ""
     virtual_quote_reserves: int = 0
+    creator_fee_bps: int = 0
+    is_holder_reward: bool = False
     mint_authority: str = ""
     associated_bonding_curve: str = ""
     global_account: str = ""  # Rust `global` PumpFun global config
@@ -418,6 +429,13 @@ class PumpSwapBuyEvent(DexEventBase):
     mayhem_mode: bool = False
     cashback_fee_basis_points: int = 0
     cashback: int = 0
+    buyback_fee_basis_points: int = 0
+    buyback_fee: int = 0
+    virtual_quote_reserves: int = 0
+    can_boost: bool = False
+    base_supply: int = 0
+    holder_rewards_bps: int = 0
+    holder_rewards: int = 0
     is_cashback_coin: bool = False
     base_mint: str = ""
     quote_mint: str = ""
@@ -461,6 +479,13 @@ class PumpSwapSellEvent(DexEventBase):
     coin_creator_fee: int = 0
     cashback_fee_basis_points: int = 0
     cashback: int = 0
+    buyback_fee_basis_points: int = 0
+    buyback_fee: int = 0
+    virtual_quote_reserves: int = 0
+    can_boost: bool = False
+    base_supply: int = 0
+    holder_rewards_bps: int = 0
+    holder_rewards: int = 0
     base_mint: str = ""
     quote_mint: str = ""
     pool_base_token_account: str = ""
@@ -499,6 +524,10 @@ class PumpSwapCreatePoolEvent(DexEventBase):
     user_quote_token_account: str = ""
     coin_creator: str = ""
     is_mayhem_mode: bool = False
+    is_cashback_coin: bool = False
+    creator_fee_bps: int = 0
+    can_edit_creator_fee: bool = False
+    is_holder_reward: bool = False
 
 
 @dataclass
@@ -997,6 +1026,12 @@ class OrcaWhirlpoolPoolInitializedEvent(DexEventBase):
 @dataclass
 class MeteoraDlmmSwapEvent(DexEventBase):
     """Meteora DLMM 交换事件"""
+    # Instruction / account context (not in Borsh event payload)
+    token_x_mint: str = ""
+    token_y_mint: str = ""
+    user_token_in: str = ""
+    user_token_out: str = ""
+    min_amount_out: int = 0
     pool: str = ""
     from_addr: str = ""
     start_bin_id: int = 0
@@ -1141,10 +1176,14 @@ class MeteoraPoolsPoolCreatedEvent(DexEventBase):
 
 @dataclass
 class MeteoraDammV2SwapEvent(DexEventBase):
-    """Meteora DAMM v2 交换事件"""
+    """Meteora DAMM v2 交换事件（含 EvtSwap / EvtSwap2 全字段）"""
     pool: str = ""
     trade_direction: int = 0
+    collect_fee_mode: int = 0
     has_referral: bool = False
+    amount_0: int = 0
+    amount_1: int = 0
+    swap_mode: int = 0
     amount_in: int = 0
     minimum_amount_out: int = 0
     output_amount: int = 0
@@ -1154,7 +1193,16 @@ class MeteoraDammV2SwapEvent(DexEventBase):
     partner_fee: int = 0
     referral_fee: int = 0
     actual_amount_in: int = 0
+    excluded_fee_input_amount: int = 0
+    amount_left: int = 0
+    claiming_fee: int = 0
+    compounding_fee: int = 0
+    included_transfer_fee_amount_in: int = 0
+    included_transfer_fee_amount_out: int = 0
+    excluded_transfer_fee_amount_out: int = 0
     current_timestamp: int = 0
+    reserve_a_amount: int = 0
+    reserve_b_amount: int = 0
     token_a_vault: str = ""
     token_b_vault: str = ""
     token_a_mint: str = ""
@@ -1194,6 +1242,8 @@ class MeteoraDammV2AddLiquidityEvent(DexEventBase):
     token_b_amount: int = 0
     total_amount_a: int = 0
     total_amount_b: int = 0
+    reserve_a_amount: int = 0
+    reserve_b_amount: int = 0
 
 
 @dataclass
@@ -1207,6 +1257,10 @@ class MeteoraDammV2RemoveLiquidityEvent(DexEventBase):
     token_b_amount_threshold: int = 0
     token_a_amount: int = 0
     token_b_amount: int = 0
+    total_amount_a: int = 0
+    total_amount_b: int = 0
+    reserve_a_amount: int = 0
+    reserve_b_amount: int = 0
 
 
 @dataclass
@@ -1237,6 +1291,62 @@ class MeteoraDammV2InitializePoolEvent(DexEventBase):
     pool_type: int = 0
 
 
+@dataclass
+class MeteoraDammV2DynamicFeeParameters:
+    """DAMM v2 PoolFeeParameters.dynamic_fee"""
+    bin_step: int = 0
+    bin_step_u128: str = "0"
+    filter_period: int = 0
+    decay_period: int = 0
+    reduction_factor: int = 0
+    max_volatility_accumulator: int = 0
+    variable_fee_control: int = 0
+
+
+@dataclass
+class MeteoraDammV2UpdateDelegatePermissionEvent(DexEventBase):
+    """Meteora DAMM v2 EvtUpdateDelegatePermission"""
+    position: str = ""
+    owner: str = ""
+    permission: int = 0
+    delegate: Optional[str] = None
+
+
+@dataclass
+class MeteoraDammV2WithdrawDeadLiquidityRewardEvent(DexEventBase):
+    """Meteora DAMM v2 EvtWithdrawDeadLiquidityReward"""
+    pool: str = ""
+    reward_mint: str = ""
+    amount: int = 0
+
+
+@dataclass
+class MeteoraDammV2CreateConfigEvent(DexEventBase):
+    """Meteora DAMM v2 EvtCreateConfig（含 0.2.4 permission）"""
+    base_fee_data: bytes = field(default_factory=lambda: bytes(27))
+    compounding_fee_bps: int = 0
+    padding: int = 0
+    dynamic_fee: Optional[MeteoraDammV2DynamicFeeParameters] = None
+    vault_config_key: str = ""
+    pool_creator_authority: str = ""
+    activation_type: int = 0
+    sqrt_min_price: str = "0"
+    sqrt_max_price: str = "0"
+    collect_fee_mode: int = 0
+    index: int = 0
+    config: str = ""
+    permission: str = "0"
+
+
+@dataclass
+class MeteoraDammV2CreateDynamicConfigEvent(DexEventBase):
+    """Meteora DAMM v2 EvtCreateDynamicConfig"""
+    config: str = ""
+    pool_creator_authority: str = ""
+    index: int = 0
+    permission: str = "0"
+
+
 @dataclass
 class MeteoraDbcSwapEvent(DexEventBase):
     """Meteora DBC 交易事件"""
@@ -1289,6 +1399,16 @@ class RaydiumLaunchlabTradeEvent(DexEventBase):
     is_buy: bool = False
     trade_direction: str = ""
     exact_in: bool = False
+    global_config: str = ""
+    platform_config: str = ""
+    user_base_token: str = ""
+    user_quote_token: str = ""
+    base_vault: str = ""
+    quote_vault: str = ""
+    base_mint: str = ""
+    quote_mint: str = ""
+    base_token_program: str = ""
+    quote_token_program: str = ""
 
 
 @dataclass
@@ -1297,6 +1417,15 @@ class RaydiumLaunchlabPoolCreateEvent(DexEventBase):
     pool_state: str = ""
     creator: str = ""
     base_mint_param: Optional[Dict[str, Any]] = None
+    payer: str = ""
+    global_config: str = ""
+    platform_config: str = ""
+    base_mint: str = ""
+    quote_mint: str = ""
+    base_vault: str = ""
+    quote_vault: str = ""
+    base_token_program: str = ""
+    quote_token_program: str = ""
 
 
 @dataclass
@@ -1373,6 +1502,10 @@ TypedDexEvent = Union[
     MeteoraDammV2AddLiquidityEvent,
     MeteoraDammV2RemoveLiquidityEvent,
     MeteoraDammV2InitializePoolEvent,
+    MeteoraDammV2UpdateDelegatePermissionEvent,
+    MeteoraDammV2WithdrawDeadLiquidityRewardEvent,
+    MeteoraDammV2CreateConfigEvent,
+    MeteoraDammV2CreateDynamicConfigEvent,
     RaydiumLaunchlabTradeEvent,
     RaydiumLaunchlabPoolCreateEvent,
     RaydiumLaunchlabMigrateAmmEvent,
@@ -1409,11 +1542,20 @@ def _get_int(m: dict, key: str) -> int:
     v = m.get(key, 0)
     if isinstance(v, int):
         return v
-    if isinstance(v, str) and v.isdigit():
-        return int(v)
+    if isinstance(v, str):
+        try:
+            return int(v, 10)
+        except ValueError:
+            pass
     return 0
 
 
+def _get_optional_int(m: dict, key: str) -> Optional[int]:
+    if key not in m or m.get(key) is None:
+        return None
+    return _get_int(m, key)
+
+
 def _get_bool(m: dict, key: str) -> bool:
     v = m.get(key, False)
     return bool(v)
@@ -1517,6 +1659,8 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             quote_amount=_get_int(data, "quote_amount"),
             virtual_quote_reserves=_get_int(data, "virtual_quote_reserves"),
             real_quote_reserves=_get_int(data, "real_quote_reserves"),
+            holder_rewards_bps=_get_int(data, "holder_rewards_bps"),
+            holder_rewards=_get_int(data, "holder_rewards"),
             is_cashback_coin=_get_bool(data, "is_cashback_coin"),
             amount=_get_int(data, "amount"),
             max_sol_cost=_get_int(data, "max_sol_cost"),
@@ -1524,6 +1668,10 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             spendable_sol_in=_get_int(data, "spendable_sol_in"),
             spendable_quote_in=_get_int(data, "spendable_quote_in"),
             min_tokens_out=_get_int(data, "min_tokens_out"),
+            pre_token_balance=_get_optional_int(data, "pre_token_balance"),
+            post_token_balance=_get_optional_int(data, "post_token_balance"),
+            pre_sol_balance=_get_optional_int(data, "pre_sol_balance"),
+            post_sol_balance=_get_optional_int(data, "post_sol_balance"),
             global_account=_get_str(data, "global") or _get_str(data, "global_account"),
             bonding_curve=_get_str(data, "bonding_curve"),
             bonding_curve_v2=_get_str(data, "bonding_curve_v2"),
@@ -1573,6 +1721,8 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             quote_vault=_get_str(data, "quote_vault"),
             quote_token_program=_get_str(data, "quote_token_program"),
             virtual_quote_reserves=_get_int(data, "virtual_quote_reserves"),
+            creator_fee_bps=_get_int(data, "creator_fee_bps"),
+            is_holder_reward=_get_bool(data, "is_holder_reward"),
         )
 
     if event_type == EventType.PUMP_FUN_CREATE_V2:
@@ -1598,6 +1748,8 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             quote_vault=_get_str(data, "quote_vault"),
             quote_token_program=_get_str(data, "quote_token_program"),
             virtual_quote_reserves=_get_int(data, "virtual_quote_reserves"),
+            creator_fee_bps=_get_int(data, "creator_fee_bps"),
+            is_holder_reward=_get_bool(data, "is_holder_reward"),
             mint_authority=_get_str(data, "mint_authority"),
             associated_bonding_curve=_get_str(data, "associated_bonding_curve"),
             global_account=g,
@@ -1663,6 +1815,13 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             mayhem_mode=_get_bool(data, "mayhem_mode"),
             cashback_fee_basis_points=_get_int(data, "cashback_fee_basis_points"),
             cashback=_get_int(data, "cashback"),
+            buyback_fee_basis_points=_get_int(data, "buyback_fee_basis_points"),
+            buyback_fee=_get_int(data, "buyback_fee"),
+            virtual_quote_reserves=_get_int(data, "virtual_quote_reserves"),
+            can_boost=_get_bool(data, "can_boost"),
+            base_supply=_get_int(data, "base_supply"),
+            holder_rewards_bps=_get_int(data, "holder_rewards_bps"),
+            holder_rewards=_get_int(data, "holder_rewards"),
             is_cashback_coin=_get_bool(data, "is_cashback_coin"),
             is_pump_pool=_get_bool(data, "is_pump_pool"),
             base_mint=_get_str(data, "base_mint"),
@@ -1706,6 +1865,13 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             coin_creator_fee=_get_int(data, "coin_creator_fee"),
             cashback_fee_basis_points=_get_int(data, "cashback_fee_basis_points"),
             cashback=_get_int(data, "cashback"),
+            buyback_fee_basis_points=_get_int(data, "buyback_fee_basis_points"),
+            buyback_fee=_get_int(data, "buyback_fee"),
+            virtual_quote_reserves=_get_int(data, "virtual_quote_reserves"),
+            can_boost=_get_bool(data, "can_boost"),
+            base_supply=_get_int(data, "base_supply"),
+            holder_rewards_bps=_get_int(data, "holder_rewards_bps"),
+            holder_rewards=_get_int(data, "holder_rewards"),
             is_pump_pool=_get_bool(data, "is_pump_pool"),
             base_mint=_get_str(data, "base_mint"),
             quote_mint=_get_str(data, "quote_mint"),
@@ -1744,6 +1910,10 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             user_quote_token_account=_get_str(data, "user_quote_token_account"),
             coin_creator=_get_str(data, "coin_creator"),
             is_mayhem_mode=_get_bool(data, "is_mayhem_mode"),
+            is_cashback_coin=_get_bool(data, "is_cashback_coin"),
+            creator_fee_bps=_get_int(data, "creator_fee_bps"),
+            can_edit_creator_fee=_get_bool(data, "can_edit_creator_fee"),
+            is_holder_reward=_get_bool(data, "is_holder_reward"),
         )
     
     if event_type == EventType.PUMP_SWAP_LIQUIDITY_ADDED:
@@ -1801,6 +1971,35 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
         return MeteoraDammV2ClosePositionEvent(metadata=meta, pool=_get_str(data, "pool"))
     if event_type == EventType.METEORA_DAMM_V2_INITIALIZE_POOL:
         return MeteoraDammV2InitializePoolEvent(metadata=meta, pool=_get_str(data, "pool"))
+    if event_type == EventType.METEORA_DAMM_V2_UPDATE_DELEGATE_PERMISSION:
+        return MeteoraDammV2UpdateDelegatePermissionEvent(
+            metadata=meta,
+            position=_get_str(data, "position"),
+            owner=_get_str(data, "owner"),
+            permission=_get_int(data, "permission"),
+            delegate=data.get("delegate"),
+        )
+    if event_type == EventType.METEORA_DAMM_V2_WITHDRAW_DEAD_LIQUIDITY_REWARD:
+        return MeteoraDammV2WithdrawDeadLiquidityRewardEvent(
+            metadata=meta,
+            pool=_get_str(data, "pool"),
+            reward_mint=_get_str(data, "reward_mint"),
+            amount=_get_int(data, "amount"),
+        )
+    if event_type == EventType.METEORA_DAMM_V2_CREATE_CONFIG:
+        return MeteoraDammV2CreateConfigEvent(
+            metadata=meta,
+            config=_get_str(data, "config"),
+            permission=str(data.get("permission", "0")),
+        )
+    if event_type == EventType.METEORA_DAMM_V2_CREATE_DYNAMIC_CONFIG:
+        return MeteoraDammV2CreateDynamicConfigEvent(
+            metadata=meta,
+            config=_get_str(data, "config"),
+            pool_creator_authority=_get_str(data, "pool_creator_authority"),
+            index=_get_int(data, "index"),
+            permission=str(data.get("permission", "0")),
+        )
 
     if event_type == EventType.RAYDIUM_CLMM_SWAP:
         return RaydiumClmmSwapEvent(
@@ -2124,6 +2323,16 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             is_buy=_get_bool(data, "is_buy"),
             trade_direction=_get_str(data, "trade_direction"),
             exact_in=_get_bool(data, "exact_in"),
+            global_config=_get_str(data, "global_config"),
+            platform_config=_get_str(data, "platform_config"),
+            user_base_token=_get_str(data, "user_base_token"),
+            user_quote_token=_get_str(data, "user_quote_token"),
+            base_vault=_get_str(data, "base_vault"),
+            quote_vault=_get_str(data, "quote_vault"),
+            base_mint=_get_str(data, "base_mint"),
+            quote_mint=_get_str(data, "quote_mint"),
+            base_token_program=_get_str(data, "base_token_program"),
+            quote_token_program=_get_str(data, "quote_token_program"),
         )
     
     if event_type == EventType.RAYDIUM_LAUNCHLAB_POOL_CREATE:
@@ -2132,6 +2341,15 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             pool_state=_get_str(data, "pool_state"),
             creator=_get_str(data, "creator"),
             base_mint_param=_get_dict_any(data, "base_mint_param"),
+            payer=_get_str(data, "payer"),
+            global_config=_get_str(data, "global_config"),
+            platform_config=_get_str(data, "platform_config"),
+            base_mint=_get_str(data, "base_mint"),
+            quote_mint=_get_str(data, "quote_mint"),
+            base_vault=_get_str(data, "base_vault"),
+            quote_vault=_get_str(data, "quote_vault"),
+            base_token_program=_get_str(data, "base_token_program"),
+            quote_token_program=_get_str(data, "quote_token_program"),
         )
     
     if event_type == EventType.RAYDIUM_LAUNCHLAB_MIGRATE_AMM:

sol_parser/grpc_instruction_parser.py

@@ -7,17 +7,18 @@ from typing import Any, Dict, List, Optional, Tuple
 
 import base58
 
-from .account_dispatcher import fill_accounts_with_owned_keys, fill_data
+from .account_dispatcher import fill_accounts_with_owned_keys, fill_data, fill_token_balances
 from .event_types import DexEvent
 from .grpc_types import (
     EventMetadata,
+    EventType,
     EventTypeFilter,
     SubscribeUpdateTransactionInfo,
     event_type_filter_allows_instruction_parsing,
 )
 from .inner_instruction_parser import parse_inner_instruction
 from .instructions import parse_inner_compiled_instruction_if_supported, parse_instruction_unified
-from .merger import merge_dex_events
+from .merger import try_merge_dex_events
 from .pumpfun_fee_enrich import enrich_pumpfun_same_tx_post_merge
 
 
@@ -73,6 +74,7 @@ def apply_account_fill_to_events(
     for ev in events:
         fill_accounts_with_owned_keys(ev, meta_pb, tx_pb, invokes_raw)
         fill_data(ev, meta_pb, tx_pb, invokes_str)
+        fill_token_balances(ev, meta_pb, tx_pb)
     recent_bh = ""
     if msg.recent_blockhash:
         recent_bh = base58.b58encode(bytes(msg.recent_blockhash)).decode("ascii")
@@ -124,36 +126,86 @@ def should_parse_instructions(filter: Optional[EventTypeFilter]) -> bool:
     return event_type_filter_allows_instruction_parsing(list(inc))
 
 
-def merge_instruction_events(
-    events: List[Tuple[int, Optional[int], DexEvent]],
-) -> List[DexEvent]:
+_DLMM_EVENT_TYPES = {
+    EventType.METEORA_DLMM_SWAP,
+    EventType.METEORA_DLMM_ADD_LIQUIDITY,
+    EventType.METEORA_DLMM_REMOVE_LIQUIDITY,
+    EventType.METEORA_DLMM_INITIALIZE_POOL,
+    EventType.METEORA_DLMM_INITIALIZE_BIN_ARRAY,
+    EventType.METEORA_DLMM_CREATE_POSITION,
+    EventType.METEORA_DLMM_CLOSE_POSITION,
+    EventType.METEORA_DLMM_CLAIM_FEE,
+}
+
+
+def _is_dlmm_event_cpi(data: bytes) -> bool:
+    return len(data) >= 16 and (
+        data[:8] == bytes((228, 69, 165, 46, 81, 203, 154, 29))
+        or data[8:16] == bytes((155, 167, 108, 32, 122, 76, 173, 64))
+    )
+
+
+def merge_instruction_events(events: List[Tuple[Any, ...]]) -> List[DexEvent]:
     """对齐 Rust ``merge_instruction_events``。"""
     if not events:
         return []
-    events = sorted(events, key=lambda x: (x[0], 0 if x[1] is None else 1 + x[1]))
+    normalized = events if all(len(item) == 5 for item in events) else [
+        (item[0], item[1], None, False, item[2]) if len(item) == 3 else item
+        for item in events
+    ]
+    normalized.sort(key=lambda x: (x[0], 0 if x[1] is None else 1 + x[1]))
     result: List[DexEvent] = []
-    pending_outer: Optional[Tuple[int, DexEvent]] = None
+    outer_target: Optional[Tuple[int, int]] = None
+    dlmm_targets: List[Tuple[int, Optional[int], int]] = []
 
-    for outer_idx, inner_idx, event in events:
+    for outer_idx, inner_idx, stack_height, is_dlmm_event_cpi, event in normalized:
         if inner_idx is None:
-            if pending_outer is not None:
-                result.append(pending_outer[1])
-            pending_outer = (outer_idx, event)
-        else:
-            if pending_outer is not None:
-                po_idx, mut_outer = pending_outer
-                pending_outer = None
-                if po_idx == outer_idx:
-                    merge_dex_events(mut_outer, event)
-                    pending_outer = (outer_idx, mut_outer)
-                else:
-                    result.append(mut_outer)
-                    result.append(event)
+            result.append(event)
+            target_idx = len(result) - 1
+            outer_target = (outer_idx, target_idx)
+            dlmm_targets = (
+                [(outer_idx, stack_height, target_idx)] if event.type in _DLMM_EVENT_TYPES else []
+            )
+            continue
+
+        if is_dlmm_event_cpi:
+            for candidate_idx in range(len(dlmm_targets) - 1, -1, -1):
+                target_outer, target_height, target_idx = dlmm_targets[candidate_idx]
+                direct_child = (
+                    target_height is None
+                    or stack_height is None
+                    or stack_height == target_height + 1
+                )
+                if target_outer == outer_idx and direct_child:
+                    del dlmm_targets[candidate_idx + 1:]
+                    if try_merge_dex_events(result[target_idx], event):
+                        break
             else:
                 result.append(event)
+            continue
+
+        target_idx: Optional[int] = None
+        if outer_target is not None and outer_target[0] == outer_idx:
+            if try_merge_dex_events(result[outer_target[1]], event):
+                target_idx = outer_target[1]
+        if target_idx is None:
+            result.append(event)
+            target_idx = len(result) - 1
+
+        if event.type in _DLMM_EVENT_TYPES:
+            if stack_height is None:
+                dlmm_targets.clear()
+            else:
+                while dlmm_targets and (
+                    dlmm_targets[-1][0] != outer_idx
+                    or (
+                        dlmm_targets[-1][1] is not None
+                        and dlmm_targets[-1][1] >= stack_height
+                    )
+                ):
+                    dlmm_targets.pop()
+            dlmm_targets.append((outer_idx, stack_height, target_idx))
 
-    if pending_outer is not None:
-        result.append(pending_outer[1])
     return result
 
 
@@ -260,7 +312,7 @@ def parse_instructions_enhanced_from_parsed(
 
     is_created_buy = detect_pumpfun_create_from_logs(list(meta.log_messages))
 
-    result: List[Tuple[int, Optional[int], DexEvent]] = []
+    result: List[Tuple[Any, ...]] = []
 
     for i, ix in enumerate(msg.instructions):
         pid_idx = ix.program_id_index
@@ -272,7 +324,7 @@ def parse_instructions_enhanced_from_parsed(
             data, accounts, signature, slot, tx_index, block_time_us, grpc_us, filter, pid
         )
         if ev:
-            result.append((i, None, ev))
+            result.append((i, None, 1, False, ev))
 
     for inner in meta.inner_instructions:
         outer_idx = inner.index
@@ -298,7 +350,13 @@ def parse_instructions_enhanced_from_parsed(
                 is_created_buy,
             )
             if ev:
-                result.append((int(outer_idx), j, ev))
+                result.append((
+                    int(outer_idx),
+                    j,
+                    int(inner_ix.stack_height) if inner_ix.HasField("stack_height") else None,
+                    pid == METEORA_DLMM_PROGRAM_ID and _is_dlmm_event_cpi(data),
+                    ev,
+                ))
 
     merged = merge_instruction_events(result)
     enrich_pumpfun_same_tx_post_merge(merged)
@@ -310,6 +368,7 @@ def parse_instructions_enhanced_from_parsed(
     for ev in merged:
         fill_accounts_with_owned_keys(ev, meta, transaction_pb, invokes_raw)
         fill_data(ev, meta, transaction_pb, invokes_str)
+        fill_token_balances(ev, meta, transaction_pb)
 
     for ev in merged:
         if isinstance(ev.data, object) and hasattr(ev.data, "metadata"):

sol_parser/grpc_types.py

@@ -115,6 +115,10 @@ class EventType(str, Enum):
     METEORA_DAMM_V2_INITIALIZE_POOL = "MeteoraDammV2InitializePool"
     METEORA_DAMM_V2_CREATE_POSITION = "MeteoraDammV2CreatePosition"
     METEORA_DAMM_V2_CLOSE_POSITION = "MeteoraDammV2ClosePosition"
+    METEORA_DAMM_V2_UPDATE_DELEGATE_PERMISSION = "MeteoraDammV2UpdateDelegatePermission"
+    METEORA_DAMM_V2_WITHDRAW_DEAD_LIQUIDITY_REWARD = "MeteoraDammV2WithdrawDeadLiquidityReward"
+    METEORA_DAMM_V2_CREATE_CONFIG = "MeteoraDammV2CreateConfig"
+    METEORA_DAMM_V2_CREATE_DYNAMIC_CONFIG = "MeteoraDammV2CreateDynamicConfig"
     # Meteora DBC
     METEORA_DBC_SWAP = "MeteoraDbcSwap"
     METEORA_DBC_INITIALIZE_POOL = "MeteoraDbcInitializePool"
@@ -206,6 +210,10 @@ METEORA_DAMM_V2_FILTER_TYPES = (
     EventType.METEORA_DAMM_V2_CLOSE_POSITION,
     EventType.METEORA_DAMM_V2_INITIALIZE_POOL,
     EventType.METEORA_DAMM_V2_REMOVE_LIQUIDITY,
+    EventType.METEORA_DAMM_V2_UPDATE_DELEGATE_PERMISSION,
+    EventType.METEORA_DAMM_V2_WITHDRAW_DEAD_LIQUIDITY_REWARD,
+    EventType.METEORA_DAMM_V2_CREATE_CONFIG,
+    EventType.METEORA_DAMM_V2_CREATE_DYNAMIC_CONFIG,
 )
 METEORA_DBC_FILTER_TYPES = (
     EventType.METEORA_DBC_SWAP,
@@ -372,6 +380,10 @@ def all_event_types() -> List[EventType]:
         EventType.METEORA_DAMM_V2_INITIALIZE_POOL,
         EventType.METEORA_DAMM_V2_CREATE_POSITION,
         EventType.METEORA_DAMM_V2_CLOSE_POSITION,
+        EventType.METEORA_DAMM_V2_UPDATE_DELEGATE_PERMISSION,
+        EventType.METEORA_DAMM_V2_WITHDRAW_DEAD_LIQUIDITY_REWARD,
+        EventType.METEORA_DAMM_V2_CREATE_CONFIG,
+        EventType.METEORA_DAMM_V2_CREATE_DYNAMIC_CONFIG,
         # Meteora DBC
         EventType.METEORA_DBC_SWAP,
         EventType.METEORA_DBC_INITIALIZE_POOL,

sol_parser/inner_instruction_parser.py

@@ -43,7 +43,7 @@ from .dex_parsers import (
     parse_cpmm_swap_in_from_data,
     parse_cpmm_swap_out_from_data,
     parse_cpmm_withdraw_from_data,
-    parse_dlmm_from_program_data,
+    parse_dlmm_event_from_data,
     parse_meteora_damm_from_buf,
     parse_meteora_add_from_data,
     parse_meteora_bootstrap_from_data,
@@ -184,11 +184,6 @@ def _damm_buf_from_inner(disc16: bytes, inner: bytes) -> bytes:
 _RAYDIUM_LAUNCHLAB_TRADE = bytes([189, 219, 127, 211, 78, 230, 97, 238, 155, 167, 108, 32, 122, 76, 173, 64])
 _RAYDIUM_LAUNCHLAB_POOL_CREATE = bytes([151, 215, 226, 9, 118, 161, 115, 174, 155, 167, 108, 32, 122, 76, 173, 64])
 
-# DLMM（8 字节 event disc + payload）
-def _dlmm_buf_from_inner(disc16: bytes, inner: bytes) -> bytes:
-    return disc16[:8] + inner
-
-
 def _meteora_pools_swap_inner(data: bytes, meta_d: dict) -> Optional[DexEvent]:
     if len(data) < 16:
         return None
@@ -440,6 +435,9 @@ def parse_inner_instruction(
     if program_id_b58 == METEORA_DLMM_PROGRAM_ID:
         if filter is not None and not event_type_filter_includes_meteora_dlmm(filter):
             return None
-        return emit(parse_dlmm_from_program_data(_dlmm_buf_from_inner(disc16, inner), meta_d))
+        event_disc = _event_cpi_disc8(disc16)
+        if event_disc is None:
+            return None
+        return emit(parse_dlmm_event_from_data(event_disc, inner, meta_d))
 
     return None