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

sol_parser/event_type_parity.py

@@ -0,0 +1,129 @@
+"""EventType inventory parity with Rust ``sol_parser_sdk::grpc::EventType``."""
+
+from __future__ import annotations
+
+from .grpc_types import all_event_types
+
+RUST_EVENT_TYPES = [
+    "BlockMeta",
+    "RaydiumLaunchlabTrade",
+    "RaydiumLaunchlabPoolCreate",
+    "RaydiumLaunchlabMigrateAmm",
+    "PumpFunTrade",
+    "PumpFunBuy",
+    "PumpFunSell",
+    "PumpFunBuyExactSolIn",
+    "PumpFunCreate",
+    "PumpFunCreateV2",
+    "PumpFunComplete",
+    "PumpFunMigrate",
+    "PumpFeesCreateFeeSharingConfig",
+    "PumpFeesInitializeFeeConfig",
+    "PumpFeesResetFeeSharingConfig",
+    "PumpFeesRevokeFeeSharingAuthority",
+    "PumpFeesTransferFeeSharingAuthority",
+    "PumpFeesUpdateAdmin",
+    "PumpFeesUpdateFeeConfig",
+    "PumpFeesUpdateFeeShares",
+    "PumpFeesUpsertFeeTiers",
+    "PumpFunMigrateBondingCurveCreator",
+    "PumpSwapTrade",
+    "PumpSwapBuy",
+    "PumpSwapSell",
+    "PumpSwapCreatePool",
+    "PumpSwapLiquidityAdded",
+    "PumpSwapLiquidityRemoved",
+    "RaydiumCpmmSwap",
+    "RaydiumCpmmDeposit",
+    "RaydiumCpmmWithdraw",
+    "RaydiumCpmmInitialize",
+    "RaydiumClmmSwap",
+    "RaydiumClmmCreatePool",
+    "RaydiumClmmOpenPosition",
+    "RaydiumClmmClosePosition",
+    "RaydiumClmmIncreaseLiquidity",
+    "RaydiumClmmDecreaseLiquidity",
+    "RaydiumClmmLiquidityChange",
+    "RaydiumClmmConfigChange",
+    "RaydiumClmmCreatePersonalPosition",
+    "RaydiumClmmLiquidityCalculate",
+    "RaydiumClmmOpenLimitOrder",
+    "RaydiumClmmIncreaseLimitOrder",
+    "RaydiumClmmDecreaseLimitOrder",
+    "RaydiumClmmSettleLimitOrder",
+    "RaydiumClmmUpdateRewardInfos",
+    "RaydiumClmmOpenPositionWithTokenExtNft",
+    "RaydiumClmmCollectFee",
+    "RaydiumAmmV4Swap",
+    "RaydiumAmmV4Deposit",
+    "RaydiumAmmV4Withdraw",
+    "RaydiumAmmV4Initialize2",
+    "RaydiumAmmV4WithdrawPnl",
+    "OrcaWhirlpoolSwap",
+    "OrcaWhirlpoolLiquidityIncreased",
+    "OrcaWhirlpoolLiquidityDecreased",
+    "OrcaWhirlpoolPoolInitialized",
+    "MeteoraPoolsSwap",
+    "MeteoraPoolsAddLiquidity",
+    "MeteoraPoolsRemoveLiquidity",
+    "MeteoraPoolsBootstrapLiquidity",
+    "MeteoraPoolsPoolCreated",
+    "MeteoraPoolsSetPoolFees",
+    "MeteoraDammV2Swap",
+    "MeteoraDammV2AddLiquidity",
+    "MeteoraDammV2RemoveLiquidity",
+    "MeteoraDammV2InitializePool",
+    "MeteoraDammV2CreatePosition",
+    "MeteoraDammV2ClosePosition",
+    "MeteoraDbcSwap",
+    "MeteoraDbcInitializePool",
+    "MeteoraDbcCurveComplete",
+    "MeteoraDlmmSwap",
+    "MeteoraDlmmAddLiquidity",
+    "MeteoraDlmmRemoveLiquidity",
+    "MeteoraDlmmInitializePool",
+    "MeteoraDlmmInitializeBinArray",
+    "MeteoraDlmmCreatePosition",
+    "MeteoraDlmmClosePosition",
+    "MeteoraDlmmClaimFee",
+    "TokenAccount",
+    "TokenInfo",
+    "NonceAccount",
+    "AccountPumpFunGlobal",
+    "AccountPumpFunBondingCurve",
+    "AccountPumpFunFeeConfig",
+    "AccountPumpFunSharingConfig",
+    "AccountPumpFunGlobalVolumeAccumulator",
+    "AccountPumpFunUserVolumeAccumulator",
+    "AccountPumpSwapGlobalConfig",
+    "AccountPumpSwapPool",
+    "AccountRaydiumClmmAmmConfig",
+    "AccountRaydiumClmmPoolState",
+    "AccountRaydiumClmmTickArrayState",
+    "AccountRaydiumCpmmAmmConfig",
+    "AccountRaydiumCpmmPoolState",
+    "AccountOrcaWhirlpool",
+    "AccountOrcaPosition",
+    "AccountOrcaTickArray",
+    "AccountOrcaFeeTier",
+    "AccountOrcaWhirlpoolsConfig",
+]
+
+
+def run_event_type_parity_check() -> int:
+    actual = [event_type.value for event_type in all_event_types()]
+    if actual == RUST_EVENT_TYPES:
+        print(f"[event-type-parity] OK：EventType 与 Rust 清单一致（共 {len(actual)} 个）")
+        return 0
+    only_expected = [x for x in RUST_EVENT_TYPES if x not in actual]
+    only_actual = [x for x in actual if x not in RUST_EVENT_TYPES]
+    print("[event-type-parity] EventType 与 Rust 清单不一致")
+    if only_expected:
+        print("  Python 缺:", ", ".join(only_expected))
+    if only_actual:
+        print("  Python 多:", ", ".join(only_actual))
+    return 1
+
+
+if __name__ == "__main__":
+    raise SystemExit(run_event_type_parity_check())

