Merge pull request #617 from aibtcdev/fix/safe-int-conversion

safe int conversion in lottery

Author: whoabuddy

app/services/integrations/webhooks/chainhook/handlers/action_proposal_handler.py

@@ -405,6 +405,18 @@ def _sanitize_string(self, input_string: Optional[str]) -> Optional[str]:
 
         return sanitized
 
+    def _to_safe_int(self, value: Optional[str]) -> int:
+        """Safely convert string to int, handling float strings via int(float()) with fallback to 0."""
+        if value is None or value.strip() == "":
+            return 0
+        try:
+            return int(float(value.strip()))
+        except (ValueError, TypeError) as e:
+            self.logger.warning(
+                f"Failed to parse '{value}' as int: {e}, defaulting to 0"
+            )
+            return 0
+
     def _get_agent_token_holders(self, dao_id: UUID) -> List[AgentWithWalletTokenDTO]:
         """Get agents that hold tokens for the given DAO.
 
@@ -447,13 +459,7 @@ def _conduct_quorum_lottery(
         Returns:
             LotterySelection: Complete lottery results with quorum tracking
         """
-        try:
-            _ = int(proposal_liquid_tokens or "0")
-        except ValueError as e:
-            self.logger.warning(
-                f"Invalid proposal_liquid_tokens '{proposal_liquid_tokens}': {e} - returning empty selection"
-            )
-            return LotterySelection()
+        self._to_safe_int(proposal_liquid_tokens)
 
         selection = LotterySelection()
 
@@ -466,7 +472,7 @@ def _conduct_quorum_lottery(
         filtered_agents = [
             agent
             for agent in agents_with_tokens
-            if int(agent.token_amount or "0") >= min_threshold
+            if self._to_safe_int(agent.token_amount) >= min_threshold
         ]
         total_filtered = len(filtered_agents)
         total_original = len(agents_with_tokens)
@@ -535,7 +541,7 @@ def _conduct_quorum_lottery(
             )
             selection.selected_wallets.append(wallet_dict)
 
-            selected_tokens += Decimal(selected_agent.token_amount)
+            selected_tokens += Decimal(self._to_safe_int(selected_agent.token_amount))
 
             self.logger.debug(
                 f"Round {round_number}: Selected agent {selected_agent.agent_id} "
@@ -566,7 +572,7 @@ def _conduct_quorum_lottery(
             )
             selection.selected_wallets.append(wallet_dict)
 
-            selected_tokens += Decimal(selected_agent.token_amount)
+            selected_tokens += Decimal(self._to_safe_int(selected_agent.token_amount))
 
         # Update final totals
         selection.total_selected_tokens = str(selected_tokens)
@@ -586,7 +592,7 @@ def _perform_weighted_selection(
         self, remaining_agents: List[AgentWithWalletTokenDTO]
     ) -> AgentWithWalletTokenDTO:
         """Perform a single round of weighted random agent selection (assumes random is seeded)."""
-        weights = [int(agent.token_amount or "0") for agent in remaining_agents]
+        weights = [self._to_safe_int(agent.token_amount) for agent in remaining_agents]
         if not weights or all(w == 0 for w in weights):
             self.logger.warning("All remaining weights are zero, using equal weights")
             weights = [1] * len(remaining_agents)

app/services/integrations/webhooks/chainhook/handlers/lottery_utils.py

@@ -56,67 +56,6 @@ def calculate_total_eligible_tokens(
             logger.error(f"Error calculating total eligible tokens: {e}")
             return "0"
 
-    @staticmethod
-    def is_quorum_achievable(
-        liquid_tokens: str, total_eligible_tokens: str, quorum_percentage: float = 0.15
-    ) -> bool:
-        """Check if quorum is achievable with available tokens.
-
-        Args:
-            liquid_tokens: Total liquid supply
-            total_eligible_tokens: Total tokens held by eligible agents
-            quorum_percentage: Required quorum percentage
-
-        Returns:
-            True if quorum is achievable, False otherwise
-        """
-        try:
-            quorum_threshold = QuorumCalculator.calculate_quorum_threshold(
-                liquid_tokens, quorum_percentage
-            )
-            return Decimal(total_eligible_tokens) >= Decimal(quorum_threshold)
-        except (ValueError, TypeError) as e:
-            logger.error(f"Error checking quorum achievability: {e}")
-            return False
-
-    @staticmethod
-    def calculate_selected_tokens_total(selected_wallets: List[Dict[str, str]]) -> str:
-        """Calculate total tokens from selected wallets.
-
-        Args:
-            selected_wallets: List of {"wallet_id": str, "token_amount": str} dicts
-
-        Returns:
-            Total selected tokens as string
-        """
-        try:
-            total = Decimal("0")
-            for wallet in selected_wallets:
-                total += Decimal(wallet.get("token_amount", "0"))
-            return str(total)
-        except (ValueError, TypeError) as e:
-            logger.error(f"Error calculating selected tokens total: {e}")
-            return "0"
-
-    @staticmethod
-    def validate_quorum_achievement(
-        selected_tokens_total: str, quorum_threshold: str
-    ) -> bool:
-        """Check if selected tokens meet the quorum threshold.
-
-        Args:
-            selected_tokens_total: Total tokens from selected wallets
-            quorum_threshold: Required threshold to meet quorum
-
-        Returns:
-            True if quorum is achieved, False otherwise
-        """
-        try:
-            return Decimal(selected_tokens_total) >= Decimal(quorum_threshold)
-        except (ValueError, TypeError) as e:
-            logger.error(f"Error validating quorum achievement: {e}")
-            return False
-
 
 class LotterySelection:
     """Data class to hold lottery selection results."""