csm-dashboard 0.2.2__py3-none-any.whl → 0.3.1__py3-none-any.whl

src/web/routes.py

@@ -11,6 +11,8 @@ router = APIRouter()
 async def get_operator(
     identifier: str,
     detailed: bool = Query(False, description="Include validator status from beacon chain"),
+    history: bool = Query(False, description="Include all historical distribution frames"),
+    withdrawals: bool = Query(False, description="Include withdrawal/claim history"),
 ):
     """
     Get operator data by address or ID.
@@ -18,6 +20,8 @@ async def get_operator(
     - If identifier is numeric, treat as operator ID
     - If identifier starts with 0x, treat as Ethereum address
     - Add ?detailed=true to include validator status breakdown
+    - Add ?history=true to include all historical distribution frames
+    - Add ?withdrawals=true to include withdrawal/claim history
     """
     service = OperatorService()
 
@@ -26,9 +30,9 @@ async def get_operator(
         operator_id = int(identifier)
         if operator_id < 0 or operator_id > 1_000_000:
             raise HTTPException(status_code=400, detail="Invalid operator ID")
-        rewards = await service.get_operator_by_id(operator_id, detailed)
+        rewards = await service.get_operator_by_id(operator_id, detailed or history, history, withdrawals)
     elif identifier.startswith("0x"):
-        rewards = await service.get_operator_by_address(identifier, detailed)
+        rewards = await service.get_operator_by_address(identifier, detailed or history, history, withdrawals)
     else:
         raise HTTPException(status_code=400, detail="Invalid identifier format")
 
@@ -39,17 +43,19 @@ async def get_operator(
         "operator_id": rewards.node_operator_id,
         "manager_address": rewards.manager_address,
         "reward_address": rewards.reward_address,
+        "curve_id": rewards.curve_id,
+        "operator_type": rewards.operator_type,
         "rewards": {
-            "current_bond_eth": float(rewards.current_bond_eth),
-            "required_bond_eth": float(rewards.required_bond_eth),
-            "excess_bond_eth": float(rewards.excess_bond_eth),
+            "current_bond_eth": str(rewards.current_bond_eth),
+            "required_bond_eth": str(rewards.required_bond_eth),
+            "excess_bond_eth": str(rewards.excess_bond_eth),
             "cumulative_rewards_shares": rewards.cumulative_rewards_shares,
-            "cumulative_rewards_eth": float(rewards.cumulative_rewards_eth),
+            "cumulative_rewards_eth": str(rewards.cumulative_rewards_eth),
             "distributed_shares": rewards.distributed_shares,
-            "distributed_eth": float(rewards.distributed_eth),
+            "distributed_eth": str(rewards.distributed_eth),
             "unclaimed_shares": rewards.unclaimed_shares,
-            "unclaimed_eth": float(rewards.unclaimed_eth),
-            "total_claimable_eth": float(rewards.total_claimable_eth),
+            "unclaimed_eth": str(rewards.unclaimed_eth),
+            "total_claimable_eth": str(rewards.total_claimable_eth),
         },
         "validators": {
             "total": rewards.total_validators,
@@ -79,13 +85,65 @@ async def get_operator(
 
     # Add APY metrics if available
     if rewards.apy:
+        # Use actual excess bond for lifetime values (estimates for previous/current)
+        lifetime_bond = float(rewards.excess_bond_eth)
+        lifetime_net_total = (rewards.apy.lifetime_distribution_eth or 0) + lifetime_bond
         result["apy"] = {
+            "previous_distribution_eth": rewards.apy.previous_distribution_eth,
+            "previous_distribution_apy": rewards.apy.previous_distribution_apy,
+            "previous_net_apy": rewards.apy.previous_net_apy,
+            "previous_bond_eth": rewards.apy.previous_bond_eth,
+            "previous_bond_apr": rewards.apy.previous_bond_apr,
+            "previous_net_total_eth": rewards.apy.previous_net_total_eth,
+            "current_distribution_eth": rewards.apy.current_distribution_eth,
+            "current_distribution_apy": rewards.apy.current_distribution_apy,
+            "current_bond_eth": rewards.apy.current_bond_eth,
+            "current_bond_apr": rewards.apy.current_bond_apr,
+            "current_net_total_eth": rewards.apy.current_net_total_eth,
+            "lifetime_distribution_eth": rewards.apy.lifetime_distribution_eth,
+            "lifetime_bond_eth": lifetime_bond,  # Actual excess bond, not estimate
+            "lifetime_net_total_eth": lifetime_net_total,  # Matches Total Claimable
+            # Accurate lifetime APY (per-frame bond calculation when available)
+            "lifetime_reward_apy": rewards.apy.lifetime_reward_apy,
+            "lifetime_bond_apy": rewards.apy.lifetime_bond_apy,
+            "lifetime_net_apy": rewards.apy.lifetime_net_apy,
+            "next_distribution_date": rewards.apy.next_distribution_date,
+            "next_distribution_est_eth": rewards.apy.next_distribution_est_eth,
             "historical_reward_apy_28d": rewards.apy.historical_reward_apy_28d,
             "historical_reward_apy_ltd": rewards.apy.historical_reward_apy_ltd,
             "bond_apy": rewards.apy.bond_apy,
             "net_apy_28d": rewards.apy.net_apy_28d,
             "net_apy_ltd": rewards.apy.net_apy_ltd,
+            "uses_historical_apr": rewards.apy.uses_historical_apr,
         }
+        # Add frames if available (from history=true)
+        if rewards.apy.frames:
+            result["apy"]["frames"] = [
+                {
+                    "frame_number": f.frame_number,
+                    "start_date": f.start_date,
+                    "end_date": f.end_date,
+                    "rewards_eth": f.rewards_eth,
+                    "rewards_shares": f.rewards_shares,
+                    "duration_days": f.duration_days,
+                    "validator_count": f.validator_count,
+                    "apy": f.apy,
+                }
+                for f in rewards.apy.frames
+            ]
+
+    # Add withdrawal history if withdrawals=true (already fetched during data gathering)
+    if withdrawals and rewards.withdrawals:
+        result["withdrawals"] = [
+            {
+                "block_number": w.block_number,
+                "timestamp": w.timestamp,
+                "shares": w.shares,
+                "eth_value": w.eth_value,
+                "tx_hash": w.tx_hash,
+            }
+            for w in rewards.withdrawals
+        ]
 
     # Add active_since if available
     if rewards.active_since:
@@ -95,7 +153,7 @@ async def get_operator(
     if rewards.health:
         result["health"] = {
             "bond_healthy": rewards.health.bond_healthy,
-            "bond_deficit_eth": float(rewards.health.bond_deficit_eth),
+            "bond_deficit_eth": str(rewards.health.bond_deficit_eth),
             "stuck_validators_count": rewards.health.stuck_validators_count,
             "slashed_validators_count": rewards.health.slashed_validators_count,
             "validators_at_risk_count": rewards.health.validators_at_risk_count,
@@ -105,6 +163,7 @@ async def get_operator(
                 "validators_near_ejection": rewards.health.strikes.validators_near_ejection,
                 "total_strikes": rewards.health.strikes.total_strikes,
                 "max_strikes": rewards.health.strikes.max_strikes,
+                "strike_threshold": rewards.health.strikes.strike_threshold,
             },
             "has_issues": rewards.health.has_issues,
         }
@@ -135,18 +194,25 @@ async def get_operator_strikes(identifier: str):
     else:
         raise HTTPException(status_code=400, detail="Invalid identifier format")
 
-    strikes = await service.get_operator_strikes(operator_id)
+    # Get curve_id to determine strike threshold
+    curve_id = await service.onchain.get_bond_curve_id(operator_id)
+    strikes = await service.get_operator_strikes(operator_id, curve_id)
 
     # Fetch frame dates for tooltip display
     frame_dates = await service.get_recent_frame_dates(6)
 
+    # Get the threshold for this operator type
+    strike_threshold = strikes[0].strike_threshold if strikes else 3
+
     return {
         "operator_id": operator_id,
+        "strike_threshold": strike_threshold,
         "frame_dates": frame_dates,
         "validators": [
             {
                 "pubkey": s.pubkey,
                 "strike_count": s.strike_count,
+                "strike_threshold": s.strike_threshold,
                 "strikes": s.strikes,
                 "at_ejection_risk": s.at_ejection_risk,
             }

csm_dashboard-0.2.2.dist-info/RECORD

@@ -1,32 +0,0 @@
-src/__init__.py,sha256=Bfqpjo9Q1XaV8DNqkf1sADzWg2ACpfZWSGLtahZE3iU,35
-src/main.py,sha256=tj7C09FVBGBVyjKYwmElpX5M92xfydDm8RJ6-MSFdMk,951
-src/abis/CSAccounting.json,sha256=FSZ4SyT9XMxPLBezcs77LCfJBKkrO9r_rCavD-uKm8A,815
-src/abis/CSFeeDistributor.json,sha256=unLBacJcCHq4xsmB4xOPlVXcOrxGWNf6KDmC3Ld5u-c,1517
-src/abis/CSModule.json,sha256=T6D6aInBoqVH3ZD6U6p3lrPa3t_ucA9V83IwE80kOuU,1687
-src/abis/__init__.py,sha256=9HV2hKMGSoNAi8evsjzymTr4V4kowITNsX1-LPu6l98,20
-src/abis/stETH.json,sha256=wZobN-RDcYbLs4byBs1e5A8ML6CgfihuXhEPTByB-H0,827
-src/cli/__init__.py,sha256=mgHAwomqzAhOHJnlWrWtCguhGzhDWlkCvkzKsfoFsds,35
-src/cli/commands.py,sha256=kSioEDzBf85MKEEWb_wq9DbRUyEtQYnHPJ9dxi-nPvk,23929
-src/core/__init__.py,sha256=ZDHZojANK1ZFpn5lQROERTo97MYQFAxqA9APvs7ruEQ,57
-src/core/config.py,sha256=UD4-LVHdeQeT6n9BtLXh2zZcXfX0-ZhrMVZx93E2BGk,1429
-src/core/contracts.py,sha256=8Y72h5uUTaIMLWYdtu5O2Bjw1hTyIHOegaDs0W8r74g,525
-src/core/types.py,sha256=dzTdZiOOzxwj4oh0ZLEWqb4jbVsA0TVm6Rqkod7yUMg,4551
-src/data/__init__.py,sha256=DItA8aEp8Lbr0uFlJVppMaTtVEEznoA1hkRpH-vfHhk,57
-src/data/beacon.py,sha256=9oaR7TO2WcP_D3jVTzcd9WE6NbF2WnqQDW_y5M8GsZ0,13511
-src/data/cache.py,sha256=w1iv4rM-FVgFlaSNYdQA3CfqyhZo9-gqbZwKmzKY0Ps,2134
-src/data/etherscan.py,sha256=mkd4KB-4JUvY_aVVqUH119GLS--_qivmeRKR70ivQkk,2832
-src/data/ipfs_logs.py,sha256=IV_eTyktO3DaiTsXgU7huzo51I60OVo8ne9G_yvRdIk,9192
-src/data/known_cids.py,sha256=onwTTNvAv4h0-3LZgLhqMlKzuNH2VhBqQGZ9fm8GyoE,1705
-src/data/lido_api.py,sha256=WuVrqVOT7trxGgZX4Kavg7k9DyKyXIa_aSc_7XVLU2Y,1026
-src/data/onchain.py,sha256=l9xQxKoXhmr0TKguba1L423_o9mdTLoeDhegMpa3ZgY,9710
-src/data/rewards_tree.py,sha256=a-MO14b4COjOvy59FPd0jaf1dkgidlqCQKAFDinwRJU,1894
-src/data/strikes.py,sha256=9iSW7Xm2W0rqySAJn5IwqCCKf-ef2XazC7tYHgz9REk,7480
-src/services/__init__.py,sha256=MC7blFLAMazErCWuyYXvS6sO3uZm1z_RUOtnlIK0kSo,38
-src/services/operator_service.py,sha256=Y6rXYdJzv7V3Nix99iiyC7NcDRfShdvDTcRtXbp_oTQ,13015
-src/web/__init__.py,sha256=iI2c5xxXmzsNxIetm0P2qE3uVsT-ClsMfzn620r5YTU,40
-src/web/app.py,sha256=qEIB05J0sKEeZkfHkJwotltsL-d2j1KTDS56cQl2_IU,32129
-src/web/routes.py,sha256=z0cmH4mA3IxlHYQ-8FFYQrXCRVsi3PvUG_8ZWLixfwg,6204
-csm_dashboard-0.2.2.dist-info/METADATA,sha256=jb13-vR-VJD327jLVqi9qi0mbdIvEz1ipQt1yS3h07U,10003
-csm_dashboard-0.2.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-csm_dashboard-0.2.2.dist-info/entry_points.txt,sha256=P1Ul8ALIPBwDlVlXqTPuzJ64xxRpIJsYW8U73Tyjgtg,37
-csm_dashboard-0.2.2.dist-info/RECORD,,