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

{csm_dashboard-0.3.6.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.6
+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.6.dist-info → csm_dashboard-0.3.6.1.dist-info}/RECORD

@@ -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=AvNKmY6mNRDQaHQLDaLmf9LJxtcB0Mc-YG83XyJ7K9g,47944
+src/web/app.py,sha256=rXXoqNZVBAtLu5QW3QebeQdS7zj0DmY2m_hub-Rvkh4,47946
 src/web/routes.py,sha256=UydCD7DMWBYv_lbQQjeHI82l8gLZkZ2lEy4OayPxNiU,10716
-csm_dashboard-0.3.6.dist-info/METADATA,sha256=7rgyMM56MfOPeTBY4M8TitFJOPMT70SuxqHMQhxGIwA,12552
-csm_dashboard-0.3.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-csm_dashboard-0.3.6.dist-info/entry_points.txt,sha256=P1Ul8ALIPBwDlVlXqTPuzJ64xxRpIJsYW8U73Tyjgtg,37
-csm_dashboard-0.3.6.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/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.6",
+        version="0.3.6.1",
     )
 
     app.include_router(router, prefix="/api")