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

sol_parser/log_instr_dedup.py

@@ -49,16 +49,19 @@ def _ix_lane(ix_name: Any) -> int:
     return 0
 
 
-PumpfunLaneBase = Tuple[str, str, bool, int]
+OccurrenceBase = Tuple[Any, ...]
 
 
-def _next_occurrence(base: PumpfunLaneBase, counts: Dict[PumpfunLaneBase, int]) -> int:
+def _next_occurrence(base: OccurrenceBase, counts: Dict[OccurrenceBase, int]) -> int:
     current = counts.get(base, 0)
     counts[base] = current + 1
     return current
 
 
-def _dedupe_key(ev: DexEvent, pumpfun_lane_counts: Dict[PumpfunLaneBase, int]) -> Optional[str]:
+def _dedupe_key(
+    ev: DexEvent,
+    occurrence_counts: Dict[OccurrenceBase, int],
+) -> Optional[str]:
     data = ev.data
     if data is None:
         return None
@@ -71,7 +74,7 @@ def _dedupe_key(ev: DexEvent, pumpfun_lane_counts: Dict[PumpfunLaneBase, int]) -
             bool(getattr(data, "is_buy", False)),
             lane,
         )
-        occ = _next_occurrence(base, pumpfun_lane_counts)
+        occ = _next_occurrence(("PumpFun", *base), occurrence_counts)
         return f"PumpFunTrade|{base[0]}|{base[1]}|{base[2]}|{base[3]}|{occ}"
 
     t = ev.type
@@ -110,13 +113,32 @@ def _dedupe_key(ev: DexEvent, pumpfun_lane_counts: Dict[PumpfunLaneBase, int]) -
     if t == EventType.PUMP_SWAP_LIQUIDITY_REMOVED:
         return f"PumpSwapLiquidityRemoved|{getattr(data, 'pool', '')}|{getattr(data, 'user', '')}"
     if t == EventType.RAYDIUM_CLMM_SWAP:
-        return f"RaydiumClmmSwap|{getattr(data, 'pool_state', '')}|{bool(getattr(data, 'zero_for_one', False))}"
+        pool = getattr(data, "pool_state", "")
+        occurrence = _next_occurrence(("RaydiumClmm", pool), occurrence_counts)
+        return f"RaydiumClmmSwap|{pool}|{occurrence}"
+    if t == EventType.RAYDIUM_CPMM_SWAP:
+        pool = getattr(data, "pool_id", "")
+        occurrence = _next_occurrence(("RaydiumCpmm", pool), occurrence_counts)
+        return f"RaydiumCpmmSwap|{pool}|{occurrence}"
     if t == EventType.RAYDIUM_AMM_V4_SWAP:
-        return f"RaydiumAmmV4Swap|{getattr(data, 'amm', '')}"
+        base_out = getattr(data, "max_amount_in", 0) != 0
+        amount = getattr(data, "amount_out" if base_out else "amount_in", 0)
+        base = (base_out, amount)
+        occurrence = _next_occurrence(("RaydiumAmmV4", *base), occurrence_counts)
+        return f"RaydiumAmmV4Swap|{base_out}|{amount}|{occurrence}"
+    if t == EventType.ORCA_WHIRLPOOL_SWAP:
+        whirlpool = getattr(data, "whirlpool", "")
+        occurrence = _next_occurrence(("OrcaWhirlpool", whirlpool), occurrence_counts)
+        return f"OrcaWhirlpoolSwap|{whirlpool}|{occurrence}"
     if t == EventType.METEORA_DLMM_SWAP:
+        base = (
+            getattr(data, "pool", ""),
+            getattr(data, "from_addr", ""),
+            bool(getattr(data, "swap_for_y", False)),
+        )
+        occurrence = _next_occurrence(("MeteoraDlmm", *base), occurrence_counts)
         return (
-            f"MeteoraDlmmSwap|{getattr(data, 'pool', '')}|"
-            f"{getattr(data, 'from_addr', '')}|{bool(getattr(data, 'swap_for_y', False))}"
+            f"MeteoraDlmmSwap|{base[0]}|{base[1]}|{base[2]}|{occurrence}"
         )
     return None
 
