csm-dashboard 0.3.5__py3-none-any.whl → 0.3.6.1__py3-none-any.whl

{csm_dashboard-0.3.5.dist-info → csm_dashboard-0.3.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csm-dashboard
-Version: 0.3.5
+Version: 0.3.6.1
 Summary: Lido CSM Operator Dashboard for tracking validator earnings
 Requires-Python: >=3.11
 Requires-Dist: fastapi>=0.104

{csm_dashboard-0.3.5.dist-info → csm_dashboard-0.3.6.1.dist-info}/RECORD

@@ -13,7 +13,7 @@ src/core/config.py,sha256=KYYlJv383RtHo_CpaCt2DM7yaTr3C267cY4T8_ZRiEc,1613
 src/core/contracts.py,sha256=u1KW0z-9V21Zpf7qxGBvRy2Ffdo4YfGusUdT4K_ggP4,582
 src/core/types.py,sha256=pirEDIR6csbGWWUH2s3RDCG2ce-oqgEvdsamAI-rurM,7807
 src/data/__init__.py,sha256=DItA8aEp8Lbr0uFlJVppMaTtVEEznoA1hkRpH-vfHhk,57
-src/data/beacon.py,sha256=9oaR7TO2WcP_D3jVTzcd9WE6NbF2WnqQDW_y5M8GsZ0,13511
+src/data/beacon.py,sha256=jICauXdee4efYj8mj1GIoGsY5_uWmgHB57XhqkXvwS4,15439
 src/data/cache.py,sha256=w1iv4rM-FVgFlaSNYdQA3CfqyhZo9-gqbZwKmzKY0Ps,2134
 src/data/etherscan.py,sha256=JcO6H2dFFZFOV-qCaNhoJvyza2ymd2GhgmJo7vxvTPM,10938
 src/data/ipfs_logs.py,sha256=gXUTP9dmZ_e7gW6ouotJ1r_72ixq2q_32y2evYQf0DM,10709
@@ -23,11 +23,11 @@ src/data/onchain.py,sha256=2eLGAI0URz1JuNZi2JmLWN-h_UDfkDlbT30rXpoqbts,25252
 src/data/rewards_tree.py,sha256=a-MO14b4COjOvy59FPd0jaf1dkgidlqCQKAFDinwRJU,1894
 src/data/strikes.py,sha256=b68exKntZpzjiEBftiI3AcvEclHp7vg5lsOiG2a7Kzo,9046
 src/services/__init__.py,sha256=MC7blFLAMazErCWuyYXvS6sO3uZm1z_RUOtnlIK0kSo,38
-src/services/operator_service.py,sha256=xncq7Z3DDUcr8cohcehvL9nqaONRUPRuvjBliEGYNd8,29985
+src/services/operator_service.py,sha256=KkuWihW8sRuDf7rvSnFLeqWysg4YoMlHI1ZVSOBBHO0,30234
 src/web/__init__.py,sha256=iI2c5xxXmzsNxIetm0P2qE3uVsT-ClsMfzn620r5YTU,40
-src/web/app.py,sha256=kaUm78m_ESREUgVKlnZpZhsunhKrMBA7BZc-aUvEZRA,47944
+src/web/app.py,sha256=rXXoqNZVBAtLu5QW3QebeQdS7zj0DmY2m_hub-Rvkh4,47946
 src/web/routes.py,sha256=UydCD7DMWBYv_lbQQjeHI82l8gLZkZ2lEy4OayPxNiU,10716
-csm_dashboard-0.3.5.dist-info/METADATA,sha256=Siio7ENgz75pgWkowGWT5vtpwb8hB3XaR4gjMb1oBj4,12552
-csm_dashboard-0.3.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-csm_dashboard-0.3.5.dist-info/entry_points.txt,sha256=P1Ul8ALIPBwDlVlXqTPuzJ64xxRpIJsYW8U73Tyjgtg,37
-csm_dashboard-0.3.5.dist-info/RECORD,,
+csm_dashboard-0.3.6.1.dist-info/METADATA,sha256=ieTgZaq6G73b9xHLpEYmpmp9DQlN7hUDk7dy_hugzug,12554
+csm_dashboard-0.3.6.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+csm_dashboard-0.3.6.1.dist-info/entry_points.txt,sha256=P1Ul8ALIPBwDlVlXqTPuzJ64xxRpIJsYW8U73Tyjgtg,37
+csm_dashboard-0.3.6.1.dist-info/RECORD,,

src/data/beacon.py

@@ -1,5 +1,6 @@
 """Beacon chain data fetching via beaconcha.in API."""
 
+import asyncio
 from datetime import datetime, timedelta, timezone
 from decimal import Decimal
 from enum import Enum
@@ -172,47 +173,84 @@ class BeaconDataProvider:
         Fetch validator info for multiple pubkeys.
 
         beaconcha.in supports comma-separated pubkeys (up to 100).
+        Includes retry logic for rate limiting and proper error handling.
         """
         if not pubkeys:
             return []
 
         validators = []
         batch_size = 100  # beaconcha.in limit
+        max_retries = 3
 
         async with httpx.AsyncClient(timeout=30.0) as client:
             for i in range(0, len(pubkeys), batch_size):
                 batch = pubkeys[i : i + batch_size]
                 pubkeys_param = ",".join(batch)
 
-                try:
-                    response = await client.get(
-                        f"{self.base_url}/validator/{pubkeys_param}",
-                        headers=self._get_headers(),
-                    )
+                # Add delay between batches to avoid rate limiting
+                if i > 0:
+                    await asyncio.sleep(0.5)
 
-                    if response.status_code == 200:
-                        data = response.json().get("data", [])
-                        # API returns single object if only one validator
-                        if isinstance(data, dict):
-                            data = [data]
+                for attempt in range(max_retries):
+                    try:
+                        response = await client.get(
+                            f"{self.base_url}/validator/{pubkeys_param}",
+                            headers=self._get_headers(),
+                        )
 
-                        for v in data:
-                            validators.append(self._parse_validator(v))
-                    elif response.status_code == 404:
-                        # Validators not found - create placeholder entries
+                        if response.status_code == 200:
+                            data = response.json().get("data", [])
+                            # API returns single object if only one validator
+                            if isinstance(data, dict):
+                                data = [data]
+
+                            for v in data:
+                                validators.append(self._parse_validator(v))
+                            break  # Success, exit retry loop
+                        elif response.status_code == 404:
+                            # Validators not found - create placeholder entries
+                            for pubkey in batch:
+                                validators.append(
+                                    ValidatorInfo(
+                                        pubkey=pubkey,
+                                        status=ValidatorStatus.PENDING_INITIALIZED,
+                                    )
+                                )
+                            break  # Success, exit retry loop
+                        elif response.status_code == 429:
+                            # Rate limited - wait and retry
+                            if attempt < max_retries - 1:
+                                await asyncio.sleep(2**attempt)  # 1s, 2s, 4s
+                                continue
+                            # Max retries reached, add as unknown
+                            for pubkey in batch:
+                                validators.append(
+                                    ValidatorInfo(
+                                        pubkey=pubkey, status=ValidatorStatus.UNKNOWN
+                                    )
+                                )
+                            break
+                        else:
+                            # Other error status - add as unknown
+                            for pubkey in batch:
+                                validators.append(
+                                    ValidatorInfo(
+                                        pubkey=pubkey, status=ValidatorStatus.UNKNOWN
+                                    )
+                                )
+                            break
+                    except Exception:
+                        if attempt < max_retries - 1:
+                            await asyncio.sleep(1)
+                            continue
+                        # On final failure, add unknown status for this batch
                         for pubkey in batch:
                             validators.append(
                                 ValidatorInfo(
-                                    pubkey=pubkey,
-                                    status=ValidatorStatus.PENDING_INITIALIZED,
+                                    pubkey=pubkey, status=ValidatorStatus.UNKNOWN
                                 )
                             )
-                except Exception:
-                    # On error, add unknown status for this batch
-                    for pubkey in batch:
-                        validators.append(
-                            ValidatorInfo(pubkey=pubkey, status=ValidatorStatus.UNKNOWN)
-                        )
+                        break
 
         return validators
 

src/services/operator_service.py

@@ -279,22 +279,16 @@ class OperatorService:
         steth_data = await self.lido_api.get_steth_apr()
         bond_apy = steth_data.get("apr")
 
-        # 3. Net APY calculations
+        # 3. Net APY calculations (initialized here, calculated after historical APR section)
         net_apy_28d = None
         net_apy_ltd = None
 
-        # Current frame net APY (historical_reward_apy_28d is basically current frame APY)
-        if historical_reward_apy_28d is not None and bond_apy is not None:
-            net_apy_28d = round(historical_reward_apy_28d + bond_apy, 2)
-        elif bond_apy is not None:
-            net_apy_28d = round(bond_apy, 2)
-
         # Lifetime net APY - intentionally NOT calculated
         # (same reason as historical_reward_apy_ltd - can't accurately calculate without historical bond)
         # net_apy_ltd remains None
 
-        # Previous frame net APY calculation is moved after we know previous_bond_apy
-        # (calculated in section 4 below)
+        # Current frame net APY and Previous frame net APY are calculated in section 4b/4c
+        # after we have historical APR values (current_bond_apr, previous_bond_apy)
 
         # 4. Calculate bond stETH earnings (from stETH rebasing)
         # Formula: bond_eth * (apr / 100) * (duration_days / 365)
@@ -431,6 +425,14 @@ class OperatorService:
             if prev_bond_apy_to_use is not None:
                 previous_net_apy = round(previous_distribution_apy + prev_bond_apy_to_use, 2)
 
+        # 4c. Current frame net APY (using historical APR when available, like previous frame)
+        if historical_reward_apy_28d is not None:
+            curr_bond_apy_to_use = current_bond_apr if current_bond_apr is not None else bond_apy
+            if curr_bond_apy_to_use is not None:
+                net_apy_28d = round(historical_reward_apy_28d + curr_bond_apy_to_use, 2)
+        elif bond_apy is not None:
+            net_apy_28d = round(bond_apy, 2)
+
         # 5. Calculate net totals (Rewards + Bond)
         if previous_distribution_eth is not None or previous_bond_eth is not None:
             previous_net_total_eth = round(

src/web/app.py

@@ -14,7 +14,7 @@ def create_app() -> FastAPI:
     app = FastAPI(
         title="CSM Operator Dashboard",
         description="Track your Lido CSM validator earnings",
-        version="0.3.5",
+        version="0.3.6.1",
     )
 
     app.include_router(router, prefix="/api")