sol_parser/event_types.py

@@ -53,6 +53,7 @@ class DexEvent:
             EventType.RAYDIUM_AMM_V4_SWAP, EventType.RAYDIUM_CLMM_SWAP, EventType.RAYDIUM_CPMM_SWAP,
             EventType.ORCA_WHIRLPOOL_SWAP, EventType.METEORA_DLMM_SWAP,
             EventType.METEORA_POOLS_SWAP, EventType.METEORA_DAMM_V2_SWAP,
+            EventType.METEORA_DBC_SWAP,
             EventType.RAYDIUM_LAUNCHLAB_TRADE,
         )
     
@@ -206,6 +207,8 @@ class PumpFunCreateEvent(DexEventBase):
     is_mayhem_mode: bool = False
     is_cashback_enabled: bool = False
     quote_mint: str = ""
+    quote_vault: str = ""
+    quote_token_program: str = ""
     virtual_quote_reserves: int = 0
 
 
@@ -232,6 +235,8 @@ class PumpFunCreateV2TokenEvent(DexEventBase):
     is_mayhem_mode: bool = False
     is_cashback_enabled: bool = False
     quote_mint: str = ""
+    quote_vault: str = ""
+    quote_token_program: str = ""
     virtual_quote_reserves: int = 0
     mint_authority: str = ""
     associated_bonding_curve: str = ""
@@ -697,6 +702,10 @@ class RaydiumClmmIncreaseLiquidityEvent(DexEventBase):
     position_nft_mint: str = ""
     user: str = ""
     liquidity: str = ""
+    amount_0: int = 0
+    amount_1: int = 0
+    amount_0_transfer_fee: int = 0
+    amount_1_transfer_fee: int = 0
     amount0_max: int = 0
     amount1_max: int = 0
 
@@ -708,6 +717,13 @@ class RaydiumClmmDecreaseLiquidityEvent(DexEventBase):
     position_nft_mint: str = ""
     user: str = ""
     liquidity: str = ""
+    decrease_amount_0: int = 0
+    decrease_amount_1: int = 0
+    fee_amount_0: int = 0
+    fee_amount_1: int = 0
+    reward_amounts: List[int] = field(default_factory=list)
+    transfer_fee_0: int = 0
+    transfer_fee_1: int = 0
     amount0_min: int = 0
     amount1_min: int = 0
 