@@ -163,6 +185,8 @@ def _merge_pumpfun_trade(log: Any, ix: Any) -> None:
         "quote_amount",
         "virtual_quote_reserves",
         "real_quote_reserves",
+        "holder_rewards_bps",
+        "holder_rewards",
     ):
         if getattr(log, attr, 0) == 0 and getattr(ix, attr, 0) != 0:
             setattr(log, attr, getattr(ix, attr))
@@ -195,6 +219,7 @@ def _merge_pumpfun_create(log: Any, ix: Any) -> None:
         "real_token_reserves",
         "token_total_supply",
         "virtual_quote_reserves",
+        "creator_fee_bps",
     ):
         if getattr(log, attr, 0) == 0 and getattr(ix, attr, 0) != 0:
             setattr(log, attr, getattr(ix, attr))
@@ -204,6 +229,9 @@ def _merge_pumpfun_create(log: Any, ix: Any) -> None:
     log.is_cashback_enabled = bool(getattr(log, "is_cashback_enabled", False)) or bool(
         getattr(ix, "is_cashback_enabled", False)
     )
+    log.is_holder_reward = bool(getattr(log, "is_holder_reward", False)) or bool(
+        getattr(ix, "is_holder_reward", False)
+    )
 
 
 def _merge_pumpfun_create_v2(log: Any, ix: Any) -> None:
@@ -283,6 +311,20 @@ def _merge_grpc_instruction_into_log(log_ev: DexEvent, ix_ev: DexEvent) -> None:
             "coin_creator",
         ):
             _fill_attr(log, attr, ix)
+        if getattr(log, "creator_fee_bps", 0) == 0 and getattr(ix, "creator_fee_bps", 0) != 0:
+            log.creator_fee_bps = ix.creator_fee_bps
+        log.is_mayhem_mode = bool(getattr(log, "is_mayhem_mode", False)) or bool(
+            getattr(ix, "is_mayhem_mode", False)
+        )
+        log.is_cashback_coin = bool(getattr(log, "is_cashback_coin", False)) or bool(
+            getattr(ix, "is_cashback_coin", False)
+        )
+        log.can_edit_creator_fee = bool(getattr(log, "can_edit_creator_fee", False)) or bool(
+            getattr(ix, "can_edit_creator_fee", False)
+        )
+        log.is_holder_reward = bool(getattr(log, "is_holder_reward", False)) or bool(
+            getattr(ix, "is_holder_reward", False)
+        )
     elif (
         log_ev.type == EventType.PUMP_SWAP_LIQUIDITY_ADDED
         and ix_ev.type == EventType.PUMP_SWAP_LIQUIDITY_ADDED
@@ -312,6 +354,8 @@ def _merge_grpc_instruction_into_log(log_ev: DexEvent, ix_ev: DexEvent) -> None:
             "serum_vault_signer",
             "user_source_token_account",
             "user_destination_token_account",
+            "user_source_owner",
+            "amm",
         ):
             _fill_attr(log, attr, ix)
     elif log_ev.type == EventType.RAYDIUM_LAUNCHLAB_POOL_CREATE and ix_ev.type == EventType.RAYDIUM_LAUNCHLAB_POOL_CREATE:
@@ -329,17 +373,17 @@ def dedupe_log_instruction_events(
 ) -> List[DexEvent]:
     out: List[DexEvent] = []
     index_by_key: Dict[str, int] = {}
-    log_pumpfun_counts: Dict[PumpfunLaneBase, int] = {}
-    ix_pumpfun_counts: Dict[PumpfunLaneBase, int] = {}
+    log_occurrences: Dict[OccurrenceBase, int] = {}
+    ix_occurrences: Dict[OccurrenceBase, int] = {}
 
     for ev in log_events:
-        key = _dedupe_key(ev, log_pumpfun_counts)
+        key = _dedupe_key(ev, log_occurrences)
         if key is not None:
             index_by_key[key] = len(out)
         out.append(ev)
 
     for ev in instruction_events:
