csm-dashboard 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

{csm_dashboard-0.3.0.dist-info → csm_dashboard-0.3.2.dist-info}/METADATA

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

{csm_dashboard-0.3.0.dist-info → csm_dashboard-0.3.2.dist-info}/RECORD

@@ -6,11 +6,11 @@ src/abis/CSModule.json,sha256=T6D6aInBoqVH3ZD6U6p3lrPa3t_ucA9V83IwE80kOuU,1687
 src/abis/__init__.py,sha256=9HV2hKMGSoNAi8evsjzymTr4V4kowITNsX1-LPu6l98,20
 src/abis/stETH.json,sha256=ldxbIRrtt8ePVFewJ9Tnz4qUGFmuOXa41GN1t3tnWEg,1106
 src/cli/__init__.py,sha256=mgHAwomqzAhOHJnlWrWtCguhGzhDWlkCvkzKsfoFsds,35
-src/cli/commands.py,sha256=hEbTsj5dTF_K88yUlMWKjRCOuUDYCpugKjQI9vPpMGw,34858
+src/cli/commands.py,sha256=B8-TUAPyQPanTGMd_nom6eo-PhnshrEiJD0NwLkdsbw,34954
 src/core/__init__.py,sha256=ZDHZojANK1ZFpn5lQROERTo97MYQFAxqA9APvs7ruEQ,57
 src/core/config.py,sha256=NqkS2zsWyDMDz-q0eE9akHmTE9kZ-snGdTxLn-Dks4E,1532
 src/core/contracts.py,sha256=8Y72h5uUTaIMLWYdtu5O2Bjw1hTyIHOegaDs0W8r74g,525
-src/core/types.py,sha256=BrwLnZ1_yYKh-mVlw9j5UmV5ci-zWmg_Whsn3-xSZKc,7211
+src/core/types.py,sha256=ymHofuF5kkZDQpi-RyO4ZRHGJqz-_fw21lNRY-bnefA,7311
 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
@@ -18,15 +18,15 @@ src/data/etherscan.py,sha256=UeCucGPd4m39yl13uogY7hCBm46Ge7nZQ96V3eoOmu4,5064
 src/data/ipfs_logs.py,sha256=gXUTP9dmZ_e7gW6ouotJ1r_72ixq2q_32y2evYQf0DM,10709
 src/data/known_cids.py,sha256=onwTTNvAv4h0-3LZgLhqMlKzuNH2VhBqQGZ9fm8GyoE,1705
 src/data/lido_api.py,sha256=477-1vqlMAwLaisaa61T9AxJuSUV6W7NLg1cxvdmheY,4884
-src/data/onchain.py,sha256=A8KiNldL_-KStFNDzvzROFqYGgZOBaDj8O0chWfOl8w,16657
+src/data/onchain.py,sha256=3B2dL8PHQL2BkSySUYOq1jwPI3WkUTOFPbiVkECiiMU,16716
 src/data/rewards_tree.py,sha256=a-MO14b4COjOvy59FPd0jaf1dkgidlqCQKAFDinwRJU,1894
-src/data/strikes.py,sha256=9iSW7Xm2W0rqySAJn5IwqCCKf-ef2XazC7tYHgz9REk,7480
+src/data/strikes.py,sha256=b68exKntZpzjiEBftiI3AcvEclHp7vg5lsOiG2a7Kzo,9046
 src/services/__init__.py,sha256=MC7blFLAMazErCWuyYXvS6sO3uZm1z_RUOtnlIK0kSo,38
-src/services/operator_service.py,sha256=Yau_pDylc-tSJmlVypEJVzKRhfXGMCud5Cov2rtk990,29173
+src/services/operator_service.py,sha256=Q_Sc65T06IMHUAP_zgROGkZSbEyFPSL4B4ssVsFEUSg,29562
 src/web/__init__.py,sha256=iI2c5xxXmzsNxIetm0P2qE3uVsT-ClsMfzn620r5YTU,40