@@ -752,6 +768,9 @@ class RaydiumClmmCreatePoolEvent(DexEventBase):
     tick_spacing: int = 0
     fee_rate: int = 0
     sqrt_price_x64: str = ""
+    tick: int = 0
+    token_vault_0: str = ""
+    token_vault_1: str = ""
     open_time: int = 0
 
 
@@ -760,10 +779,109 @@ class RaydiumClmmCollectFeeEvent(DexEventBase):
     """Raydium CLMM 收取费用事件"""
     pool_state: str = ""
     position_nft_mint: str = ""
+    recipient_token_account_0: str = ""
+    recipient_token_account_1: str = ""
     amount_0: int = 0
     amount_1: int = 0
 
 
+@dataclass
+class RaydiumClmmLiquidityChangeEvent(DexEventBase):
+    pool_state: str = ""
+    tick: int = 0
+    tick_lower: int = 0
+    tick_upper: int = 0
+    liquidity_before: str = ""
+    liquidity_after: str = ""
+
+
+@dataclass
+class RaydiumClmmConfigChangeEvent(DexEventBase):
+    index: int = 0
+    owner: str = ""
+    protocol_fee_rate: int = 0
+    trade_fee_rate: int = 0
+    tick_spacing: int = 0
+    fund_fee_rate: int = 0
+    fund_owner: str = ""
+
+
+@dataclass
+class RaydiumClmmCreatePersonalPositionEvent(DexEventBase):
+    pool_state: str = ""
+    minter: str = ""
+    nft_owner: str = ""
+    tick_lower_index: int = 0
+    tick_upper_index: int = 0
+    liquidity: str = ""
+    deposit_amount_0: int = 0
+    deposit_amount_1: int = 0
+    deposit_amount_0_transfer_fee: int = 0
+    deposit_amount_1_transfer_fee: int = 0
+
+
+@dataclass
+class RaydiumClmmLiquidityCalculateEvent(DexEventBase):
+    pool_liquidity: str = ""
+    pool_sqrt_price_x64: str = ""
+    pool_tick: int = 0
+    calc_amount_0: int = 0
+    calc_amount_1: int = 0
+    trade_fee_owed_0: int = 0
+    trade_fee_owed_1: int = 0
+    transfer_fee_0: int = 0
+    transfer_fee_1: int = 0
+
+
+@dataclass
+class RaydiumClmmOpenLimitOrderEvent(DexEventBase):
+    pool_id: str = ""
+    limit_order: str = ""
+    zero_for_one: bool = False
+    tick_index: int = 0
+    total_amount: int = 0
+    transfer_fee: int = 0
+
+
+@dataclass
+class RaydiumClmmIncreaseLimitOrderEvent(DexEventBase):
+    pool_id: str = ""
+    limit_order: str = ""
+    zero_for_one: bool = False
+    tick_index: int = 0
+    total_amount: int = 0
+    increased_amount: int = 0
+    transfer_fee: int = 0
+
+
+@dataclass
+class RaydiumClmmDecreaseLimitOrderEvent(DexEventBase):
+    pool_id: str = ""
+    limit_order: str = ""
+    zero_for_one: bool = False
+    tick_index: int = 0
+    total_amount: int = 0
+    filled_amount: int = 0
+    settled_output_amount: int = 0
+    decreased_amount: int = 0
+
+
+@dataclass
+class RaydiumClmmSettleLimitOrderEvent(DexEventBase):
+    pool_id: str = ""
+    limit_order: str = ""
+    zero_for_one: bool = False
+    tick_index: int = 0
+    total_amount: int = 0
+    filled_amount: int = 0
+    settled_amount_out: int = 0
+
+
+@dataclass
+class RaydiumClmmUpdateRewardInfosEvent(DexEventBase):
+    reward_growth_global_x64: List[str] = field(default_factory=list)
+
+
 # ============================================================
 # Raydium CPMM 事件
 # ============================================================