-        key = _dedupe_key(ev, ix_pumpfun_counts)
+        key = _dedupe_key(ev, ix_occurrences)
         if key is None:
             out.append(ev)
             continue

sol_parser/merger.py

@@ -32,6 +32,14 @@ from .event_types import (
     MeteoraDammV2CreatePositionEvent,
     MeteoraDammV2RemoveLiquidityEvent,
     MeteoraDammV2SwapEvent,
+    MeteoraDlmmAddLiquidityEvent,
+    MeteoraDlmmClaimFeeEvent,
+    MeteoraDlmmClosePositionEvent,
+    MeteoraDlmmCreatePositionEvent,
+    MeteoraDlmmInitializeBinArrayEvent,
+    MeteoraDlmmInitializePoolEvent,
+    MeteoraDlmmRemoveLiquidityEvent,
+    MeteoraDlmmSwapEvent,
     MeteoraPoolsAddLiquidityEvent,
     MeteoraPoolsRemoveLiquidityEvent,
     MeteoraPoolsSwapEvent,
@@ -44,6 +52,40 @@ from .grpc_types import EventType
 
 ZERO = "11111111111111111111111111111111"
 
+GENERIC_MERGE_TYPES = (
+    PumpSwapCreatePoolEvent,
+    PumpSwapLiquidityAddedEvent,
+    PumpSwapLiquidityRemovedEvent,
+    RaydiumClmmSwapEvent,
+    RaydiumClmmIncreaseLiquidityEvent,
+    RaydiumClmmDecreaseLiquidityEvent,
+    RaydiumClmmCreatePoolEvent,
+    RaydiumClmmCollectFeeEvent,
+    RaydiumCpmmSwapEvent,
+    RaydiumCpmmDepositEvent,
+    RaydiumCpmmWithdrawEvent,
+    RaydiumAmmV4SwapEvent,
+    RaydiumAmmV4DepositEvent,
+    RaydiumAmmV4WithdrawEvent,
+    OrcaWhirlpoolSwapEvent,
+    OrcaWhirlpoolLiquidityIncreasedEvent,
+    OrcaWhirlpoolLiquidityDecreasedEvent,
+    MeteoraPoolsSwapEvent,
+    MeteoraPoolsAddLiquidityEvent,
+    MeteoraPoolsRemoveLiquidityEvent,
+    MeteoraDammV2SwapEvent,
+    MeteoraDammV2AddLiquidityEvent,
+    MeteoraDammV2RemoveLiquidityEvent,
+    MeteoraDammV2CreatePositionEvent,
+    MeteoraDammV2ClosePositionEvent,
+    MeteoraDlmmSwapEvent,
+    MeteoraDlmmAddLiquidityEvent,
+    MeteoraDlmmRemoveLiquidityEvent,
+    MeteoraDlmmInitializeBinArrayEvent,
+    MeteoraDlmmClaimFeeEvent,
+    RaydiumLaunchlabTradeEvent,
+)
+
 
 def _merge_generic(base: Any, inner: Any) -> None:
     for f in dataclasses.fields(type(base)):
@@ -134,6 +176,8 @@ def merge_pumpfun_trade(base: PumpFunTradeEvent, inner: PumpFunTradeEvent) -> No
         "quote_amount",
         "virtual_quote_reserves",
         "real_quote_reserves",
+        "holder_rewards_bps",
+        "holder_rewards",
         "amount",
         "max_sol_cost",
         "min_sol_output",
@@ -243,6 +287,8 @@ def merge_pumpfun_create(base: PumpFunCreateEvent, inner: PumpFunCreateEvent) ->
     base.is_cashback_enabled = inner.is_cashback_enabled
     base.quote_mint = inner.quote_mint
     base.virtual_quote_reserves = inner.virtual_quote_reserves
+    base.creator_fee_bps = inner.creator_fee_bps
+    base.is_holder_reward = bool(base.is_holder_reward) or bool(inner.is_holder_reward)
 
 
 def merge_pumpfun_migrate(base: PumpFunMigrateEvent, inner: PumpFunMigrateEvent) -> None:
@@ -258,6 +304,11 @@ def merge_pumpfun_migrate(base: PumpFunMigrateEvent, inner: PumpFunMigrateEvent)
 
 def merge_dex_events(base: DexEvent, inner: DexEvent) -> None:
     """将 ``inner`` 合并进 ``base``（就地修改 ``base.data``）。"""
+    try_merge_dex_events(base, inner)
+
+
+def try_merge_dex_events(base: DexEvent, inner: DexEvent) -> bool:
+    """Merge compatible events and report success so unmatched events are retained."""
     bd = base.data
     ind = inner.data
 
@@ -274,108 +325,45 @@ def merge_dex_events(base: DexEvent, inner: DexEvent) -> None:
             EventType.PUMP_FUN_BUY_EXACT_SOL_IN,
         ):
             merge_pumpfun_trade(bd, ind)
