sol-parser-sdk-python 0.4.4__py3-none-any.whl → 0.4.5__py3-none-any.whl

sol_parser/dex_parsers.py

@@ -73,6 +73,41 @@ def _pub(b: bytes, o: int) -> str:
     return base58.b58encode(b[o : o + 32]).decode()
 
 
+def _optional_u64(b: bytes, o: List[int]) -> int:
+    if o[0] + 8 > len(b):
+        return 0
+    v = _u64le(b, o[0])
+    o[0] += 8
+    return v
+
+
+def _optional_pub(b: bytes, o: List[int]) -> str:
+    if o[0] + 32 > len(b):
+        return Z
+    v = _pub(b, o[0])
+    o[0] += 32
+    return v
+
+
+def _trade_shareholders(b: bytes, o: List[int]) -> Optional[List[PumpFeesShareholder]]:
+    if o[0] + 4 > len(b):
+        return []
+    n = _u32le(b, o[0])
+    if n > 64:
+        return None
+    o[0] += 4
+    if o[0] + n * 34 > len(b):
+        return None
+    out: List[PumpFeesShareholder] = []
+    for _ in range(n):
+        address = _pub(b, o[0])
+        o[0] += 32
+        share_bps = _u16le(b, o[0])
+        o[0] += 2
+        out.append(PumpFeesShareholder(address=address, share_bps=share_bps))
+    return out
+
+
 def _bool(b: bytes, o: int) -> bool:
     return b[o] == 1
 
@@ -188,6 +223,17 @@ def parse_trade_from_data(data: bytes, meta: dict, is_created_buy: bool) -> DexE
     cb_bps = _u64le(data, o) if o + 8 <= len(data) else 0
     o += 8
     cb = _u64le(data, o) if o + 8 <= len(data) else 0