-src/web/app.py,sha256=qEIB05J0sKEeZkfHkJwotltsL-d2j1KTDS56cQl2_IU,32129
-src/web/routes.py,sha256=sBO7pQBJwbfyyQ61pbQRa6eCugTki6UC6yyZpQW-ne8,9488
-csm_dashboard-0.3.0.dist-info/METADATA,sha256=AIHgFHGGEEInmieAAHvJ6DB1vsXTn0Nq0OI1U02cc-w,12552
-csm_dashboard-0.3.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-csm_dashboard-0.3.0.dist-info/entry_points.txt,sha256=P1Ul8ALIPBwDlVlXqTPuzJ64xxRpIJsYW8U73Tyjgtg,37
-csm_dashboard-0.3.0.dist-info/RECORD,,
+src/web/app.py,sha256=iLnkIi8GF5ybWwIQAmpNMxMoBaA0ob1xmfQaJrnpZ4E,32604
+src/web/routes.py,sha256=cswOYAsw9x4tEmGaHBDbkwUvML80M1onmDfRlhtQkGo,9895
+csm_dashboard-0.3.2.dist-info/METADATA,sha256=S7WVOP9xDCfAx32g1My2AuSAi-uUsaFm910gDk5lR7I,12552
+csm_dashboard-0.3.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+csm_dashboard-0.3.2.dist-info/entry_points.txt,sha256=P1Ul8ALIPBwDlVlXqTPuzJ64xxRpIJsYW8U73Tyjgtg,37
+csm_dashboard-0.3.2.dist-info/RECORD,,

src/cli/commands.py