-        return
+            return True
+        return False
 
     if isinstance(bd, PumpFunCreateEvent) and isinstance(ind, PumpFunCreateEvent):
         merge_pumpfun_create(bd, ind)
-        return
+        return True
 
     if isinstance(bd, PumpFunCreateV2TokenEvent) and isinstance(ind, PumpFunCreateV2TokenEvent):
         _merge_generic(bd, ind)
-        return
+        return True
 
     if isinstance(bd, PumpFunMigrateEvent) and isinstance(ind, PumpFunMigrateEvent):
         merge_pumpfun_migrate(bd, ind)
-        return
+        return True
 
     if isinstance(bd, PumpSwapBuyEvent) and isinstance(ind, PumpSwapBuyEvent):
         merge_pumpswap_buy(bd, ind)
-        return
+        return True
     if isinstance(bd, PumpSwapSellEvent) and isinstance(ind, PumpSwapSellEvent):
         merge_pumpswap_sell(bd, ind)
-        return
-    if isinstance(bd, PumpSwapCreatePoolEvent) and isinstance(ind, PumpSwapCreatePoolEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, PumpSwapLiquidityAddedEvent) and isinstance(ind, PumpSwapLiquidityAddedEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, PumpSwapLiquidityRemovedEvent) and isinstance(ind, PumpSwapLiquidityRemovedEvent):
-        _merge_generic(bd, ind)
-        return
-
-    if isinstance(bd, RaydiumClmmSwapEvent) and isinstance(ind, RaydiumClmmSwapEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, RaydiumClmmIncreaseLiquidityEvent) and isinstance(ind, RaydiumClmmIncreaseLiquidityEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, RaydiumClmmDecreaseLiquidityEvent) and isinstance(ind, RaydiumClmmDecreaseLiquidityEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, RaydiumClmmCreatePoolEvent) and isinstance(ind, RaydiumClmmCreatePoolEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, RaydiumClmmCollectFeeEvent) and isinstance(ind, RaydiumClmmCollectFeeEvent):
-        _merge_generic(bd, ind)
-        return
-
-    if isinstance(bd, RaydiumCpmmSwapEvent) and isinstance(ind, RaydiumCpmmSwapEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, RaydiumCpmmDepositEvent) and isinstance(ind, RaydiumCpmmDepositEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, RaydiumCpmmWithdrawEvent) and isinstance(ind, RaydiumCpmmWithdrawEvent):
-        _merge_generic(bd, ind)
-        return
-
-    if isinstance(bd, RaydiumAmmV4SwapEvent) and isinstance(ind, RaydiumAmmV4SwapEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, RaydiumAmmV4DepositEvent) and isinstance(ind, RaydiumAmmV4DepositEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, RaydiumAmmV4WithdrawEvent) and isinstance(ind, RaydiumAmmV4WithdrawEvent):
-        _merge_generic(bd, ind)
-        return
-
-    if isinstance(bd, OrcaWhirlpoolSwapEvent) and isinstance(ind, OrcaWhirlpoolSwapEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, OrcaWhirlpoolLiquidityIncreasedEvent) and isinstance(ind, OrcaWhirlpoolLiquidityIncreasedEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, OrcaWhirlpoolLiquidityDecreasedEvent) and isinstance(ind, OrcaWhirlpoolLiquidityDecreasedEvent):
+        return True
+    if isinstance(bd, MeteoraDlmmInitializePoolEvent) and isinstance(ind, MeteoraDlmmInitializePoolEvent):
+        creator, active_bin_id = bd.creator, bd.active_bin_id
         _merge_generic(bd, ind)