@@ -1095,6 +1213,8 @@ class MeteoraDammV2RemoveLiquidityEvent(DexEventBase):
 class MeteoraDammV2InitializePoolEvent(DexEventBase):
     """Meteora DAMM v2 初始化池子事件"""
     pool: str = ""
+    position: str = ""
+    position_nft_mint: str = ""
     token_a_mint: str = ""
     token_b_mint: str = ""
     creator: str = ""
@@ -1117,6 +1237,44 @@ class MeteoraDammV2InitializePoolEvent(DexEventBase):
     pool_type: int = 0
 
 
+@dataclass
+class MeteoraDbcSwapEvent(DexEventBase):
+    """Meteora DBC 交易事件"""
+    pool: str = ""
+    config: str = ""
+    trade_direction: int = 0
+    has_referral: bool = False
+    amount_in: int = 0
+    minimum_amount_out: int = 0
+    actual_input_amount: int = 0
+    output_amount: int = 0
+    next_sqrt_price: int = 0
+    trading_fee: int = 0
+    protocol_fee: int = 0
+    referral_fee: int = 0
+    current_timestamp: int = 0
+
+
+@dataclass
+class MeteoraDbcInitializePoolEvent(DexEventBase):
+    """Meteora DBC 初始化池子事件"""
+    pool: str = ""
+    config: str = ""
+    creator: str = ""
+    base_mint: str = ""
+    pool_type: int = 0
+    activation_point: int = 0
+
+
+@dataclass
+class MeteoraDbcCurveCompleteEvent(DexEventBase):
+    """Meteora DBC 曲线完成事件"""
+    pool: str = ""
+    config: str = ""
+    base_reserve: int = 0
+    quote_reserve: int = 0
+
+
 # ============================================================
 # RaydiumLaunchlab 事件
 # ============================================================
@@ -1412,6 +1570,8 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             is_mayhem_mode=_get_bool(data, "is_mayhem_mode"),
             is_cashback_enabled=_get_bool(data, "is_cashback_enabled"),
             quote_mint=_get_str(data, "quote_mint"),
+            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"),
         )
 
@@ -1435,6 +1595,8 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             is_mayhem_mode=_get_bool(data, "is_mayhem_mode"),
             is_cashback_enabled=_get_bool(data, "is_cashback_enabled"),
             quote_mint=_get_str(data, "quote_mint"),
+            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"),
             mint_authority=_get_str(data, "mint_authority"),
             associated_bonding_curve=_get_str(data, "associated_bonding_curve"),
@@ -1663,6 +1825,10 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             position_nft_mint=_get_str(data, "position_nft_mint"),
             user=_get_str(data, "user"),
             liquidity=_get_str(data, "liquidity"),
+            amount_0=_get_int(data, "amount_0"),
+            amount_1=_get_int(data, "amount_1"),
+            amount_0_transfer_fee=_get_int(data, "amount_0_transfer_fee"),
+            amount_1_transfer_fee=_get_int(data, "amount_1_transfer_fee"),
             amount0_max=_get_int(data, "amount0_max"),
             amount1_max=_get_int(data, "amount1_max"),
         )
@@ -1673,6 +1839,13 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             position_nft_mint=_get_str(data, "position_nft_mint"),
             user=_get_str(data, "user"),
             liquidity=_get_str(data, "liquidity"),
+            decrease_amount_0=_get_int(data, "decrease_amount_0"),
+            decrease_amount_1=_get_int(data, "decrease_amount_1"),
+            fee_amount_0=_get_int(data, "fee_amount_0"),
+            fee_amount_1=_get_int(data, "fee_amount_1"),
+            reward_amounts=list(data.get("reward_amounts", [])) if isinstance(data, dict) else [],
+            transfer_fee_0=_get_int(data, "transfer_fee_0"),
+            transfer_fee_1=_get_int(data, "transfer_fee_1"),
             amount0_min=_get_int(data, "amount0_min"),
             amount1_min=_get_int(data, "amount1_min"),
         )
@@ -1686,6 +1859,9 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             tick_spacing=_get_int(data, "tick_spacing"),
             fee_rate=_get_int(data, "fee_rate"),
             sqrt_price_x64=_get_str(data, "sqrt_price_x64"),