@@ -34,16 +34,16 @@ def format_as_api_json(rewards: OperatorRewards, include_validators: bool = Fals
         "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,
@@ -122,7 +122,7 @@ def format_as_api_json(rewards: OperatorRewards, include_validators: bool = Fals
     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,
@@ -576,31 +576,31 @@ def rewards(
             console.print(history_table)
             console.print()
 
-        # Show withdrawal history if --withdrawals flag is used
-        if withdrawals and rewards.withdrawals:
-            from datetime import datetime
-            withdrawal_table = Table(title="Withdrawal History")
-            withdrawal_table.add_column("#", style="cyan", justify="right")
-            withdrawal_table.add_column("Date", style="white")
-            withdrawal_table.add_column("Amount (stETH)", style="green", justify="right")
-            withdrawal_table.add_column("Tx Hash", style="dim")
+    # Show withdrawal history if --withdrawals flag is used
+    if withdrawals and rewards.withdrawals:
+        from datetime import datetime
+        withdrawal_table = Table(title="Withdrawal History")
+        withdrawal_table.add_column("#", style="cyan", justify="right")
+        withdrawal_table.add_column("Date", style="white")
+        withdrawal_table.add_column("Amount (stETH)", style="green", justify="right")
+        withdrawal_table.add_column("Tx Hash", style="dim")
 
-            for i, w in enumerate(rewards.withdrawals, 1):
-                try:
-                    w_dt = datetime.fromisoformat(w.timestamp)
-                    w_date = w_dt.strftime("%b %d, %Y")
-                except (ValueError, TypeError):
-                    w_date = w.timestamp[:10] if w.timestamp else "--"
+        for i, w in enumerate(rewards.withdrawals, 1):
+            try:
+                w_dt = datetime.fromisoformat(w.timestamp)
+                w_date = w_dt.strftime("%b %d, %Y")
+            except (ValueError, TypeError):
+                w_date = w.timestamp[:10] if w.timestamp else "--"
 
-                withdrawal_table.add_row(
-                    str(i),
-                    w_date,
-                    f"{w.eth_value:.4f}",
-                    f"{w.tx_hash[:10]}..." if w.tx_hash else "--",
-                )
+            withdrawal_table.add_row(
+                str(i),
+                w_date,
+                f"{w.eth_value:.4f}",
+                f"{w.tx_hash[:10]}..." if w.tx_hash else "--",
+            )
 
-            console.print(withdrawal_table)
-            console.print()
+        console.print(withdrawal_table)
+        console.print()
 
 
 @app.command()
@@ -665,11 +665,12 @@ def health(
             # Fetch validator strikes details
             validator_strikes = []
             if rewards.health.strikes.total_validators_with_strikes > 0:
-                strikes_data = run_async(service.get_operator_strikes(rewards.node_operator_id))
+                strikes_data = run_async(service.get_operator_strikes(rewards.node_operator_id, rewards.curve_id))
                 validator_strikes = [
                     {
                         "pubkey": vs.pubkey,
                         "strike_count": vs.strike_count,
+                        "strike_threshold": vs.strike_threshold,
                         "at_ejection_risk": vs.at_ejection_risk,
                     }
                     for vs in strikes_data
@@ -677,7 +678,7 @@ def 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,
@@ -687,6 +688,7 @@ def health(
                     "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,
                     "validators": validator_strikes,
                 },
                 "has_issues": rewards.health.has_issues,
@@ -783,9 +785,9 @@ def health(
     if strikes.total_validators_with_strikes > 0:
         console.print()
         console.print("[bold]Validator Strikes Detail:[/bold]")
-        validator_strikes = run_async(service.get_operator_strikes(rewards.node_operator_id))
+        validator_strikes = run_async(service.get_operator_strikes(rewards.node_operator_id, rewards.curve_id))
         for vs in validator_strikes:
-            strike_display = f"{vs.strike_count}/3"
+            strike_display = f"{vs.strike_count}/{vs.strike_threshold}"
             if vs.at_ejection_risk:
                 console.print(f"  {vs.pubkey}: [red bold]{strike_display}[/red bold] (EJECTION RISK!)")
             elif vs.strike_count > 0:

src/core/types.py

@@ -144,10 +144,11 @@ class StrikeSummary(BaseModel):
     """Summary of strikes for an operator."""
 
     total_validators_with_strikes: int = 0
-    validators_at_risk: int = 0  # Validators with 3+ strikes (ejection eligible)
-    validators_near_ejection: int = 0  # Validators with 2 strikes (one away from ejection)
+    validators_at_risk: int = 0  # Validators at or above strike threshold (ejection eligible)
+    validators_near_ejection: int = 0  # Validators one strike away from ejection
     total_strikes: int = 0
     max_strikes: int = 0  # Highest strike count on any single validator
+    strike_threshold: int = 3  # Strikes required for ejection (3 for Permissionless, 4 for ICS)
 
 
 class HealthStatus(BaseModel):

src/data/onchain.py

@@ -339,8 +339,9 @@ class OnChainDataProvider:
         """
         Get withdrawal history for an operator's reward address.
 
-        Queries stETH Transfer events from CSFeeDistributor to the reward address.
+        Queries stETH Transfer events from CSAccounting to the reward address.
         These represent when the operator claimed their rewards.
+        (Note: Claims flow CSFeeDistributor -> CSAccounting -> reward_address)
 
         Args:
             reward_address: The operator's reward address
@@ -353,14 +354,14 @@ class OnChainDataProvider:
             start_block = 20873000  # CSM deployment block
 
         reward_address = Web3.to_checksum_address(reward_address)
-        csfeedistributor_address = self.settings.csfeedistributor_address
+        csaccounting_address = self.settings.csaccounting_address
 
         # 1. Try Etherscan API first (most reliable)
         etherscan = EtherscanProvider()
         if etherscan.is_available():
             events = await etherscan.get_transfer_events(
                 token_address=self.settings.steth_address,
-                from_address=csfeedistributor_address,
+                from_address=csaccounting_address,
                 to_address=reward_address,
                 from_block=start_block,
             )
@@ -370,7 +371,7 @@ class OnChainDataProvider:
 
         # 2. Try chunked RPC queries
         events = await self._query_transfer_events_chunked(
-            csfeedistributor_address, reward_address, start_block
+            csaccounting_address, reward_address, start_block
         )
         if events:
             return await self._enrich_withdrawal_events(events)

src/data/strikes.py

@@ -13,6 +13,22 @@ from ..core.config import get_settings
 from .cache import cached
 
 
+# Strike thresholds by operator type (curve_id)
+# Default (Permissionless): 3 strikes till key exit
+# ICS (Identified Community Staker): 4 strikes till key exit
+STRIKE_THRESHOLDS = {
+    0: 3,  # Permissionless (Legacy)
+    1: 4,  # ICS/Legacy EA
+    2: 3,  # Permissionless (current)
+}
+DEFAULT_STRIKE_THRESHOLD = 3
+
+
+def get_strike_threshold(curve_id: int) -> int:
+    """Get the strike threshold for ejection based on operator curve_id."""
+    return STRIKE_THRESHOLDS.get(curve_id, DEFAULT_STRIKE_THRESHOLD)
+
+
 @dataclass
 class ValidatorStrikes:
     """Strike information for a single validator."""
@@ -20,7 +36,8 @@ class ValidatorStrikes:
     pubkey: str
     strikes: list[int]  # Array of 6 values (0 or 1) representing strikes per frame
     strike_count: int  # Total strikes in the 6-frame window
-    at_ejection_risk: bool  # True if 3+ strikes (eligible for ejection)
+    strike_threshold: int  # Number of strikes required for ejection (3 or 4)
+    at_ejection_risk: bool  # True if strike_count >= strike_threshold
 
 
 class StrikesProvider:
@@ -141,12 +158,16 @@ class StrikesProvider:
             return None
         return await self._fetch_tree_from_ipfs(cid)
 
-    async def get_operator_strikes(self, operator_id: int) -> list[ValidatorStrikes]:
+    async def get_operator_strikes(
+        self, operator_id: int, curve_id: int | None = None
+    ) -> list[ValidatorStrikes]:
         """
         Get strikes for all validators belonging to an operator.
 
         Args:
             operator_id: The CSM operator ID
+            curve_id: The operator's bond curve ID (determines strike threshold)
+                     If None, defaults to 3 strikes (permissionless threshold)
 
         Returns:
             List of ValidatorStrikes for validators with any strikes.
@@ -159,6 +180,9 @@ class StrikesProvider:
         values = tree_data.get("values", [])
         operator_strikes = []
 
+        # Determine strike threshold based on operator type
+        strike_threshold = get_strike_threshold(curve_id) if curve_id is not None else DEFAULT_STRIKE_THRESHOLD
+
         for entry in values:
             value = entry.get("value", [])
             if len(value) < 3:
@@ -179,33 +203,42 @@ class StrikesProvider:
                     pubkey=pubkey,
                     strikes=strikes_array if isinstance(strikes_array, list) else [],
                     strike_count=strike_count,
-                    at_ejection_risk=strike_count >= 3,
+                    strike_threshold=strike_threshold,
+                    at_ejection_risk=strike_count >= strike_threshold,
                 )
             )
 
         return operator_strikes
 
     async def get_operator_strike_summary(
-        self, operator_id: int
+        self, operator_id: int, curve_id: int | None = None
     ) -> dict[str, int]:
         """
         Get a summary of strikes for an operator.
 
+        Args:
+            operator_id: The CSM operator ID
+            curve_id: The operator's bond curve ID (determines strike threshold)
+
         Returns:
             Dict with:
             - total_validators_with_strikes: Count of validators with any strikes
-            - validators_at_risk: Count of validators with 3+ strikes
+            - validators_at_risk: Count of validators at ejection risk (>= threshold)
+            - validators_near_ejection: Count one strike away from ejection
             - total_strikes: Sum of all strikes across all validators
             - max_strikes: Highest strike count on any single validator
+            - strike_threshold: The ejection threshold for this operator type
         """
-        strikes = await self.get_operator_strikes(operator_id)
+        strikes = await self.get_operator_strikes(operator_id, curve_id)
+        strike_threshold = get_strike_threshold(curve_id) if curve_id is not None else DEFAULT_STRIKE_THRESHOLD
 
         return {
             "total_validators_with_strikes": len(strikes),
             "validators_at_risk": sum(1 for s in strikes if s.at_ejection_risk),
-            "validators_near_ejection": sum(1 for s in strikes if s.strike_count == 2),
+            "validators_near_ejection": sum(1 for s in strikes if s.strike_count == strike_threshold - 1),
             "total_strikes": sum(s.strike_count for s in strikes),
             "max_strikes": max((s.strike_count for s in strikes), default=0),
+            "strike_threshold": strike_threshold,
         }
 
     def clear_cache(self) -> None:

src/services/operator_service.py

@@ -127,6 +127,7 @@ class OperatorService:
                 bond=bond,
                 stuck_validators_count=operator.stuck_validators_count,
                 validator_details=validator_details,
+                curve_id=curve_id,
             )
 
         # Step 12: Fetch withdrawal history if requested
@@ -503,6 +504,7 @@ class OperatorService:
         bond: BondSummary,
         stuck_validators_count: int,
         validator_details: list[ValidatorInfo],
+        curve_id: int | None = None,
     ) -> HealthStatus:
         """Calculate health status for an operator.
 
@@ -516,16 +518,17 @@ class OperatorService:
         slashed_count = count_slashed_validators(validator_details)
         at_risk_count = count_at_risk_validators(validator_details)
 
-        # Get strikes data
+        # Get strikes data (pass curve_id for operator-specific thresholds)
         strike_summary = StrikeSummary()
         try:
-            summary = await self.strikes.get_operator_strike_summary(operator_id)
+            summary = await self.strikes.get_operator_strike_summary(operator_id, curve_id)
             strike_summary = StrikeSummary(
                 total_validators_with_strikes=summary.get("total_validators_with_strikes", 0),
                 validators_at_risk=summary.get("validators_at_risk", 0),
                 validators_near_ejection=summary.get("validators_near_ejection", 0),
                 total_strikes=summary.get("total_strikes", 0),
                 max_strikes=summary.get("max_strikes", 0),
+                strike_threshold=summary.get("strike_threshold", 3),
             )
         except Exception:
             # If strikes fetch fails, continue with empty summary
@@ -540,9 +543,14 @@ class OperatorService:
             strikes=strike_summary,
         )
 
-    async def get_operator_strikes(self, operator_id: int):
-        """Get detailed strikes for an operator's validators."""
-        return await self.strikes.get_operator_strikes(operator_id)
+    async def get_operator_strikes(self, operator_id: int, curve_id: int | None = None):
+        """Get detailed strikes for an operator's validators.
+
+        Args:
+            operator_id: The CSM operator ID
+            curve_id: The operator's bond curve ID (determines strike threshold)
+        """
+        return await self.strikes.get_operator_strikes(operator_id, curve_id)
 
     async def get_recent_frame_dates(self, count: int = 6) -> list[dict]:
         """Get date ranges for the most recent N distribution frames.

src/web/app.py

@@ -327,13 +327,13 @@ def create_app() -> FastAPI:
                 document.getElementById('active-validators').textContent = data.validators.active;
                 document.getElementById('exited-validators').textContent = data.validators.exited;
 
-                document.getElementById('current-bond').textContent = (data.rewards?.current_bond_eth ?? 0).toFixed(6);
-                document.getElementById('required-bond').textContent = (data.rewards?.required_bond_eth ?? 0).toFixed(6);
-                document.getElementById('excess-bond').textContent = (data.rewards?.excess_bond_eth ?? 0).toFixed(6);
-                document.getElementById('cumulative-rewards').textContent = (data.rewards?.cumulative_rewards_eth ?? 0).toFixed(6);
-                document.getElementById('distributed-rewards').textContent = (data.rewards?.distributed_eth ?? 0).toFixed(6);
-                document.getElementById('unclaimed-rewards').textContent = (data.rewards?.unclaimed_eth ?? 0).toFixed(6);
-                document.getElementById('total-claimable').textContent = (data.rewards?.total_claimable_eth ?? 0).toFixed(6);
+                document.getElementById('current-bond').textContent = parseFloat(data.rewards?.current_bond_eth ?? 0).toFixed(6);
+                document.getElementById('required-bond').textContent = parseFloat(data.rewards?.required_bond_eth ?? 0).toFixed(6);
+                document.getElementById('excess-bond').textContent = parseFloat(data.rewards?.excess_bond_eth ?? 0).toFixed(6);
+                document.getElementById('cumulative-rewards').textContent = parseFloat(data.rewards?.cumulative_rewards_eth ?? 0).toFixed(6);
+                document.getElementById('distributed-rewards').textContent = parseFloat(data.rewards?.distributed_eth ?? 0).toFixed(6);
+                document.getElementById('unclaimed-rewards').textContent = parseFloat(data.rewards?.unclaimed_eth ?? 0).toFixed(6);
+                document.getElementById('total-claimable').textContent = parseFloat(data.rewards?.total_claimable_eth ?? 0).toFixed(6);
 
                 results.classList.remove('hidden');
             } catch (err) {
@@ -413,7 +413,7 @@ def create_app() -> FastAPI:
                     if (h.bond_healthy) {
                         document.getElementById('health-bond').innerHTML = '<span class="text-green-400">HEALTHY</span>';
                     } else {
-                        document.getElementById('health-bond').innerHTML = `<span class="text-red-400">DEFICIT -${h.bond_deficit_eth.toFixed(4)} ETH</span>`;
+                        document.getElementById('health-bond').innerHTML = `<span class="text-red-400">DEFICIT -${parseFloat(h.bond_deficit_eth).toFixed(4)} ETH</span>`;
                     }
 
                     // Stuck validators
@@ -473,9 +473,11 @@ def create_app() -> FastAPI:
                                 const opId = document.getElementById('operator-id').textContent;
                                 const strikesResp = await fetch(`/api/operator/${opId}/strikes`);
                                 const strikesData = await strikesResp.json();
+                                const threshold = strikesData.strike_threshold || 3;
                                 strikesList.innerHTML = strikesData.validators.map(v => {
+                                    const vThreshold = v.strike_threshold || threshold;
                                     const colorClass = v.at_ejection_risk ? 'text-red-400' :
-                                        (v.strike_count === 2 ? 'text-orange-400' : 'text-yellow-400');
+                                        (v.strike_count === vThreshold - 1 ? 'text-orange-400' : 'text-yellow-400');
 
                                     // Generate 6 dots with date tooltips
                                     const dots = v.strikes.map((strike, i) => {
@@ -497,7 +499,7 @@ def create_app() -> FastAPI:
                                         <a href="${beaconUrl}" target="_blank" rel="noopener"
                                            class="text-blue-400 hover:text-blue-300 text-sm" title="View on beaconcha.in">↗</a>
                                         <span class="flex gap-0.5 text-base ml-1">${dots}</span>
-                                        <span class="text-gray-400 text-xs">(${v.strike_count}/3)</span>
+                                        <span class="text-gray-400 text-xs">(${v.strike_count}/${vThreshold})</span>
                                     </div>`;
                                 }).join('');
                                 strikesLoaded = true;
@@ -533,6 +535,7 @@ def create_app() -> FastAPI:
                     }
 
                     // Overall - color-coded by severity
+                    const strikeThreshold = h.strikes.strike_threshold || 3;
                     if (!h.has_issues) {
                         document.getElementById('health-overall').innerHTML = '<span class="text-green-400">No issues detected</span>';
                     } else if (
@@ -540,18 +543,18 @@ def create_app() -> FastAPI:
                         h.stuck_validators_count > 0 ||
                         h.slashed_validators_count > 0 ||
                         h.validators_at_risk_count > 0 ||
-                        h.strikes.max_strikes >= 3
+                        h.strikes.max_strikes >= strikeThreshold
                     ) {
                         // Critical issues (red)
                         let message = 'Issues detected - action required!';
-                        if (h.strikes.max_strikes >= 3) {
-                            message = `Validator ejectable (${h.strikes.validators_at_risk} at 3/3 strikes)`;
+                        if (h.strikes.max_strikes >= strikeThreshold) {
+                            message = `Validator ejectable (${h.strikes.validators_at_risk} at ${strikeThreshold}/${strikeThreshold} strikes)`;
                         }
                         document.getElementById('health-overall').innerHTML = `<span class="text-red-400">${message}</span>`;
-                    } else if (h.strikes.max_strikes === 2) {
+                    } else if (h.strikes.max_strikes === strikeThreshold - 1) {
                         // Warning level 2 (orange) - one more strike = ejectable
                         document.getElementById('health-overall').innerHTML =
-                            `<span class="text-orange-400">Warning - ${h.strikes.validators_near_ejection} validator(s) at 2/3 strikes</span>`;
+                            `<span class="text-orange-400">Warning - ${h.strikes.validators_near_ejection} validator(s) at ${strikeThreshold - 1}/${strikeThreshold} strikes</span>`;
                     } else {
                         // Warning level 1 (yellow) - has strikes but not critical
                         document.getElementById('health-overall').innerHTML =

src/web/routes.py

@@ -46,16 +46,16 @@ async def get_operator(
         "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,
@@ -153,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,
@@ -163,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,
         }
@@ -193,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,
             }