-        return
-
-    if isinstance(bd, MeteoraPoolsSwapEvent) and isinstance(ind, MeteoraPoolsSwapEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, MeteoraPoolsAddLiquidityEvent) and isinstance(ind, MeteoraPoolsAddLiquidityEvent):
+        bd.creator, bd.active_bin_id = creator, active_bin_id
+        return True
+    if isinstance(bd, MeteoraDlmmCreatePositionEvent) and isinstance(ind, MeteoraDlmmCreatePositionEvent):
+        lower_bin_id, width = bd.lower_bin_id, bd.width
         _merge_generic(bd, ind)
-        return
-    if isinstance(bd, MeteoraPoolsRemoveLiquidityEvent) and isinstance(ind, MeteoraPoolsRemoveLiquidityEvent):
+        bd.lower_bin_id, bd.width = lower_bin_id, width
+        return True
+    if isinstance(bd, MeteoraDlmmClosePositionEvent) and isinstance(ind, MeteoraDlmmClosePositionEvent):
+        pool = bd.pool
         _merge_generic(bd, ind)
-        return
+        bd.pool = pool
+        return True
 
-    if isinstance(bd, MeteoraDammV2SwapEvent) and isinstance(ind, MeteoraDammV2SwapEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, MeteoraDammV2AddLiquidityEvent) and isinstance(ind, MeteoraDammV2AddLiquidityEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, MeteoraDammV2RemoveLiquidityEvent) and isinstance(ind, MeteoraDammV2RemoveLiquidityEvent):
+    if base.type == inner.type and type(bd) is type(ind) and isinstance(bd, GENERIC_MERGE_TYPES):
         _merge_generic(bd, ind)
-        return
-    if isinstance(bd, MeteoraDammV2CreatePositionEvent) and isinstance(ind, MeteoraDammV2CreatePositionEvent):
-        _merge_generic(bd, ind)
-        return
-    if isinstance(bd, MeteoraDammV2ClosePositionEvent) and isinstance(ind, MeteoraDammV2ClosePositionEvent):
-        _merge_generic(bd, ind)
-        return
+        return True
 
-    if isinstance(bd, RaydiumLaunchlabTradeEvent) and isinstance(ind, RaydiumLaunchlabTradeEvent):
-        _merge_generic(bd, ind)
-        return
+    return False

sol_parser/parser.py

@@ -79,6 +79,17 @@ def parse_log_optimized(
 ) -> Optional[DexEvent]:
     """单次 base64 decode 后按 discriminator 做 early filter，再按实际事件类型二次过滤。"""
     grpc = int(time.time() * 1_000_000) if grpc_recv_us is None else grpc_recv_us
+    if program_id == "675kPX9MHTjS2zt1qfr1NYHuzeLXfQM9H24wFSUt1Mp8" and "ray_log: " in log:
+        from .dex_parsers import parse_amm_ray_log_swap
+        from .grpc_types import EventType
+
+        if event_type_filter is not None and not event_type_filter.should_include(
+            EventType.RAYDIUM_AMM_V4_SWAP
+        ):
+            return None
+        return parse_amm_ray_log_swap(
+            log, _meta(signature, slot, tx_index, block_time_us, grpc, recent_blockhash)
+        )
     buf = decode_program_data_line(log)
     if not buf:
         return None

sol_parser/pumpfun_fee_enrich.py

@@ -102,10 +102,12 @@ def enrich_create_v2_from_create_events(events: List[DexEvent]) -> None:
             "real_token_reserves",
             "token_total_supply",
             "virtual_quote_reserves",
