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

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 = ""
@@ -207,7 +214,11 @@ 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
+    creator_fee_bps: int = 0
+    is_holder_reward: bool = False
 
 
 @dataclass
@@ -233,7 +244,11 @@ 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
+    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
@@ -414,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 = ""
@@ -457,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 = ""
@@ -495,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
@@ -698,6 +731,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
 
@@ -709,6 +746,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
 
@@ -753,6 +797,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
 
 
@@ -761,10 +808,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 事件
 # ============================================================
@@ -880,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
@@ -1024,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
@@ -1037,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 = ""
@@ -1077,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
@@ -1090,12 +1257,18 @@ 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
 class MeteoraDammV2InitializePoolEvent(DexEventBase):
     """Meteora DAMM v2 初始化池子事件"""
     pool: str = ""
+    position: str = ""
+    position_nft_mint: str = ""
     token_a_mint: str = ""
     token_b_mint: str = ""
     creator: str = ""
@@ -1118,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 交易事件"""
@@ -1170,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
@@ -1178,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
@@ -1254,6 +1502,10 @@ TypedDexEvent = Union[
     MeteoraDammV2AddLiquidityEvent,
     MeteoraDammV2RemoveLiquidityEvent,
     MeteoraDammV2InitializePoolEvent,
+    MeteoraDammV2UpdateDelegatePermissionEvent,
+    MeteoraDammV2WithdrawDeadLiquidityRewardEvent,
+    MeteoraDammV2CreateConfigEvent,
+    MeteoraDammV2CreateDynamicConfigEvent,
     RaydiumLaunchlabTradeEvent,
     RaydiumLaunchlabPoolCreateEvent,
     RaydiumLaunchlabMigrateAmmEvent,
@@ -1290,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)
@@ -1398,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"),
@@ -1405,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"),
@@ -1451,7 +1718,11 @@ 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"),
+            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:
@@ -1474,7 +1745,11 @@ 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"),
+            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,
@@ -1540,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"),
@@ -1583,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"),
@@ -1621,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:
@@ -1678,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(
@@ -1702,6 +2024,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"),
         )
@@ -1712,6 +2038,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"),
         )
@@ -1725,6 +2058,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:
@@ -1759,9 +2095,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(
@@ -1860,6 +2297,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:
@@ -1872,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:
@@ -1880,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: