csm-dashboard 0.3.5__tar.gz → 0.3.6.1__tar.gz

{csm_dashboard-0.3.5 → csm_dashboard-0.3.6.1}/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.3.6] - 2026-01-22
+
+### Added
+- Retry logic and rate limiting for validator batch fetching
+
 ## [0.3.5] - 2026-01-05
 
 ### Added

{csm_dashboard-0.3.5 → csm_dashboard-0.3.6.1}/PKG-INFO

@@ -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 → csm_dashboard-0.3.6.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "csm-dashboard"
-version = "0.3.5"
+version = "0.3.6.1"
 description = "Lido CSM Operator Dashboard for tracking validator earnings"
 readme = "README.md"
 requires-python = ">=3.11"

{csm_dashboard-0.3.5 → csm_dashboard-0.3.6.1}/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
 

{csm_dashboard-0.3.5 → csm_dashboard-0.3.6.1}/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(

{csm_dashboard-0.3.5 → csm_dashboard-0.3.6.1}/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")