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

sol_parser/grpc_client.py

@@ -449,6 +449,7 @@ class YellowstoneGrpc:
         signature = base58.b58encode(bytes(info.signature)).decode("ascii") if info.signature else ""
 
         from .grpc_instruction_parser import (
+            detect_pumpfun_create_from_logs,
             enrich_dex_events_with_subscribe_tx_info,
             parse_instructions_enhanced_from_subscribe_tx_info,
         )
@@ -466,7 +467,7 @@ class YellowstoneGrpc:
         )
 
         log_events = []
-        is_created_buy = False
+        has_pumpfun_create_log = detect_pumpfun_create_from_logs(list(info.log_messages))
         active_program_stack = []
         for log in info.log_messages:
             invoke = parse_invoke_info(log)
@@ -483,7 +484,7 @@ class YellowstoneGrpc:
                 block_time_us,
                 grpc_recv_us,
                 event_type_filter,
-                is_created_buy,
+                has_pumpfun_create_log,
                 "",
                 active_program_stack[-1] if active_program_stack else None,
             )
@@ -495,8 +496,6 @@ class YellowstoneGrpc:
                             del active_program_stack[i:]
                             break
                 continue
-            if ev.type in (EventType.PUMP_FUN_CREATE, EventType.PUMP_FUN_CREATE_V2):
-                is_created_buy = True
             log_events.append(ev)
             completed = parse_program_complete_info(log)
             if completed is not None:

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_instruction_unified
-from .merger import merge_dex_events
+from .instructions import parse_inner_compiled_instruction_if_supported, parse_instruction_unified
+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)
-                    result.append(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,14 +324,25 @@ 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
         for j, inner_ix in enumerate(inner.instructions):
             pid = get_key_b58(inner_ix.program_id_index)
             data = bytes(inner_ix.data)
-            ev = parse_inner_instruction(
+            accounts = [get_key_b58(b) for b in bytes(inner_ix.accounts)]
+            ev = parse_inner_compiled_instruction_if_supported(
+                data,
+                accounts,
+                signature,
+                slot,
+                tx_index,
+                block_time_us,
+                grpc_us,
+                filter,
+                pid,
+            ) or parse_inner_instruction(
                 data,
                 pid,
                 _meta_dict(signature, slot, tx_index, block_time_us, grpc_us, recent_bh),
@@ -287,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)
@@ -299,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

@@ -37,10 +37,11 @@ class EventType(str, Enum):
     """事件类型"""
     # Block
     BLOCK_META = "BlockMeta"
-    # PumpFun
+    # RaydiumLaunchlab
     RAYDIUM_LAUNCHLAB_TRADE = "RaydiumLaunchlabTrade"
     RAYDIUM_LAUNCHLAB_POOL_CREATE = "RaydiumLaunchlabPoolCreate"
     RAYDIUM_LAUNCHLAB_MIGRATE_AMM = "RaydiumLaunchlabMigrateAmm"
+    # PumpFun
     PUMP_FUN_TRADE = "PumpFunTrade"
     PUMP_FUN_BUY = "PumpFunBuy"
     PUMP_FUN_SELL = "PumpFunSell"
@@ -66,26 +67,35 @@ class EventType(str, Enum):
     PUMP_SWAP_CREATE_POOL = "PumpSwapCreatePool"
     PUMP_SWAP_LIQUIDITY_ADDED = "PumpSwapLiquidityAdded"
     PUMP_SWAP_LIQUIDITY_REMOVED = "PumpSwapLiquidityRemoved"
+    # Raydium CPMM
+    RAYDIUM_CPMM_SWAP = "RaydiumCpmmSwap"
+    RAYDIUM_CPMM_DEPOSIT = "RaydiumCpmmDeposit"
+    RAYDIUM_CPMM_WITHDRAW = "RaydiumCpmmWithdraw"
+    RAYDIUM_CPMM_INITIALIZE = "RaydiumCpmmInitialize"
     # Raydium CLMM
     RAYDIUM_CLMM_SWAP = "RaydiumClmmSwap"
-    RAYDIUM_CLMM_INCREASE_LIQUIDITY = "RaydiumClmmIncreaseLiquidity"
-    RAYDIUM_CLMM_DECREASE_LIQUIDITY = "RaydiumClmmDecreaseLiquidity"
     RAYDIUM_CLMM_CREATE_POOL = "RaydiumClmmCreatePool"
     RAYDIUM_CLMM_OPEN_POSITION = "RaydiumClmmOpenPosition"
-    RAYDIUM_CLMM_OPEN_POSITION_WITH_TOKEN_EXT_NFT = "RaydiumClmmOpenPositionWithTokenExtNft"
     RAYDIUM_CLMM_CLOSE_POSITION = "RaydiumClmmClosePosition"
+    RAYDIUM_CLMM_INCREASE_LIQUIDITY = "RaydiumClmmIncreaseLiquidity"
+    RAYDIUM_CLMM_DECREASE_LIQUIDITY = "RaydiumClmmDecreaseLiquidity"
+    RAYDIUM_CLMM_LIQUIDITY_CHANGE = "RaydiumClmmLiquidityChange"
+    RAYDIUM_CLMM_CONFIG_CHANGE = "RaydiumClmmConfigChange"
+    RAYDIUM_CLMM_CREATE_PERSONAL_POSITION = "RaydiumClmmCreatePersonalPosition"
+    RAYDIUM_CLMM_LIQUIDITY_CALCULATE = "RaydiumClmmLiquidityCalculate"
+    RAYDIUM_CLMM_OPEN_LIMIT_ORDER = "RaydiumClmmOpenLimitOrder"
+    RAYDIUM_CLMM_INCREASE_LIMIT_ORDER = "RaydiumClmmIncreaseLimitOrder"
+    RAYDIUM_CLMM_DECREASE_LIMIT_ORDER = "RaydiumClmmDecreaseLimitOrder"
+    RAYDIUM_CLMM_SETTLE_LIMIT_ORDER = "RaydiumClmmSettleLimitOrder"
+    RAYDIUM_CLMM_UPDATE_REWARD_INFOS = "RaydiumClmmUpdateRewardInfos"
+    RAYDIUM_CLMM_OPEN_POSITION_WITH_TOKEN_EXT_NFT = "RaydiumClmmOpenPositionWithTokenExtNft"
     RAYDIUM_CLMM_COLLECT_FEE = "RaydiumClmmCollectFee"
-    # Raydium CPMM
-    RAYDIUM_CPMM_SWAP = "RaydiumCpmmSwap"
-    RAYDIUM_CPMM_DEPOSIT = "RaydiumCpmmDeposit"
-    RAYDIUM_CPMM_WITHDRAW = "RaydiumCpmmWithdraw"
-    RAYDIUM_CPMM_INITIALIZE = "RaydiumCpmmInitialize"
     # Raydium AMM V4
     RAYDIUM_AMM_V4_SWAP = "RaydiumAmmV4Swap"
     RAYDIUM_AMM_V4_DEPOSIT = "RaydiumAmmV4Deposit"
     RAYDIUM_AMM_V4_WITHDRAW = "RaydiumAmmV4Withdraw"
-    RAYDIUM_AMM_V4_WITHDRAW_PNL = "RaydiumAmmV4WithdrawPnl"
     RAYDIUM_AMM_V4_INITIALIZE2 = "RaydiumAmmV4Initialize2"
+    RAYDIUM_AMM_V4_WITHDRAW_PNL = "RaydiumAmmV4WithdrawPnl"
     # Orca Whirlpool
     ORCA_WHIRLPOOL_SWAP = "OrcaWhirlpoolSwap"
     ORCA_WHIRLPOOL_LIQUIDITY_INCREASED = "OrcaWhirlpoolLiquidityIncreased"
@@ -102,9 +112,13 @@ class EventType(str, Enum):
     METEORA_DAMM_V2_SWAP = "MeteoraDammV2Swap"
     METEORA_DAMM_V2_ADD_LIQUIDITY = "MeteoraDammV2AddLiquidity"
     METEORA_DAMM_V2_REMOVE_LIQUIDITY = "MeteoraDammV2RemoveLiquidity"
+    METEORA_DAMM_V2_INITIALIZE_POOL = "MeteoraDammV2InitializePool"
     METEORA_DAMM_V2_CREATE_POSITION = "MeteoraDammV2CreatePosition"
     METEORA_DAMM_V2_CLOSE_POSITION = "MeteoraDammV2ClosePosition"
-    METEORA_DAMM_V2_INITIALIZE_POOL = "MeteoraDammV2InitializePool"
+    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"
@@ -196,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,
@@ -206,6 +224,15 @@ RAYDIUM_CLMM_FILTER_TYPES = (
     EventType.RAYDIUM_CLMM_SWAP,
     EventType.RAYDIUM_CLMM_INCREASE_LIQUIDITY,
     EventType.RAYDIUM_CLMM_DECREASE_LIQUIDITY,
+    EventType.RAYDIUM_CLMM_LIQUIDITY_CHANGE,
+    EventType.RAYDIUM_CLMM_CONFIG_CHANGE,
+    EventType.RAYDIUM_CLMM_CREATE_PERSONAL_POSITION,
+    EventType.RAYDIUM_CLMM_LIQUIDITY_CALCULATE,
+    EventType.RAYDIUM_CLMM_OPEN_LIMIT_ORDER,
+    EventType.RAYDIUM_CLMM_INCREASE_LIMIT_ORDER,
+    EventType.RAYDIUM_CLMM_DECREASE_LIMIT_ORDER,
+    EventType.RAYDIUM_CLMM_SETTLE_LIMIT_ORDER,
+    EventType.RAYDIUM_CLMM_UPDATE_REWARD_INFOS,
     EventType.RAYDIUM_CLMM_CREATE_POOL,
     EventType.RAYDIUM_CLMM_OPEN_POSITION,
     EventType.RAYDIUM_CLMM_OPEN_POSITION_WITH_TOKEN_EXT_NFT,
@@ -305,26 +332,35 @@ def all_event_types() -> List[EventType]:
         EventType.PUMP_SWAP_CREATE_POOL,
         EventType.PUMP_SWAP_LIQUIDITY_ADDED,
         EventType.PUMP_SWAP_LIQUIDITY_REMOVED,
+        # Raydium CPMM
+        EventType.RAYDIUM_CPMM_SWAP,
+        EventType.RAYDIUM_CPMM_DEPOSIT,
+        EventType.RAYDIUM_CPMM_WITHDRAW,
+        EventType.RAYDIUM_CPMM_INITIALIZE,
         # Raydium CLMM
         EventType.RAYDIUM_CLMM_SWAP,
-        EventType.RAYDIUM_CLMM_INCREASE_LIQUIDITY,
-        EventType.RAYDIUM_CLMM_DECREASE_LIQUIDITY,
         EventType.RAYDIUM_CLMM_CREATE_POOL,
         EventType.RAYDIUM_CLMM_OPEN_POSITION,
-        EventType.RAYDIUM_CLMM_OPEN_POSITION_WITH_TOKEN_EXT_NFT,
         EventType.RAYDIUM_CLMM_CLOSE_POSITION,
+        EventType.RAYDIUM_CLMM_INCREASE_LIQUIDITY,
+        EventType.RAYDIUM_CLMM_DECREASE_LIQUIDITY,
+        EventType.RAYDIUM_CLMM_LIQUIDITY_CHANGE,
+        EventType.RAYDIUM_CLMM_CONFIG_CHANGE,
+        EventType.RAYDIUM_CLMM_CREATE_PERSONAL_POSITION,
+        EventType.RAYDIUM_CLMM_LIQUIDITY_CALCULATE,
+        EventType.RAYDIUM_CLMM_OPEN_LIMIT_ORDER,
+        EventType.RAYDIUM_CLMM_INCREASE_LIMIT_ORDER,
+        EventType.RAYDIUM_CLMM_DECREASE_LIMIT_ORDER,
+        EventType.RAYDIUM_CLMM_SETTLE_LIMIT_ORDER,
+        EventType.RAYDIUM_CLMM_UPDATE_REWARD_INFOS,
+        EventType.RAYDIUM_CLMM_OPEN_POSITION_WITH_TOKEN_EXT_NFT,
         EventType.RAYDIUM_CLMM_COLLECT_FEE,
-        # Raydium CPMM
-        EventType.RAYDIUM_CPMM_SWAP,
-        EventType.RAYDIUM_CPMM_DEPOSIT,
-        EventType.RAYDIUM_CPMM_WITHDRAW,
-        EventType.RAYDIUM_CPMM_INITIALIZE,
         # Raydium AMM V4
         EventType.RAYDIUM_AMM_V4_SWAP,
         EventType.RAYDIUM_AMM_V4_DEPOSIT,
         EventType.RAYDIUM_AMM_V4_WITHDRAW,
-        EventType.RAYDIUM_AMM_V4_WITHDRAW_PNL,
         EventType.RAYDIUM_AMM_V4_INITIALIZE2,
+        EventType.RAYDIUM_AMM_V4_WITHDRAW_PNL,
         # Orca Whirlpool
         EventType.ORCA_WHIRLPOOL_SWAP,
         EventType.ORCA_WHIRLPOOL_LIQUIDITY_INCREASED,
@@ -341,9 +377,13 @@ def all_event_types() -> List[EventType]:
         EventType.METEORA_DAMM_V2_SWAP,
         EventType.METEORA_DAMM_V2_ADD_LIQUIDITY,
         EventType.METEORA_DAMM_V2_REMOVE_LIQUIDITY,
+        EventType.METEORA_DAMM_V2_INITIALIZE_POOL,
         EventType.METEORA_DAMM_V2_CREATE_POSITION,
         EventType.METEORA_DAMM_V2_CLOSE_POSITION,
-        EventType.METEORA_DAMM_V2_INITIALIZE_POOL,
+        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

@@ -8,24 +8,62 @@ from typing import Optional
 from .dex_parsers import (
     _parse_raydium_launchlab_trade,
     _parse_raydium_launchlab_pool_create,
+    PUMP_FEES_CREATE_FEE_SHARING_CONFIG,
+    PUMP_FEES_INITIALIZE_FEE_CONFIG,
+    PUMP_FEES_RESET_FEE_SHARING_CONFIG,
+    PUMP_FEES_REVOKE_FEE_SHARING_AUTHORITY,
+    PUMP_FEES_TRANSFER_FEE_SHARING_AUTHORITY,
+    PUMP_FEES_UPDATE_ADMIN,
+    PUMP_FEES_UPDATE_FEE_CONFIG,
+    PUMP_FEES_UPDATE_FEE_SHARES,
+    PUMP_FEES_UPSERT_FEE_TIERS,
     parse_amm_deposit_from_data,
+    parse_amm_init2_from_data,
     parse_amm_swap_in_from_data,
     parse_amm_swap_out_from_data,
     parse_amm_withdraw_from_data,
-    parse_clmm_collect_from_data,
+    parse_amm_withdraw_pnl_from_data,
+    parse_clmm_collect_personal_from_data,
+    parse_clmm_collect_protocol_from_data,
+    parse_clmm_config_change_from_data,
     parse_clmm_create_from_data,
+    parse_clmm_create_personal_position_from_data,
     parse_clmm_dec_from_data,
+    parse_clmm_decrease_limit_order_from_data,
     parse_clmm_inc_from_data,
+    parse_clmm_increase_limit_order_from_data,
+    parse_clmm_liquidity_calculate_from_data,
+    parse_clmm_liquidity_change_from_data,
+    parse_clmm_open_limit_order_from_data,
+    parse_clmm_settle_limit_order_from_data,
     parse_clmm_swap_from_data,
+    parse_clmm_update_reward_infos_from_data,
+    parse_cpmm_create_from_data,
     parse_cpmm_deposit_from_data,
     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,
+    parse_meteora_pool_created_from_data,
+    parse_meteora_pools_set_pool_fees_from_data,
+    parse_meteora_remove_from_data,
+    parse_meteora_swap_from_data,
     parse_orca_liq_dec_from_data,
     parse_orca_liq_inc_from_data,
+    parse_orca_pool_init_from_data,
     parse_orca_traded_from_data,
+    parse_pump_fees_create_fee_sharing_config_from_data,
+    parse_pump_fees_initialize_fee_config_from_data,
+    parse_pump_fees_reset_fee_sharing_config_from_data,
+    parse_pump_fees_revoke_fee_sharing_authority_from_data,
+    parse_pump_fees_transfer_fee_sharing_authority_from_data,
+    parse_pump_fees_update_admin_from_data,
+    parse_pump_fees_update_fee_config_from_data,
+    parse_pump_fees_update_fee_shares_from_data,
+    parse_pump_fees_upsert_fee_tiers_from_data,
     parse_ps_add_liq_from_data,
     parse_ps_buy_from_data,
     parse_ps_create_pool_from_data,
@@ -44,6 +82,7 @@ from .event_types import (
 )
 from .grpc_types import EventType, EventTypeFilter
 from .grpc_types import (
+    event_type_filter_includes_pump_fees,
     event_type_filter_includes_meteora_damm_v2,
     event_type_filter_includes_meteora_dlmm,
     event_type_filter_includes_meteora_pools,
@@ -62,6 +101,7 @@ from .instructions import (
     METEORA_POOLS_PROGRAM_ID,
     ORCA_WHIRLPOOL_PROGRAM_ID,
     PUMPFUN_PROGRAM_ID,
+    PUMP_FEES_PROGRAM_ID,
     PUMPSWAP_PROGRAM_ID,
     RAYDIUM_AMM_V4_PROGRAM_ID,
     RAYDIUM_CLMM_PROGRAM_ID,
@@ -80,15 +120,26 @@ _PS_ADD_LIQ = bytes([228, 69, 165, 46, 81, 203, 154, 29, 120, 248, 61, 83, 31, 1
 _PS_REMOVE_LIQ = bytes([228, 69, 165, 46, 81, 203, 154, 29, 22, 9, 133, 26, 160, 44, 71, 192])
 
 # Raydium CLMM（raydium_clmm_inner::discriminators）
-_CLMM_SWAP = bytes([248, 198, 158, 145, 225, 117, 135, 200, 155, 167, 108, 32, 122, 76, 173, 64])
-_CLMM_INC = bytes([133, 29, 89, 223, 69, 238, 176, 10, 155, 167, 108, 32, 122, 76, 173, 64])
-_CLMM_DEC = bytes([160, 38, 208, 111, 104, 91, 44, 1, 155, 167, 108, 32, 122, 76, 173, 64])
-_CLMM_CREATE_POOL = bytes([233, 146, 209, 142, 207, 104, 64, 188, 155, 167, 108, 32, 122, 76, 173, 64])
-_CLMM_COLLECT_FEE = bytes([164, 152, 207, 99, 187, 104, 171, 119, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_SWAP = bytes([64, 198, 205, 232, 38, 8, 113, 226, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_INC = bytes([49, 79, 105, 212, 32, 34, 30, 84, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_DEC = bytes([58, 222, 86, 58, 68, 50, 85, 56, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_LIQUIDITY_CHANGE = bytes([126, 240, 175, 206, 158, 88, 153, 107, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_CONFIG_CHANGE = bytes([247, 189, 7, 119, 106, 112, 95, 151, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_CREATE_PERSONAL_POSITION = bytes([100, 30, 87, 249, 196, 223, 154, 206, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_LIQUIDITY_CALCULATE = bytes([237, 112, 148, 230, 57, 84, 180, 162, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_OPEN_LIMIT_ORDER = bytes([106, 24, 71, 85, 57, 169, 158, 216, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_INCREASE_LIMIT_ORDER = bytes([11, 120, 13, 204, 199, 87, 19, 200, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_DECREASE_LIMIT_ORDER = bytes([70, 48, 40, 221, 219, 237, 212, 163, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_SETTLE_LIMIT_ORDER = bytes([88, 119, 77, 164, 125, 124, 10, 194, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_UPDATE_REWARD_INFOS = bytes([109, 127, 186, 78, 114, 65, 37, 236, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_CREATE_POOL = bytes([25, 94, 75, 47, 112, 99, 53, 63, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_COLLECT_PERSONAL_FEE = bytes([166, 174, 105, 192, 81, 161, 83, 105, 155, 167, 108, 32, 122, 76, 173, 64])
+_CLMM_COLLECT_PROTOCOL_FEE = bytes([206, 87, 17, 79, 45, 41, 213, 61, 155, 167, 108, 32, 122, 76, 173, 64])
 
 # Raydium CPMM（all_inner::raydium_cpmm::discriminators）
 _CPMM_SWAP_IN = bytes([143, 190, 90, 218, 196, 30, 51, 222, 155, 167, 108, 32, 122, 76, 173, 64])
 _CPMM_SWAP_OUT = bytes([55, 217, 98, 86, 163, 74, 180, 173, 155, 167, 108, 32, 122, 76, 173, 64])
+_CPMM_CREATE_POOL = bytes([233, 146, 209, 142, 207, 104, 64, 188, 155, 167, 108, 32, 122, 76, 173, 64])
 _CPMM_DEP = bytes([242, 35, 198, 137, 82, 225, 242, 182, 155, 167, 108, 32, 122, 76, 173, 64])
 _CPMM_WIT = bytes([183, 18, 70, 156, 148, 109, 161, 34, 155, 167, 108, 32, 122, 76, 173, 64])
 
@@ -97,16 +148,33 @@ _AMM_SWAP_IN = bytes([0, 0, 0, 0, 0, 0, 0, 9, 155, 167, 108, 32, 122, 76, 173, 6
 _AMM_SWAP_OUT = bytes([0, 0, 0, 0, 0, 0, 0, 11, 155, 167, 108, 32, 122, 76, 173, 64])
 _AMM_DEP = bytes([0, 0, 0, 0, 0, 0, 0, 3, 155, 167, 108, 32, 122, 76, 173, 64])
 _AMM_WIT = bytes([0, 0, 0, 0, 0, 0, 0, 4, 155, 167, 108, 32, 122, 76, 173, 64])
+_AMM_INIT2 = bytes([0, 0, 0, 0, 0, 0, 0, 1, 155, 167, 108, 32, 122, 76, 173, 64])
+_AMM_WITHDRAW_PNL = bytes([0, 0, 0, 0, 0, 0, 0, 7, 155, 167, 108, 32, 122, 76, 173, 64])
 
 # Orca
 _ORCA_TRADED = bytes([225, 202, 73, 175, 147, 43, 160, 150, 155, 167, 108, 32, 122, 76, 173, 64])
 _ORCA_LIQ_INC = bytes([30, 7, 144, 181, 102, 254, 155, 161, 155, 167, 108, 32, 122, 76, 173, 64])
 _ORCA_LIQ_DEC = bytes([166, 1, 36, 71, 112, 202, 181, 171, 155, 167, 108, 32, 122, 76, 173, 64])
+_ORCA_POOL_INITIALIZED = bytes([100, 118, 173, 87, 12, 198, 254, 229, 155, 167, 108, 32, 122, 76, 173, 64])
 
 # Meteora Pools AMM
 _MP_SWAP = bytes([81, 108, 227, 190, 205, 208, 10, 196, 155, 167, 108, 32, 122, 76, 173, 64])
 _MP_ADD = bytes([31, 94, 125, 90, 227, 52, 61, 186, 155, 167, 108, 32, 122, 76, 173, 64])
 _MP_REM = bytes([116, 244, 97, 232, 103, 31, 152, 58, 155, 167, 108, 32, 122, 76, 173, 64])
+_MP_BOOTSTRAP = bytes([121, 127, 38, 136, 92, 55, 14, 247, 155, 167, 108, 32, 122, 76, 173, 64])
+_MP_POOL_CREATED = bytes([202, 44, 41, 88, 104, 220, 157, 82, 155, 167, 108, 32, 122, 76, 173, 64])
+_MP_SET_POOL_FEES = bytes([245, 26, 198, 164, 88, 18, 75, 9, 155, 167, 108, 32, 122, 76, 173, 64])
+
+_EVENT_CPI_PREFIX = bytes([228, 69, 165, 46, 81, 203, 154, 29])
+_EVENT_CPI_SUFFIX = bytes([155, 167, 108, 32, 122, 76, 173, 64])
+
+
+def _event_cpi_disc8(disc16: bytes) -> Optional[int]:
+    if disc16[:8] == _EVENT_CPI_PREFIX:
+        return struct.unpack("<Q", disc16[8:16])[0]
+    if disc16[8:16] == _EVENT_CPI_SUFFIX:
+        return struct.unpack("<Q", disc16[:8])[0]
+    return None
 
 # Meteora DAMM V2（inner 16 字节：magic + 8 字节 event disc，与 ``parse_meteora_damm_from_buf`` 的 disc 一致）
 def _damm_buf_from_inner(disc16: bytes, inner: bytes) -> bytes:
@@ -116,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:16] + inner
-
-
 def _meteora_pools_swap_inner(data: bytes, meta_d: dict) -> Optional[DexEvent]:
     if len(data) < 16:
         return None
@@ -234,6 +297,30 @@ def parse_inner_instruction(
             return emit(parse_ps_remove_liq_from_data(inner, meta_d))
         return None
 
+    if program_id_b58 == PUMP_FEES_PROGRAM_ID:
+        if filter is not None and not event_type_filter_includes_pump_fees(filter):
+            return None
+        event_disc = _event_cpi_disc8(disc16)
+        if event_disc == PUMP_FEES_CREATE_FEE_SHARING_CONFIG:
+            return emit(parse_pump_fees_create_fee_sharing_config_from_data(inner, meta_d))
+        if event_disc == PUMP_FEES_INITIALIZE_FEE_CONFIG:
+            return emit(parse_pump_fees_initialize_fee_config_from_data(inner, meta_d))
+        if event_disc == PUMP_FEES_RESET_FEE_SHARING_CONFIG:
+            return emit(parse_pump_fees_reset_fee_sharing_config_from_data(inner, meta_d))
+        if event_disc == PUMP_FEES_REVOKE_FEE_SHARING_AUTHORITY:
+            return emit(parse_pump_fees_revoke_fee_sharing_authority_from_data(inner, meta_d))
+        if event_disc == PUMP_FEES_TRANSFER_FEE_SHARING_AUTHORITY:
+            return emit(parse_pump_fees_transfer_fee_sharing_authority_from_data(inner, meta_d))
+        if event_disc == PUMP_FEES_UPDATE_ADMIN:
+            return emit(parse_pump_fees_update_admin_from_data(inner, meta_d))
+        if event_disc == PUMP_FEES_UPDATE_FEE_CONFIG:
+            return emit(parse_pump_fees_update_fee_config_from_data(inner, meta_d))
+        if event_disc == PUMP_FEES_UPDATE_FEE_SHARES:
+            return emit(parse_pump_fees_update_fee_shares_from_data(inner, meta_d))
+        if event_disc == PUMP_FEES_UPSERT_FEE_TIERS:
+            return emit(parse_pump_fees_upsert_fee_tiers_from_data(inner, meta_d))
+        return None
+
     if program_id_b58 == RAYDIUM_CLMM_PROGRAM_ID:
         if filter is not None and not event_type_filter_includes_raydium_clmm(filter):
             return None
@@ -243,10 +330,30 @@ def parse_inner_instruction(
             return emit(parse_clmm_inc_from_data(inner, meta_d))
         if disc16 == _CLMM_DEC:
             return emit(parse_clmm_dec_from_data(inner, meta_d))
+        if disc16 == _CLMM_LIQUIDITY_CHANGE:
+            return emit(parse_clmm_liquidity_change_from_data(inner, meta_d))
+        if disc16 == _CLMM_CONFIG_CHANGE:
+            return emit(parse_clmm_config_change_from_data(inner, meta_d))
+        if disc16 == _CLMM_CREATE_PERSONAL_POSITION:
+            return emit(parse_clmm_create_personal_position_from_data(inner, meta_d))
+        if disc16 == _CLMM_LIQUIDITY_CALCULATE:
+            return emit(parse_clmm_liquidity_calculate_from_data(inner, meta_d))
+        if disc16 == _CLMM_OPEN_LIMIT_ORDER:
+            return emit(parse_clmm_open_limit_order_from_data(inner, meta_d))
+        if disc16 == _CLMM_INCREASE_LIMIT_ORDER:
+            return emit(parse_clmm_increase_limit_order_from_data(inner, meta_d))
+        if disc16 == _CLMM_DECREASE_LIMIT_ORDER:
+            return emit(parse_clmm_decrease_limit_order_from_data(inner, meta_d))
+        if disc16 == _CLMM_SETTLE_LIMIT_ORDER:
+            return emit(parse_clmm_settle_limit_order_from_data(inner, meta_d))
+        if disc16 == _CLMM_UPDATE_REWARD_INFOS:
+            return emit(parse_clmm_update_reward_infos_from_data(inner, meta_d))
         if disc16 == _CLMM_CREATE_POOL:
             return emit(parse_clmm_create_from_data(inner, meta_d))
-        if disc16 == _CLMM_COLLECT_FEE:
-            return emit(parse_clmm_collect_from_data(inner, meta_d))
+        if disc16 == _CLMM_COLLECT_PERSONAL_FEE:
+            return emit(parse_clmm_collect_personal_from_data(inner, meta_d))
+        if disc16 == _CLMM_COLLECT_PROTOCOL_FEE:
+            return emit(parse_clmm_collect_protocol_from_data(inner, meta_d))
         return None
 
     if program_id_b58 == RAYDIUM_CPMM_PROGRAM_ID:
@@ -256,6 +363,8 @@ def parse_inner_instruction(
             return emit(parse_cpmm_swap_in_from_data(inner, meta_d))
         if disc16 == _CPMM_SWAP_OUT:
             return emit(parse_cpmm_swap_out_from_data(inner, meta_d))
+        if disc16 == _CPMM_CREATE_POOL:
+            return emit(parse_cpmm_create_from_data(inner, meta_d))
         if disc16 == _CPMM_DEP:
             return emit(parse_cpmm_deposit_from_data(inner, meta_d))
         if disc16 == _CPMM_WIT:
@@ -273,6 +382,10 @@ def parse_inner_instruction(
             return emit(parse_amm_deposit_from_data(inner, meta_d))
         if disc16 == _AMM_WIT:
             return emit(parse_amm_withdraw_from_data(inner, meta_d))
+        if disc16 == _AMM_INIT2:
+            return emit(parse_amm_init2_from_data(inner, meta_d))
+        if disc16 == _AMM_WITHDRAW_PNL:
+            return emit(parse_amm_withdraw_pnl_from_data(inner, meta_d))
         return None
 
     if program_id_b58 == ORCA_WHIRLPOOL_PROGRAM_ID:
@@ -284,17 +397,25 @@ def parse_inner_instruction(
             return emit(parse_orca_liq_inc_from_data(inner, meta_d))
         if disc16 == _ORCA_LIQ_DEC:
             return emit(parse_orca_liq_dec_from_data(inner, meta_d))
+        if disc16 == _ORCA_POOL_INITIALIZED:
+            return emit(parse_orca_pool_init_from_data(inner, meta_d))
         return None
 
     if program_id_b58 == METEORA_POOLS_PROGRAM_ID:
         if filter is not None and not event_type_filter_includes_meteora_pools(filter):
             return None
         if disc16 == _MP_SWAP:
-            return emit(_meteora_pools_swap_inner(inner, meta_d))
+            return emit(parse_meteora_swap_from_data(inner, meta_d) or _meteora_pools_swap_inner(inner, meta_d))
         if disc16 == _MP_ADD:
-            return emit(_meteora_pools_add_inner(inner, meta_d))
+            return emit(parse_meteora_add_from_data(inner, meta_d))
         if disc16 == _MP_REM:
-            return emit(_meteora_pools_rem_inner(inner, meta_d))
+            return emit(parse_meteora_remove_from_data(inner, meta_d))
+        if disc16 == _MP_BOOTSTRAP:
+            return emit(parse_meteora_bootstrap_from_data(inner, meta_d))
+        if disc16 == _MP_POOL_CREATED:
+            return emit(parse_meteora_pool_created_from_data(inner, meta_d))
+        if disc16 == _MP_SET_POOL_FEES:
+            return emit(parse_meteora_pools_set_pool_fees_from_data(inner, meta_d))
         return None
 
     if program_id_b58 == METEORA_DAMM_V2_PROGRAM_ID:
@@ -314,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