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

sol_parser/__init__.py

@@ -152,6 +152,11 @@ from .event_types import (
     MeteoraDammV2AddLiquidityEvent,
     MeteoraDammV2RemoveLiquidityEvent,
     MeteoraDammV2InitializePoolEvent,
+    MeteoraDammV2DynamicFeeParameters,
+    MeteoraDammV2UpdateDelegatePermissionEvent,
+    MeteoraDammV2WithdrawDeadLiquidityRewardEvent,
+    MeteoraDammV2CreateConfigEvent,
+    MeteoraDammV2CreateDynamicConfigEvent,
     MeteoraDbcCurveCompleteEvent,
     MeteoraDbcInitializePoolEvent,
     MeteoraDbcSwapEvent,
@@ -432,6 +437,11 @@ __all__ = [
     "MeteoraDammV2AddLiquidityEvent",
     "MeteoraDammV2RemoveLiquidityEvent",
     "MeteoraDammV2InitializePoolEvent",
+    "MeteoraDammV2DynamicFeeParameters",
+    "MeteoraDammV2UpdateDelegatePermissionEvent",
+    "MeteoraDammV2WithdrawDeadLiquidityRewardEvent",
+    "MeteoraDammV2CreateConfigEvent",
+    "MeteoraDammV2CreateDynamicConfigEvent",
     "MeteoraDbcCurveCompleteEvent",
     "MeteoraDbcInitializePoolEvent",
     "MeteoraDbcSwapEvent",

sol_parser/account_dispatcher.py

@@ -209,3 +209,82 @@ def fill_data(
         return
     is_pump = raw[9] != 0
     setattr(data, "is_pump_pool", is_pump)
+
+
+def _account_index(transaction_pb: Any, meta_pb: Any, account: str) -> Optional[int]:
+    if not account or account == "11111111111111111111111111111111":
+        return None
+    msg = getattr(transaction_pb, "message", None)
+    if msg is None:
+        return None
+    keys: List[str] = []
+    for b in getattr(msg, "account_keys", []) or []:
+        raw = bytes(b) if not isinstance(b, (bytes, bytearray)) else bytes(b)
+        if len(raw) == 32:
+            keys.append(base58.b58encode(raw).decode("ascii"))
+    for b in getattr(meta_pb, "loaded_writable_addresses", []) or []:
+        raw = bytes(b) if not isinstance(b, (bytes, bytearray)) else bytes(b)
+        if len(raw) == 32:
+            keys.append(base58.b58encode(raw).decode("ascii"))
+    for b in getattr(meta_pb, "loaded_readonly_addresses", []) or []:
+        raw = bytes(b) if not isinstance(b, (bytes, bytearray)) else bytes(b)
+        if len(raw) == 32:
+            keys.append(base58.b58encode(raw).decode("ascii"))
+    try:
+        return keys.index(account)
+    except ValueError:
+        return None
+
+
+def _token_balance_raw(t: Any) -> int:
+    ui = getattr(t, "ui_token_amount", None)
+    if ui is None:
+        return 0
+    amt = getattr(ui, "amount", None)
+    if amt is None:
+        return 0
+    try:
+        return int(str(amt))
+    except Exception:
+        return 0
+
+
+def fill_token_balances(event: DexEvent, meta_pb: Any, transaction_pb: Any) -> None:
+    """对齐 Rust ``common_filler::fill_token_balances``（PumpFun trade 用户余额）。"""
+    if meta_pb is None or transaction_pb is None:
+        return
+    if event.type not in (
+        EventType.PUMP_FUN_TRADE,
+        EventType.PUMP_FUN_BUY,
+        EventType.PUMP_FUN_SELL,
+        EventType.PUMP_FUN_BUY_EXACT_SOL_IN,
+    ):
+        return
+    trade = event.data
+    user = getattr(trade, "user", "") or ""
+    associated_user = getattr(trade, "associated_user", "") or ""
+    user_idx = _account_index(transaction_pb, meta_pb, user)
+    if user_idx is not None:
+        pre_balances = list(getattr(meta_pb, "pre_balances", []) or [])
+        post_balances = list(getattr(meta_pb, "post_balances", []) or [])
+        if user_idx < len(pre_balances):
+            trade.pre_sol_balance = int(pre_balances[user_idx])
+        if user_idx < len(post_balances):
+            trade.post_sol_balance = int(post_balances[user_idx])
+    token_idx = _account_index(transaction_pb, meta_pb, associated_user)
+    if token_idx is None:
+        return
+    token_idx_u32 = token_idx
+    pre = None
+    post = None
+    for bal in getattr(meta_pb, "pre_token_balances", []) or []:
+        if int(getattr(bal, "account_index", -1)) == token_idx_u32:
+            pre = _token_balance_raw(bal)
+            break
+    for bal in getattr(meta_pb, "post_token_balances", []) or []:
+        if int(getattr(bal, "account_index", -1)) == token_idx_u32:
+            post = _token_balance_raw(bal)
+            break
+    if pre is not None or post is not None:
+        trade.pre_token_balance = pre if pre is not None else 0
+        trade.post_token_balance = post if post is not None else 0

sol_parser/account_fillers/meteora.py

@@ -54,8 +54,16 @@ def fill_pools_remove_liquidity_accounts(_e: Any, _get: AccountGetter) -> None:
     pass
 
 
-def fill_dlmm_swap_accounts(_e: Any, _get: AccountGetter) -> None:
-    pass
+def fill_dlmm_swap_accounts(e: Any, get: AccountGetter) -> None:
+    z = "11111111111111111111111111111111"
+    if not getattr(e, "user_token_in", "") or e.user_token_in == z:
+        e.user_token_in = get(4)
+    if not getattr(e, "user_token_out", "") or e.user_token_out == z:
+        e.user_token_out = get(5)
+    if not getattr(e, "token_x_mint", "") or e.token_x_mint == z:
+        e.token_x_mint = get(6)
+    if not getattr(e, "token_y_mint", "") or e.token_y_mint == z:
+        e.token_y_mint = get(7)
 
 
 def fill_dlmm_add_liquidity_accounts(_e: Any, _get: AccountGetter) -> None:

sol_parser/account_fillers/raydium.py

@@ -77,8 +77,9 @@ def fill_clmm_close_position_accounts(e: RaydiumClmmClosePositionEvent, get: Acc
         e.position_nft_mint = get(1)
 
 
-def fill_cpmm_swap_accounts(_e: RaydiumCpmmSwapEvent, _get: AccountGetter) -> None:
-    pass
+def fill_cpmm_swap_accounts(e: RaydiumCpmmSwapEvent, get: AccountGetter) -> None:
+    if _empty(e.pool_id):
+        e.pool_id = get(3)
 
 
 def fill_cpmm_deposit_accounts(e: RaydiumCpmmDepositEvent, get: AccountGetter) -> None:

sol_parser/account_fillers/raydium_launchlab.py

@@ -7,6 +7,7 @@ from typing import Callable
 from ..event_types import RaydiumLaunchlabPoolCreateEvent, RaydiumLaunchlabTradeEvent
 
 Z = "11111111111111111111111111111111"
+RAYDIUM_LAUNCHLAB_PROGRAM_ID = "LanMV9sAd7wArD4vJFi2qDdfnVhFxYSUg6eADduJ3uj"
 
 
 def _empty(s: str) -> bool:
@@ -21,6 +22,26 @@ def fill_trade_accounts(e: RaydiumLaunchlabTradeEvent, get: AccountGetter) -> No
         e.user = get(0)
     if _empty(e.pool_state):
         e.pool_state = get(4)
+    if _empty(e.global_config):
+        e.global_config = get(2)
+    if _empty(e.platform_config):
+        e.platform_config = get(3)
+    if _empty(e.user_base_token):
+        e.user_base_token = get(5)
+    if _empty(e.user_quote_token):
+        e.user_quote_token = get(6)
+    if _empty(e.base_vault):
+        e.base_vault = get(7)
+    if _empty(e.quote_vault):
+        e.quote_vault = get(8)
+    if _empty(e.base_mint):
+        e.base_mint = get(9)
+    if _empty(e.quote_mint):
+        e.quote_mint = get(10)
+    if _empty(e.base_token_program):
+        e.base_token_program = get(11)
+    if _empty(e.quote_token_program):
+        e.quote_token_program = get(12)
 
 
 def fill_pool_create_accounts(e: RaydiumLaunchlabPoolCreateEvent, get: AccountGetter) -> None:
@@ -28,3 +49,32 @@ def fill_pool_create_accounts(e: RaydiumLaunchlabPoolCreateEvent, get: AccountGe
         e.pool_state = get(5)
     if _empty(e.creator):
         e.creator = get(1)
+    if _empty(e.payer):
+        e.payer = get(0)
+    if _empty(e.global_config):
+        e.global_config = get(2)
+    if _empty(e.platform_config):
+        e.platform_config = get(3)
+    if _empty(e.base_mint):
+        e.base_mint = get(6)
+    if _empty(e.quote_mint):
+        e.quote_mint = get(7)
+    if _empty(e.base_vault):
+        e.base_vault = get(8)
+    if _empty(e.quote_vault):
+        e.quote_vault = get(9)
+    # initialize / initialize_v2 use token-program indices 11-12;
+    # initialize_with_token_2022 uses 10-11 (detect via program id at end).
+    try:
+        if get(17) == RAYDIUM_LAUNCHLAB_PROGRAM_ID:
+            bi, qi = 11, 12
+        elif get(14) == RAYDIUM_LAUNCHLAB_PROGRAM_ID:
+            bi, qi = 10, 11
+        else:
+            return
+    except Exception:
+        return
+    if _empty(e.base_token_program):
+        e.base_token_program = get(bi)
+    if _empty(e.quote_token_program):
+        e.quote_token_program = get(qi)

sol_parser/accounts/__init__.py

@@ -42,10 +42,15 @@ TOKEN_ACCOUNT_SIZE = 165
 NONCE_ACCOUNT_SIZE = 80
 PUMPFUN_GLOBAL_BODY = 1037
 PUMPFUN_BONDING_CURVE_BODY = 107
+PUMPFUN_BONDING_CURVE_CREATOR_FEE_BODY = 116
+PUMPFUN_BONDING_CURVE_HOLDER_REWARD_BODY = 117
 PUMPFUN_GLOBAL_VOLUME_ACCUMULATOR_BODY = 536
 PUMPFUN_USER_VOLUME_ACCUMULATOR_BODY = 98
 GLOBAL_CONFIG_BODY = 634
-POOL_BODY = 244
+POOL_LEGACY_BODY = 244
+POOL_BOOST_BODY = 253
+POOL_CREATOR_FEE_BODY = 262
+POOL_BODY = 263
 MAX_PUMPFUN_FEE_TIERS = 64
 MAX_PUMPFUN_SHAREHOLDERS = 64
 
@@ -483,6 +488,12 @@ def _parse_pumpfun_bonding_curve_fast(
     is_cashback_coin = data[o] != 0
     o += 1
     quote_mint = read_pubkey_fast(data, o)
+    o += 32
+    creator_fee_bps = read_u64_fast(data, o) if o + 8 <= len(data) else 0
+    o += 8
+    can_edit_creator_fee = data[o] != 0 if o < len(data) else False
+    o += 1
+    is_holder_reward = data[o] != 0 if o < len(data) else False
     return _account_event(
         EventType.ACCOUNT_PUMP_FUN_BONDING_CURVE,
         {
@@ -499,6 +510,9 @@ def _parse_pumpfun_bonding_curve_fast(
                 "is_mayhem_mode": is_mayhem_mode,
                 "is_cashback_coin": is_cashback_coin,
                 "quote_mint": quote_mint,
+                "creator_fee_bps": creator_fee_bps,
+                "can_edit_creator_fee": can_edit_creator_fee,
+                "is_holder_reward": is_holder_reward,
             },
         },
     )
@@ -752,6 +766,18 @@ def _parse_pumpswap_pool_fast(account: AccountData, metadata: EventMetadata) ->
     o += 32
     is_mayhem = data[o] != 0
     is_cashback = data[o + 1] != 0
+    o += 2
+    virtual_quote_reserves = (
+        int.from_bytes(data[o : o + 16], "little", signed=True)
+        if len(data) >= POOL_BOOST_BODY
+        else 0
+    )
+    o += 16
+    creator_fee_bps = read_u64_fast(data, o) if o + 8 <= len(data) else 0
+    o += 8
+    can_edit_creator_fee = data[o] != 0 if o < len(data) else False
+    o += 1
+    is_holder_reward = data[o] != 0 if o < len(data) else False
     return _account_event(
         EventType.ACCOUNT_PUMP_SWAP_POOL,
         {
@@ -770,6 +796,10 @@ def _parse_pumpswap_pool_fast(account: AccountData, metadata: EventMetadata) ->
                 "coin_creator": coin_creator,
                 "is_mayhem_mode": is_mayhem,
                 "is_cashback_coin": is_cashback,
+                "virtual_quote_reserves": virtual_quote_reserves,
+                "creator_fee_bps": creator_fee_bps,
+                "can_edit_creator_fee": can_edit_creator_fee,
+                "is_holder_reward": is_holder_reward,
             },
         },
     )
@@ -807,6 +837,13 @@ def parse_pumpfun_bonding_curve(
 ) -> Optional[DexEvent]:
     if len(account.data) < 8 + PUMPFUN_BONDING_CURVE_BODY:
         return None
+    body_len = len(account.data) - 8
+    if (
+        body_len != PUMPFUN_BONDING_CURVE_BODY
+        and body_len != PUMPFUN_BONDING_CURVE_CREATOR_FEE_BODY
+        and body_len < PUMPFUN_BONDING_CURVE_HOLDER_REWARD_BODY
+    ):
+        return None
     if not has_discriminator(account.data, _DISC_PUMPFUN_BONDING_CURVE):
         return None
     return _parse_pumpfun_bonding_curve_fast(account, metadata)
@@ -861,7 +898,15 @@ def parse_pumpswap_global_config(account: AccountData, metadata: EventMetadata)
 
 
 def parse_pumpswap_pool(account: AccountData, metadata: EventMetadata) -> Optional[DexEvent]:
-    if len(account.data) < 8 + POOL_BODY:
+    if len(account.data) < 8 + POOL_LEGACY_BODY:
+        return None
+    body_len = len(account.data) - 8
+    if (
+        body_len != POOL_LEGACY_BODY
+        and body_len != POOL_BOOST_BODY
+        and body_len != POOL_CREATOR_FEE_BODY
+        and body_len < POOL_BODY
+    ):
         return None
     if not has_discriminator(account.data, _DISC_POOL):
         return None