+            tick=_get_int(data, "tick"),
+            token_vault_0=_get_str(data, "token_vault_0"),
+            token_vault_1=_get_str(data, "token_vault_1"),
             open_time=_get_int(data, "open_time"),
         )
     if event_type == EventType.RAYDIUM_CLMM_OPEN_POSITION:
@@ -1720,9 +1896,110 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             metadata=meta,
             pool_state=_get_str(data, "pool_state"),
             position_nft_mint=_get_str(data, "position_nft_mint"),
+            recipient_token_account_0=_get_str(data, "recipient_token_account_0"),
+            recipient_token_account_1=_get_str(data, "recipient_token_account_1"),
             amount_0=_get_int(data, "amount_0"),
             amount_1=_get_int(data, "amount_1"),
         )
+    if event_type == EventType.RAYDIUM_CLMM_LIQUIDITY_CHANGE:
+        return RaydiumClmmLiquidityChangeEvent(
+            metadata=meta,
+            pool_state=_get_str(data, "pool_state"),
+            tick=_get_int(data, "tick"),
+            tick_lower=_get_int(data, "tick_lower"),
+            tick_upper=_get_int(data, "tick_upper"),
+            liquidity_before=_get_str(data, "liquidity_before"),
+            liquidity_after=_get_str(data, "liquidity_after"),
+        )
+    if event_type == EventType.RAYDIUM_CLMM_CONFIG_CHANGE:
+        return RaydiumClmmConfigChangeEvent(
+            metadata=meta,
+            index=_get_int(data, "index"),
+            owner=_get_str(data, "owner"),
+            protocol_fee_rate=_get_int(data, "protocol_fee_rate"),
+            trade_fee_rate=_get_int(data, "trade_fee_rate"),
+            tick_spacing=_get_int(data, "tick_spacing"),
+            fund_fee_rate=_get_int(data, "fund_fee_rate"),
+            fund_owner=_get_str(data, "fund_owner"),
+        )
+    if event_type == EventType.RAYDIUM_CLMM_CREATE_PERSONAL_POSITION:
+        return RaydiumClmmCreatePersonalPositionEvent(
+            metadata=meta,
+            pool_state=_get_str(data, "pool_state"),
+            minter=_get_str(data, "minter"),
+            nft_owner=_get_str(data, "nft_owner"),
+            tick_lower_index=_get_int(data, "tick_lower_index"),
+            tick_upper_index=_get_int(data, "tick_upper_index"),
+            liquidity=_get_str(data, "liquidity"),
+            deposit_amount_0=_get_int(data, "deposit_amount_0"),
+            deposit_amount_1=_get_int(data, "deposit_amount_1"),
+            deposit_amount_0_transfer_fee=_get_int(data, "deposit_amount_0_transfer_fee"),
+            deposit_amount_1_transfer_fee=_get_int(data, "deposit_amount_1_transfer_fee"),
+        )
+    if event_type == EventType.RAYDIUM_CLMM_LIQUIDITY_CALCULATE:
+        return RaydiumClmmLiquidityCalculateEvent(
+            metadata=meta,
+            pool_liquidity=_get_str(data, "pool_liquidity"),
+            pool_sqrt_price_x64=_get_str(data, "pool_sqrt_price_x64"),
+            pool_tick=_get_int(data, "pool_tick"),
+            calc_amount_0=_get_int(data, "calc_amount_0"),
+            calc_amount_1=_get_int(data, "calc_amount_1"),
+            trade_fee_owed_0=_get_int(data, "trade_fee_owed_0"),
+            trade_fee_owed_1=_get_int(data, "trade_fee_owed_1"),
+            transfer_fee_0=_get_int(data, "transfer_fee_0"),
+            transfer_fee_1=_get_int(data, "transfer_fee_1"),
+        )
+    if event_type == EventType.RAYDIUM_CLMM_OPEN_LIMIT_ORDER:
+        return RaydiumClmmOpenLimitOrderEvent(
+            metadata=meta,
+            pool_id=_get_str(data, "pool_id"),
+            limit_order=_get_str(data, "limit_order"),
+            zero_for_one=_get_bool(data, "zero_for_one"),
+            tick_index=_get_int(data, "tick_index"),
+            total_amount=_get_int(data, "total_amount"),
+            transfer_fee=_get_int(data, "transfer_fee"),
+        )
+    if event_type == EventType.RAYDIUM_CLMM_INCREASE_LIMIT_ORDER:
+        return RaydiumClmmIncreaseLimitOrderEvent(
+            metadata=meta,
+            pool_id=_get_str(data, "pool_id"),
+            limit_order=_get_str(data, "limit_order"),
+            zero_for_one=_get_bool(data, "zero_for_one"),
+            tick_index=_get_int(data, "tick_index"),
+            total_amount=_get_int(data, "total_amount"),
+            increased_amount=_get_int(data, "increased_amount"),
+            transfer_fee=_get_int(data, "transfer_fee"),
+        )
+    if event_type == EventType.RAYDIUM_CLMM_DECREASE_LIMIT_ORDER:
+        return RaydiumClmmDecreaseLimitOrderEvent(
+            metadata=meta,
+            pool_id=_get_str(data, "pool_id"),
+            limit_order=_get_str(data, "limit_order"),
+            zero_for_one=_get_bool(data, "zero_for_one"),
+            tick_index=_get_int(data, "tick_index"),
+            total_amount=_get_int(data, "total_amount"),
+            filled_amount=_get_int(data, "filled_amount"),
+            settled_output_amount=_get_int(data, "settled_output_amount"),
+            decreased_amount=_get_int(data, "decreased_amount"),
+        )
+    if event_type == EventType.RAYDIUM_CLMM_SETTLE_LIMIT_ORDER:
+        return RaydiumClmmSettleLimitOrderEvent(
+            metadata=meta,
+            pool_id=_get_str(data, "pool_id"),
+            limit_order=_get_str(data, "limit_order"),
+            zero_for_one=_get_bool(data, "zero_for_one"),
+            tick_index=_get_int(data, "tick_index"),
+            total_amount=_get_int(data, "total_amount"),
+            filled_amount=_get_int(data, "filled_amount"),
+            settled_amount_out=_get_int(data, "settled_amount_out"),
+        )
+    if event_type == EventType.RAYDIUM_CLMM_UPDATE_REWARD_INFOS:
+        raw = data.get("reward_growth_global_x64", [])
+        rewards = [str(v) for v in raw] if isinstance(raw, list) else []
+        return RaydiumClmmUpdateRewardInfosEvent(
+            metadata=meta,
+            reward_growth_global_x64=rewards,
+        )
 
     if event_type == EventType.RAYDIUM_CPMM_SWAP:
         return RaydiumCpmmSwapEvent(
@@ -1821,6 +2098,20 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             token_a_transfer_fee=_get_int(data, "token_a_transfer_fee"),
             token_b_transfer_fee=_get_int(data, "token_b_transfer_fee"),
         )
