Merge pull request #421 from aibtcdev/check-net-logic

added validate wall utility

Author: davek-ai

agent-tools-ts

@@ -22,7 +22,6 @@
     ProposalType,
     Wallet,
     WalletFilter,
-    WalletFilterN,
 )
 from app.config import config
 from app.lib.logger import configure_logger
@@ -115,34 +114,9 @@ async def _validate_airdrop_recipients(recipients: List[str]) -> Dict[str, bool]
     Returns:
         Dict mapping each recipient to whether it exists in wallets table
     """
-    if not recipients:
-        return {}
-
-    # Determine which network to check based on config
-    from app.config import config
-
-    use_mainnet = config.network.network == "mainnet"
-
-    # Query wallets table for all recipients at once, filtering by the appropriate network
-    if use_mainnet:
-        wallet_filter = WalletFilterN(mainnet_addresses=recipients)
-    else:
-        wallet_filter = WalletFilterN(testnet_addresses=recipients)
-
-    wallets = backend.list_wallets_n(filters=wallet_filter)
-
-    # Create set of valid addresses for efficient lookup
-    if use_mainnet:
-        valid_addresses = {w.mainnet_address for w in wallets if w.mainnet_address}
-    else:
-        valid_addresses = {w.testnet_address for w in wallets if w.testnet_address}
-
-    # Check each recipient
-    validation_results = {}
-    for recipient in recipients:
-        validation_results[recipient] = recipient in valid_addresses
+    from app.lib.utils import validate_wallet_recipients
 
-    return validation_results
+    return await validate_wallet_recipients(recipients)
 
 
 async def _create_proposal_from_tool_result(

app/api/tools/dao.py

@@ -566,3 +566,45 @@ def calculate_token_cost(
         "currency": "USD",
         "details": token_details,
     }
+
+
+async def validate_wallet_recipients(recipients: List[str]) -> Dict[str, bool]:
+    """Validate recipients against the wallets table using network-specific filtering.
+
+    Args:
+        recipients: List of recipient addresses to validate
+
+    Returns:
+        Dict mapping each recipient to whether it exists in wallets table
+    """
+    if not recipients:
+        return {}
+
+    # Import here to avoid circular imports
+    from app.config import config
+    from app.backend.factory import backend
+    from app.backend.models import WalletFilterN
+
+    # Determine which network to check based on config
+    use_mainnet = config.network.network == "mainnet"
+
+    # Query wallets table for all recipients at once, filtering by the appropriate network
+    if use_mainnet:
+        wallet_filter = WalletFilterN(mainnet_addresses=recipients)
+    else:
+        wallet_filter = WalletFilterN(testnet_addresses=recipients)
+
+    wallets = backend.list_wallets_n(filters=wallet_filter)
+
+    # Create set of valid addresses for efficient lookup
+    if use_mainnet:
+        valid_addresses = {w.mainnet_address for w in wallets if w.mainnet_address}
+    else:
+        valid_addresses = {w.testnet_address for w in wallets if w.testnet_address}
+
+    # Check each recipient
+    validation_results = {}
+    for recipient in recipients:
+        validation_results[recipient] = recipient in valid_addresses
+
+    return validation_results

app/lib/utils.py

@@ -4,7 +4,7 @@
 from typing import Dict, List
 
 from app.backend.factory import backend
-from app.backend.models import AirdropCreate, AirdropFilter, WalletFilterN
+from app.backend.models import AirdropCreate, AirdropFilter
 from app.services.integrations.webhooks.chainhook.handlers.base import (
     ChainhookEventHandler,
 )
@@ -190,33 +190,9 @@ async def _validate_recipients_against_wallets(
         Returns:
             Dict mapping each recipient to whether it exists in wallets table
         """
-        if not recipients:
-            return {}
+        from app.lib.utils import validate_wallet_recipients
 
-        # Query wallets table for all recipients at once
-        wallet_filter = WalletFilterN(
-            mainnet_addresses=recipients, testnet_addresses=recipients
-        )
-        wallets = backend.list_wallets_n(filters=wallet_filter)
-
-        # Create sets of valid addresses for efficient lookup
-        valid_mainnet_addresses = {
-            w.mainnet_address for w in wallets if w.mainnet_address
-        }
-        valid_testnet_addresses = {
-            w.testnet_address for w in wallets if w.testnet_address
-        }
-
-        # Check each recipient
-        validation_results = {}
-        for recipient in recipients:
-            is_valid = (
-                recipient in valid_mainnet_addresses
-                or recipient in valid_testnet_addresses
-            )
-            validation_results[recipient] = is_valid
-
-        return validation_results
+        return await validate_wallet_recipients(recipients)
 
     def _validate_minimum_requirements(
         self, total_amount: int, recipient_count: int