+            "creator_fee_bps",
         ):
             _fill_int_if_zero(c2, attr, getattr(c, attr))
         c2.is_cashback_enabled = c2.is_cashback_enabled or c.is_cashback_enabled
         c2.is_mayhem_mode = c2.is_mayhem_mode or c.is_mayhem_mode
+        c2.is_holder_reward = c2.is_holder_reward or c.is_holder_reward
 
 
 def enrich_pumpfun_trades_from_create_instructions(events: List[DexEvent]) -> None:

sol_parser/rpc_parser.py

@@ -11,7 +11,11 @@ import base58
 from .dex_parsers import DexEvent
 from .grpc_types import EventTypeFilter, EventType, 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 .instructions import (
+    METEORA_DLMM_PROGRAM_ID,
+    parse_inner_compiled_instruction_if_supported,
+    parse_instruction_unified,
+)
 from .log_instr_dedup import dedupe_log_instruction_events
 from .pumpfun_fee_enrich import enrich_pumpfun_same_tx_post_merge
 
@@ -30,6 +34,7 @@ class RpcCompiledInstruction:
     program_id_index: int
     accounts: Union[List[int], bytes]
     data: bytes
+    stack_height: Optional[int] = None
 
 
 @dataclass
@@ -215,8 +220,9 @@ def parse_rpc_transaction(
     block_tx_index = int(getattr(tx, "transaction_index", 0) or 0)
     full_account_keys = _merge_rpc_full_account_keys(msg.account_keys, meta)
 
-    indexed_instruction_events: List[Tuple[int, Optional[int], DexEvent]] = []
+    indexed_instruction_events: List[Tuple[Any, ...]] = []
     from .grpc_instruction_parser import (
+        _is_dlmm_event_cpi,
         detect_pumpfun_create_from_logs,
         merge_instruction_events,
     )
@@ -238,7 +244,7 @@ def parse_rpc_transaction(
                 is_created_buy=has_pumpfun_create_log,
             )
             if ev:
-                indexed_instruction_events.append((outer_idx, None, ev))
+                indexed_instruction_events.append((outer_idx, None, 1, False, ev))
 
         # 解析内层指令
         for group in meta.inner_instructions:
@@ -256,7 +262,18 @@ def parse_rpc_transaction(
                     is_created_buy=has_pumpfun_create_log,
                 )
                 if ev:
-                    indexed_instruction_events.append((int(group.index), inner_idx, ev))
+                    pid = (
+                        full_account_keys[ix.program_id_index]
+                        if ix.program_id_index < len(full_account_keys)
+                        else ""
+                    )
+                    indexed_instruction_events.append((
+                        int(group.index),
+                        inner_idx,
+                        ix.stack_height,
+                        pid == METEORA_DLMM_PROGRAM_ID and _is_dlmm_event_cpi(ix.data),
+                        ev,
+                    ))
 
     instruction_events = merge_instruction_events(indexed_instruction_events)
     enrich_pumpfun_same_tx_post_merge(instruction_events)
@@ -525,6 +542,13 @@ def _parse_rpc_compiled_ix(ix: dict, account_keys: List[str]) -> RpcCompiledInst
         program_id_index=pidx,
         accounts=acc_list,
         data=_ix_data_from_rpc(ix),
+        stack_height=(
+            int(ix["stackHeight"])
+            if ix.get("stackHeight") is not None
+            else int(ix["stack_height"])
+            if ix.get("stack_height") is not None
+            else None
+        ),
     )
 
 
@@ -717,6 +741,8 @@ def rpc_response_to_solana_storage(
             acc = ix.accounts
             ii.accounts = bytes(acc) if not isinstance(acc, bytes) else acc
             ii.data = ix.data
+            if ix.stack_height is not None:
+                ii.stack_height = ix.stack_height
     if m.loaded_addresses:
         for w in m.loaded_addresses.writable:
             meta.loaded_writable_addresses.append(base58.b58decode(w))