+    if event_type == EventType.ORCA_WHIRLPOOL_POOL_INITIALIZED:
+        return OrcaWhirlpoolPoolInitializedEvent(
+            metadata=meta,
+            whirlpool=_get_str(data, "whirlpool"),
+            whirlpools_config=_get_str(data, "whirlpools_config"),
+            token_mint_a=_get_str(data, "token_mint_a"),
+            token_mint_b=_get_str(data, "token_mint_b"),
+            tick_spacing=_get_int(data, "tick_spacing"),
+            token_program_a=_get_str(data, "token_program_a"),
+            token_program_b=_get_str(data, "token_program_b"),
+            decimals_a=_get_int(data, "decimals_a"),
+            decimals_b=_get_int(data, "decimals_b"),
+            initial_sqrt_price=_get_str(data, "initial_sqrt_price"),
+        )
 
     # RaydiumLaunchlab events
     if event_type == EventType.RAYDIUM_LAUNCHLAB_TRADE:

sol_parser/grpc_client.py

@@ -449,10 +449,11 @@ 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,
         )
-        from .parser import parse_log_optimized
+        from .parser import parse_invoke_info, parse_log_optimized_with_program_id, parse_program_complete_info
         from .log_instr_dedup import dedupe_log_instruction_events
         from .pumpfun_fee_enrich import enrich_pumpfun_same_tx_post_merge
         from .grpc_types import EventType
