iwa 0.1.1__tar.gz → 0.1.3__tar.gz

{iwa-0.1.1/src/iwa.egg-info → iwa-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iwa
-Version: 0.1.1
+Version: 0.1.3
 Summary: A secure, modular, and plugin-based framework for crypto agents and ops
 Requires-Python: <4.0,>=3.12
 Description-Content-Type: text/markdown

{iwa-0.1.1 → iwa-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "iwa"
-version = "0.1.1"
+version = "0.1.3"
 description = "A secure, modular, and plugin-based framework for crypto agents and ops"
 readme = "README.md"
 requires-python = ">=3.12,<4.0"
@@ -72,7 +72,7 @@ where = ["src"]
 
 [tool.ruff]
 line-length = 100
-target-version = "0.1.1"
+target-version = "0.1.3"
 fix = true
 
 [tool.ruff.lint]

{iwa-0.1.1 → iwa-0.1.3}/src/iwa/core/chain/interface.py

@@ -94,6 +94,9 @@ class ChainInterface:
         """Get the current active RPC URL."""
         if not self.chain.rpcs:
             return ""
+        # Ensure index is valid (could be stale after rpcs list changes or singleton reuse)
+        if self._current_rpc_index >= len(self.chain.rpcs):
+            self._current_rpc_index = 0
         return self.chain.rpcs[self._current_rpc_index]
 
     @property

{iwa-0.1.1 → iwa-0.1.3}/src/iwa/core/services/transaction.py

@@ -1,5 +1,6 @@
 """Transaction service module."""
 
+import threading
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple
 
 from loguru import logger
@@ -220,12 +221,29 @@ class TransferLogger:
 class TransactionService:
     """Manages transaction lifecycle: signing, sending, retrying."""
 
+    # Class-level lock for managing per-address locks
+    _locks_lock = threading.Lock()
+    _address_locks: Dict[str, threading.Lock] = {}
+
     def __init__(self, key_storage: KeyStorage, account_service: AccountService, safe_service=None):
         """Initialize TransactionService."""
         self.key_storage = key_storage
         self.account_service = account_service
         self.safe_service = safe_service
 
+    @classmethod
+    def _get_address_lock(cls, address: str) -> threading.Lock:
+        """Get or create a lock for a specific address.
+
+        This prevents nonce collisions when sending multiple transactions
+        from the same address concurrently.
+        """
+        address_lower = address.lower()
+        with cls._locks_lock:
+            if address_lower not in cls._address_locks:
+                cls._address_locks[address_lower] = threading.Lock()
+            return cls._address_locks[address_lower]
+
     def _resolve_label(self, address: str, chain_name: str = "gnosis") -> str:
         """Resolve address to human-readable label."""
         if not address:
@@ -255,69 +273,84 @@ class TransactionService:
 
         Uses ChainInterface.with_retry() for consistent RPC rotation and retry logic.
         Gas errors are handled by increasing gas and retrying within the same mechanism.
+
+        Note: Uses per-address locking to prevent nonce collisions when multiple
+        transactions are sent from the same address concurrently.
         """
         chain_interface = ChainInterfaces().get(chain_name)
         tx = dict(transaction)
 
-        if not self._prepare_transaction(tx, signer_address_or_tag, chain_interface):
+        # Resolve signer first to get the address for locking
+        signer_account = self.account_service.resolve_account(signer_address_or_tag)
+        if not signer_account:
+            logger.error(f"Signer {signer_address_or_tag} not found")
             return False, {}
 
-        # CHECK FOR SAFE TRANSACTION
-        signer_account = self.account_service.resolve_account(signer_address_or_tag)
+        # CHECK FOR SAFE TRANSACTION (Safe has its own nonce management)
         if isinstance(signer_account, StoredSafeAccount):
             if not self.safe_service:
                 logger.error("Attempted Safe transaction but SafeService is not initialized.")
                 return False, {}
+            # Safe transactions don't need EOA nonce locking
+            if not self._prepare_transaction(tx, signer_address_or_tag, chain_interface):
+                return False, {}
             return self._execute_via_safe(tx, signer_account, chain_interface, chain_name, tags)
 
-        # Mutable state for retry attempts
-        state = {"gas_retries": 0, "max_gas_retries": 5}
+        # Acquire lock for this address to prevent nonce collisions
+        address_lock = self._get_address_lock(signer_account.address)
+        with address_lock:
+            if not self._prepare_transaction(tx, signer_address_or_tag, chain_interface):
+                return False, {}
 
-        def _do_sign_send_wait() -> Tuple[bool, Dict, bytes]:
-            """Inner operation wrapped by with_retry."""
-            try:
-                signed_txn = self.key_storage.sign_transaction(tx, signer_address_or_tag)
-                txn_hash = chain_interface.web3.eth.send_raw_transaction(signed_txn.raw_transaction)
-                receipt = chain_interface.web3.eth.wait_for_transaction_receipt(txn_hash)
+            # Mutable state for retry attempts
+            state = {"gas_retries": 0, "max_gas_retries": 5}
 
-                status = getattr(receipt, "status", None)
-                if status is None and isinstance(receipt, dict):
-                    status = receipt.get("status")
+            def _do_sign_send_wait() -> Tuple[bool, Dict, bytes]:
+                """Inner operation wrapped by with_retry."""
+                try:
+                    signed_txn = self.key_storage.sign_transaction(tx, signer_address_or_tag)
+                    txn_hash = chain_interface.web3.eth.send_raw_transaction(
+                        signed_txn.raw_transaction
+                    )
+                    receipt = chain_interface.web3.eth.wait_for_transaction_receipt(txn_hash)
 
-                if receipt and status == 1:
-                    return True, receipt, txn_hash
-                # Transaction mined but reverted - don't retry
-                logger.error("Transaction failed (status 0).")
-                raise ValueError("Transaction reverted")
+                    status = getattr(receipt, "status", None)
+                    if status is None and isinstance(receipt, dict):
+                        status = receipt.get("status")
 
-            except web3_exceptions.Web3RPCError as e:
-                # Handle gas errors by increasing gas and re-raising
-                self._handle_gas_retry(e, tx, state)
-                raise  # Re-raise to trigger with_retry's retry mechanism
+                    if receipt and status == 1:
+                        return True, receipt, txn_hash
+                    # Transaction mined but reverted - don't retry
+                    logger.error("Transaction failed (status 0).")
+                    raise ValueError("Transaction reverted")
 
-        try:
-            success, receipt, txn_hash = chain_interface.with_retry(
-                _do_sign_send_wait,
-                operation_name=f"sign_and_send to {tx.get('to', 'unknown')[:10]}...",
-            )
-            if success:
-                signer_account = self.account_service.resolve_account(signer_address_or_tag)
-                chain_interface.wait_for_no_pending_tx(signer_account.address)
-                logger.info(f"Transaction sent successfully. Tx Hash: {txn_hash.hex()}")
-                self._log_successful_transaction(
-                    receipt, tx, signer_account, chain_name, txn_hash, tags, chain_interface
+                except web3_exceptions.Web3RPCError as e:
+                    # Handle gas errors by increasing gas and re-raising
+                    self._handle_gas_retry(e, tx, state)
+                    raise  # Re-raise to trigger with_retry's retry mechanism
+
+            try:
+                success, receipt, txn_hash = chain_interface.with_retry(
+                    _do_sign_send_wait,
+                    operation_name=f"sign_and_send to {tx.get('to', 'unknown')[:10]}...",
                 )
-                return True, receipt
-            return False, {}
-        except ValueError as e:
-            # Transaction reverted - already logged
-            if "reverted" in str(e).lower():
+                if success:
+                    chain_interface.wait_for_no_pending_tx(signer_account.address)
+                    logger.info(f"Transaction sent successfully. Tx Hash: {txn_hash.hex()}")
+                    self._log_successful_transaction(
+                        receipt, tx, signer_account, chain_name, txn_hash, tags, chain_interface
+                    )
+                    return True, receipt
+                return False, {}
+            except ValueError as e:
+                # Transaction reverted - already logged
+                if "reverted" in str(e).lower():
+                    return False, {}
+                logger.exception(f"Transaction failed: {e}")
+                return False, {}
+            except Exception as e:
+                logger.exception(f"Transaction failed after retries: {e}")
                 return False, {}
-            logger.exception(f"Transaction failed: {e}")
-            return False, {}
-        except Exception as e:
-            logger.exception(f"Transaction failed after retries: {e}")
-            return False, {}
 
     def _prepare_transaction(self, tx: dict, signer_tag: str, chain_interface) -> bool:
         """Ensure nonce and chainId are set."""

{iwa-0.1.1 → iwa-0.1.3}/src/iwa/plugins/olas/contracts/staking.py

@@ -495,3 +495,138 @@ class StakingContract(ContractInstance):
             tx_params={"from": from_address},
         )
         return tx
+
+    def _fetch_events_chunked(
+        self,
+        event_type: str,
+        from_block: int,
+        to_block: int,
+        chunk_size: int = 500,
+    ) -> List:
+        """Fetch events in chunks to handle RPC block range limits.
+
+        Args:
+            event_type: Name of the event (Checkpoint, ServiceInactivityWarning, etc.)
+            from_block: Starting block number.
+            to_block: Ending block number.
+            chunk_size: Max blocks per request (default 500).
+
+        Returns:
+            List of event log entries.
+
+        """
+        all_logs: List = []
+        current_from = from_block
+
+        event = getattr(self.contract.events, event_type, None)
+        if event is None:
+            logger.debug(f"Event {event_type} not found in contract ABI")
+            return []
+
+        while current_from <= to_block:
+            current_to = min(current_from + chunk_size - 1, to_block)
+
+            try:
+                event_filter = event.create_filter(
+                    from_block=current_from, to_block=current_to
+                )
+                logs = event_filter.get_all_entries()
+                all_logs.extend(logs)
+            except Exception as e:
+                error_msg = str(e).lower()
+                # If range too large, try smaller chunks
+                if "range" in error_msg or "limit" in error_msg or "10000" in error_msg:
+                    if chunk_size > 100:
+                        logger.debug(
+                            "Block range too large, retrying with smaller chunks"
+                        )
+                        smaller_logs = self._fetch_events_chunked(
+                            event_type, current_from, current_to, chunk_size // 2
+                        )
+                        all_logs.extend(smaller_logs)
+                    else:
+                        logger.warning(
+                            f"Cannot fetch {event_type} events for blocks "
+                            f"{current_from}-{current_to}: {e}"
+                        )
+                else:
+                    logger.debug(f"Error fetching {event_type} events: {e}")
+
+            current_from = current_to + 1
+
+        return all_logs
+
+    def get_checkpoint_events(
+        self, from_block: int, to_block: Optional[int] = None
+    ) -> Dict:
+        """Get checkpoint-related events from a block range.
+
+        Retrieves Checkpoint, ServiceInactivityWarning, and ServicesEvicted events
+        to determine which services received rewards and which got warnings.
+
+        Uses chunked fetching to handle RPCs that limit block ranges.
+
+        Args:
+            from_block: Starting block number.
+            to_block: Ending block number (defaults to latest).
+
+        Returns:
+            Dict with:
+                - epoch: int, the new epoch number
+                - rewarded_services: Dict[int, int] mapping service_id -> reward (wei)
+                - inactivity_warnings: List[int] of service IDs with warnings
+                - evicted_services: List[int] of evicted service IDs
+                - checkpoint_block: int, block where checkpoint occurred
+
+        """
+        if to_block is None:
+            to_block = self.chain_interface.web3.eth.block_number
+
+        result: Dict = {
+            "epoch": None,
+            "rewarded_services": {},
+            "inactivity_warnings": [],
+            "evicted_services": [],
+            "checkpoint_block": None,
+        }
+
+        try:
+            # Get Checkpoint events
+            checkpoint_logs = self._fetch_events_chunked(
+                "Checkpoint", from_block, to_block
+            )
+
+            if checkpoint_logs:
+                # Take the most recent checkpoint
+                latest = checkpoint_logs[-1]
+                result["epoch"] = latest.args.get("epoch")
+                result["checkpoint_block"] = latest.blockNumber
+
+                # Parse serviceIds and rewards arrays
+                service_ids = latest.args.get("serviceIds", [])
+                rewards = latest.args.get("rewards", [])
+
+                for sid, reward in zip(service_ids, rewards, strict=True):
+                    result["rewarded_services"][sid] = reward
+
+            # Get ServiceInactivityWarning events
+            warning_logs = self._fetch_events_chunked(
+                "ServiceInactivityWarning", from_block, to_block
+            )
+            for log in warning_logs:
+                service_id = log.args.get("serviceId")
+                if service_id is not None:
+                    result["inactivity_warnings"].append(service_id)
+
+            # Get ServicesEvicted events
+            evicted_logs = self._fetch_events_chunked(
+                "ServicesEvicted", from_block, to_block
+            )
+            for log in evicted_logs:
+                evicted_ids = log.args.get("serviceIds", [])
+                result["evicted_services"].extend(evicted_ids)
+
+        except Exception as e:
+            logger.error(f"Error fetching checkpoint events: {e}")
+
+        return result