+    o += 8
+    tail = [o]
+    buyback_fee_basis_points = _optional_u64(data, tail)
+    buyback_fee = _optional_u64(data, tail)
+    shareholders = _trade_shareholders(data, tail)
+    if shareholders is None:
+        return DexEvent()
+    quote_mint = _optional_pub(data, tail)
+    quote_amount = _optional_u64(data, tail)
+    virtual_quote_reserves = _optional_u64(data, tail)
+    real_quote_reserves = _optional_u64(data, tail)
     
     event_data = PumpFunTradeEvent(
         metadata=_make_meta(meta),
@@ -217,6 +263,13 @@ def parse_trade_from_data(data: bytes, meta: dict, is_created_buy: bool) -> DexE
         mayhem_mode=mm,
         cashback_fee_basis_points=cb_bps,
         cashback=cb,
+        buyback_fee_basis_points=buyback_fee_basis_points,
+        buyback_fee=buyback_fee,
+        shareholders=shareholders,
+        quote_mint=quote_mint,
+        quote_amount=quote_amount,
+        virtual_quote_reserves=virtual_quote_reserves,
+        real_quote_reserves=real_quote_reserves,
         is_cashback_coin=cb_bps > 0,
         bonding_curve=Z,
         associated_bonding_curve=Z,
@@ -228,7 +281,7 @@ def parse_trade_from_data(data: bytes, meta: dict, is_created_buy: bool) -> DexE
         return DexEvent(type=EventType.PUMP_FUN_BUY, data=event_data)
     if ix_name in ("sell", "sell_v2"):
         return DexEvent(type=EventType.PUMP_FUN_SELL, data=event_data)
-    if ix_name in ("buy_exact_sol_in", "buy_exact_quote_in_v2"):
+    if ix_name in ("buy_exact_sol_in", "buy_exact_quote_in", "buy_exact_quote_in_v2"):
         return DexEvent(type=EventType.PUMP_FUN_BUY_EXACT_SOL_IN, data=event_data)
     return DexEvent(type=EventType.PUMP_FUN_TRADE, data=event_data)
 

sol_parser/event_types.py

@@ -144,12 +144,45 @@ class PumpFunTradeEvent(DexEventBase):
     mayhem_mode: bool = False
     cashback_fee_basis_points: int = 0
     cashback: int = 0
+    buyback_fee_basis_points: int = 0
+    buyback_fee: int = 0
+    shareholders: List[PumpFeesShareholder] = field(default_factory=list)
+    quote_mint: str = ""
+    quote_amount: int = 0
+    virtual_quote_reserves: int = 0
+    real_quote_reserves: int = 0
     is_cashback_coin: bool = False
+    amount: int = 0
+    max_sol_cost: int = 0
+    min_sol_output: int = 0
+    spendable_sol_in: int = 0
+    spendable_quote_in: int = 0
+    min_tokens_out: int = 0
+    global_account: str = ""
     bonding_curve: str = ""
+    bonding_curve_v2: str = ""
     associated_bonding_curve: str = ""
+    associated_user: str = ""
+    system_program: str = ""
     token_program: str = ""
+    quote_token_program: str = ""
+    associated_token_program: str = ""
     creator_vault: str = ""
-    #: 第 17 个账户（索引 16），部分交易存在（Creator Rewards / fee 等）；由 ``fill_trade_accounts`` 从指令账户填充。
+    associated_quote_fee_recipient: str = ""
+    buyback_fee_recipient: str = ""
+    associated_quote_buyback_fee_recipient: str = ""
+    associated_quote_bonding_curve: str = ""
+    associated_quote_user: str = ""
+    associated_creator_vault: str = ""
+    sharing_config: str = ""
+    event_authority: str = ""
+    program: str = ""
+    global_volume_accumulator: str = ""
+    user_volume_accumulator: str = ""
+    associated_user_volume_accumulator: str = ""
+    fee_config: str = ""
+    fee_program: str = ""
+    #: Legacy fallback alias for the last post-upgrade extra account. Prefer structured fields above.
     extra_instruction_account: str = ""
 
 
@@ -384,6 +417,9 @@ class PumpSwapBuyEvent(DexEventBase):
     coin_creator_vault_authority: str = ""
     base_token_program: str = ""
     quote_token_program: str = ""
+    pool_v2: str = ""
+    fee_recipient: str = ""
+    fee_recipient_quote_token_account: str = ""
     is_pump_pool: bool = False
 
 
@@ -423,6 +459,9 @@ class PumpSwapSellEvent(DexEventBase):
     coin_creator_vault_authority: str = ""
     base_token_program: str = ""
     quote_token_program: str = ""
+    pool_v2: str = ""
+    fee_recipient: str = ""
+    fee_recipient_quote_token_account: str = ""
     is_pump_pool: bool = False
 
 
@@ -1229,6 +1268,24 @@ def _get_dict_any(m: dict, key: str) -> Optional[Dict[str, Any]]:
     return v if isinstance(v, dict) else None
 
 
+def _get_pump_shareholders(m: dict, key: str) -> List[PumpFeesShareholder]:
+    v = m.get(key, [])
+    if not isinstance(v, (list, tuple)):
+        return []
+    out: List[PumpFeesShareholder] = []
+    for item in v:
+        if isinstance(item, PumpFeesShareholder):
+            out.append(item)
+        elif isinstance(item, dict):
+            out.append(
+                PumpFeesShareholder(
+                    address=_get_str(item, "address"),
+                    share_bps=_get_int(item, "share_bps"),
+                )
+            )
+    return out
+
+
 def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
     """将旧版 DexEvent dict 转换为强类型事件
     
@@ -1290,11 +1347,45 @@ 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"),
+            shareholders=_get_pump_shareholders(data, "shareholders"),
+            quote_mint=_get_str(data, "quote_mint"),
+            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"),
             is_cashback_coin=_get_bool(data, "is_cashback_coin"),
+            amount=_get_int(data, "amount"),
+            max_sol_cost=_get_int(data, "max_sol_cost"),
+            min_sol_output=_get_int(data, "min_sol_output"),
+            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"),
+            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"),
             associated_bonding_curve=_get_str(data, "associated_bonding_curve"),
+            associated_user=_get_str(data, "associated_user"),
+            system_program=_get_str(data, "system_program"),
             token_program=_get_str(data, "token_program"),
+            quote_token_program=_get_str(data, "quote_token_program"),
+            associated_token_program=_get_str(data, "associated_token_program"),
             creator_vault=_get_str(data, "creator_vault"),
+            associated_quote_fee_recipient=_get_str(data, "associated_quote_fee_recipient"),
+            buyback_fee_recipient=_get_str(data, "buyback_fee_recipient"),
+            associated_quote_buyback_fee_recipient=_get_str(data, "associated_quote_buyback_fee_recipient"),
+            associated_quote_bonding_curve=_get_str(data, "associated_quote_bonding_curve"),
+            associated_quote_user=_get_str(data, "associated_quote_user"),
+            associated_creator_vault=_get_str(data, "associated_creator_vault"),
+            sharing_config=_get_str(data, "sharing_config"),
+            event_authority=_get_str(data, "event_authority"),
+            program=_get_str(data, "program"),
+            global_volume_accumulator=_get_str(data, "global_volume_accumulator"),
+            user_volume_accumulator=_get_str(data, "user_volume_accumulator"),
+            associated_user_volume_accumulator=_get_str(data, "associated_user_volume_accumulator"),
+            fee_config=_get_str(data, "fee_config"),
+            fee_program=_get_str(data, "fee_program"),
+            extra_instruction_account=_get_str(data, "account") or _get_str(data, "extra_instruction_account"),
         )
     
     if event_type == EventType.PUMP_FUN_CREATE:
@@ -1403,6 +1494,17 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             cashback=_get_int(data, "cashback"),
             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"),
+            quote_mint=_get_str(data, "quote_mint"),
+            pool_base_token_account=_get_str(data, "pool_base_token_account"),
+            pool_quote_token_account=_get_str(data, "pool_quote_token_account"),
+            coin_creator_vault_ata=_get_str(data, "coin_creator_vault_ata"),
+            coin_creator_vault_authority=_get_str(data, "coin_creator_vault_authority"),
+            base_token_program=_get_str(data, "base_token_program"),
+            quote_token_program=_get_str(data, "quote_token_program"),
+            pool_v2=_get_str(data, "pool_v2"),
+            fee_recipient=_get_str(data, "fee_recipient"),
+            fee_recipient_quote_token_account=_get_str(data, "fee_recipient_quote_token_account"),
         )
     
     if event_type == EventType.PUMP_SWAP_SELL:
@@ -1434,6 +1536,17 @@ def to_typed_event(event: dict) -> Optional[TypedDexEvent]:
             cashback_fee_basis_points=_get_int(data, "cashback_fee_basis_points"),
             cashback=_get_int(data, "cashback"),
             is_pump_pool=_get_bool(data, "is_pump_pool"),
+            base_mint=_get_str(data, "base_mint"),
+            quote_mint=_get_str(data, "quote_mint"),
+            pool_base_token_account=_get_str(data, "pool_base_token_account"),
+            pool_quote_token_account=_get_str(data, "pool_quote_token_account"),
+            coin_creator_vault_ata=_get_str(data, "coin_creator_vault_ata"),
+            coin_creator_vault_authority=_get_str(data, "coin_creator_vault_authority"),
+            base_token_program=_get_str(data, "base_token_program"),
+            quote_token_program=_get_str(data, "quote_token_program"),
+            pool_v2=_get_str(data, "pool_v2"),
+            fee_recipient=_get_str(data, "fee_recipient"),
+            fee_recipient_quote_token_account=_get_str(data, "fee_recipient_quote_token_account"),
         )
     
     if event_type == EventType.PUMP_SWAP_CREATE_POOL:

sol_parser/grpc_types.py

@@ -119,6 +119,11 @@ class EventType(str, Enum):
     TOKEN_INFO = "TokenInfo"
     NONCE_ACCOUNT = "NonceAccount"
     ACCOUNT_PUMP_FUN_GLOBAL = "AccountPumpFunGlobal"
+    ACCOUNT_PUMP_FUN_BONDING_CURVE = "AccountPumpFunBondingCurve"
+    ACCOUNT_PUMP_FUN_FEE_CONFIG = "AccountPumpFunFeeConfig"
+    ACCOUNT_PUMP_FUN_SHARING_CONFIG = "AccountPumpFunSharingConfig"
+    ACCOUNT_PUMP_FUN_GLOBAL_VOLUME_ACCUMULATOR = "AccountPumpFunGlobalVolumeAccumulator"
+    ACCOUNT_PUMP_FUN_USER_VOLUME_ACCUMULATOR = "AccountPumpFunUserVolumeAccumulator"
     ACCOUNT_PUMP_SWAP_GLOBAL_CONFIG = "AccountPumpSwapGlobalConfig"
     ACCOUNT_PUMP_SWAP_POOL = "AccountPumpSwapPool"
 
@@ -211,6 +216,11 @@ def all_event_types() -> List[EventType]:
         EventType.TOKEN_INFO,
         EventType.NONCE_ACCOUNT,
         EventType.ACCOUNT_PUMP_FUN_GLOBAL,
+        EventType.ACCOUNT_PUMP_FUN_BONDING_CURVE,
+        EventType.ACCOUNT_PUMP_FUN_FEE_CONFIG,
+        EventType.ACCOUNT_PUMP_FUN_SHARING_CONFIG,
+        EventType.ACCOUNT_PUMP_FUN_GLOBAL_VOLUME_ACCUMULATOR,
+        EventType.ACCOUNT_PUMP_FUN_USER_VOLUME_ACCUMULATOR,
         EventType.ACCOUNT_PUMP_SWAP_GLOBAL_CONFIG,
         EventType.ACCOUNT_PUMP_SWAP_POOL,
     ]
@@ -415,6 +425,11 @@ def event_type_filter_includes_pumpfun(filter: EventTypeFilter) -> bool:
         EventType.PUMP_FEES_UPSERT_FEE_TIERS,
         EventType.PUMP_FUN_MIGRATE_BONDING_CURVE_CREATOR,
         EventType.ACCOUNT_PUMP_FUN_GLOBAL,
+        EventType.ACCOUNT_PUMP_FUN_BONDING_CURVE,
+        EventType.ACCOUNT_PUMP_FUN_FEE_CONFIG,
+        EventType.ACCOUNT_PUMP_FUN_SHARING_CONFIG,
+        EventType.ACCOUNT_PUMP_FUN_GLOBAL_VOLUME_ACCUMULATOR,
+        EventType.ACCOUNT_PUMP_FUN_USER_VOLUME_ACCUMULATOR,
     ]
     return _event_type_filter_includes_any(filter, pumpfun_types)
 
@@ -461,6 +476,11 @@ def event_type_filter_allows_instruction_parsing(include_only: List[EventType])
         EventType.PUMP_FUN_MIGRATE,
         EventType.PUMP_FUN_MIGRATE_BONDING_CURVE_CREATOR,
         EventType.ACCOUNT_PUMP_FUN_GLOBAL,
+        EventType.ACCOUNT_PUMP_FUN_BONDING_CURVE,
+        EventType.ACCOUNT_PUMP_FUN_FEE_CONFIG,
+        EventType.ACCOUNT_PUMP_FUN_SHARING_CONFIG,
+        EventType.ACCOUNT_PUMP_FUN_GLOBAL_VOLUME_ACCUMULATOR,
+        EventType.ACCOUNT_PUMP_FUN_USER_VOLUME_ACCUMULATOR,
         *PUMP_FEES_EVENT_TYPES,
         EventType.PUMP_SWAP_BUY,
         EventType.PUMP_SWAP_SELL,