@@ -466,9 +467,16 @@ 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:
-            ev = parse_log_optimized(
+            invoke = parse_invoke_info(log)
+            if invoke is not None:
+                program_id, depth = invoke
+                del active_program_stack[max(0, depth - 1):]
+                active_program_stack.append(program_id)
+
+            ev = parse_log_optimized_with_program_id(
                 log,
                 signature,
                 slot,
@@ -476,14 +484,25 @@ 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,
             )
             if ev is None:
+                completed = parse_program_complete_info(log)
+                if completed is not None:
+                    for i in range(len(active_program_stack) - 1, -1, -1):
+                        if active_program_stack[i] == completed:
+                            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:
+                for i in range(len(active_program_stack) - 1, -1, -1):
+                    if active_program_stack[i] == completed:
+                        del active_program_stack[i:]
+                        break
 
         enrich_dex_events_with_subscribe_tx_info(instruction_events, info)
         enrich_dex_events_with_subscribe_tx_info(log_events, info)

sol_parser/grpc_instruction_parser.py

@@ -11,13 +11,12 @@ from .account_dispatcher import fill_accounts_with_owned_keys, fill_data
 from .event_types import DexEvent
 from .grpc_types import (
     EventMetadata,
-    EventType,
     EventTypeFilter,
-    IncludeOnlyFilter,
     SubscribeUpdateTransactionInfo,
+    event_type_filter_allows_instruction_parsing,
 )
 from .inner_instruction_parser import parse_inner_instruction
-from .instructions import parse_instruction_unified
+from .instructions import parse_inner_compiled_instruction_if_supported, parse_instruction_unified
 from .merger import merge_dex_events
 from .pumpfun_fee_enrich import enrich_pumpfun_same_tx_post_merge
 
@@ -118,18 +117,11 @@ def should_parse_instructions(filter: Optional[EventTypeFilter]) -> bool:
     if filter is None:
         return True
     inc = getattr(filter, "include_only", None)
-    if inc is None or not inc:
+    if inc is None:
         return True
-    need = {
-        EventType.PUMP_FUN_MIGRATE,
-        EventType.METEORA_DAMM_V2_SWAP,
-        EventType.METEORA_DAMM_V2_ADD_LIQUIDITY,
-        EventType.METEORA_DAMM_V2_CREATE_POSITION,
-        EventType.METEORA_DAMM_V2_CLOSE_POSITION,
-        EventType.METEORA_DAMM_V2_REMOVE_LIQUIDITY,
-        EventType.METEORA_DAMM_V2_INITIALIZE_POOL,
-    }
-    return any(t in need for t in inc)
+    if not inc:
+        return False
+    return event_type_filter_allows_instruction_parsing(list(inc))
 
 
 def merge_instruction_events(
@@ -153,7 +145,7 @@ def merge_instruction_events(
                 pending_outer = None
                 if po_idx == outer_idx:
                     merge_dex_events(mut_outer, event)
-                    result.append(mut_outer)
+                    pending_outer = (outer_idx, mut_outer)
                 else:
                     result.append(mut_outer)
                     result.append(event)
@@ -228,8 +220,6 @@ def parse_instructions_enhanced_from_parsed(
         return []
 
     grpc_us = int(time.time() * 1_000_000) if grpc_recv_us is None else grpc_recv_us
-    f: EventTypeFilter = filter if filter is not None else IncludeOnlyFilter([])
-
     try:
         from . import solana_storage_pb2 as sol_pb
     except ImportError:
@@ -279,7 +269,7 @@ def parse_instructions_enhanced_from_parsed(
         acct_bytes = bytes(ix.accounts)
         accounts = [get_key_b58(b) for b in acct_bytes]
         ev = parse_instruction_unified(
-            data, accounts, signature, slot, tx_index, block_time_us, grpc_us, f, pid
+            data, accounts, signature, slot, tx_index, block_time_us, grpc_us, filter, pid
         )
         if ev:
             result.append((i, None, ev))
@@ -289,11 +279,22 @@ def parse_instructions_enhanced_from_parsed(
         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),
-                f,
+                filter,
                 is_created_buy,
             )
             if ev: