iwa 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

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/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/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

iwa/plugins/olas/tests/test_staking_integration.py

@@ -271,3 +271,503 @@ def test_staking_contract(tmp_path):  # noqa: C901
                 # Verify new nonces fields
                 assert info["current_safe_nonce"] == 5
                 assert info["current_mech_requests"] == 3
+
+
+def test_get_checkpoint_events():
+    """Test get_checkpoint_events method."""
+    with patch("builtins.open", side_effect=side_effect_open):
+        with patch("iwa.core.contracts.contract.ChainInterfaces") as mock_interfaces:
+            mock_chain = MagicMock()
+            mock_interfaces.return_value.get.return_value = mock_chain
+
+            mock_web3 = MagicMock()
+            mock_chain.web3 = mock_web3
+            mock_chain.web3._web3 = mock_web3
+            mock_web3.eth.block_number = 1000
+
+            mock_contract = MagicMock()
+            mock_web3.eth.contract.return_value = mock_contract
+
+            # Mock ActivityChecker calls
+            mock_contract.functions.agentMech.return_value.call.return_value = VALID_ADDR_2
+            mock_contract.functions.livenessRatio.return_value.call.return_value = 10**18
+
+            with patch(
+                "iwa.plugins.olas.contracts.staking.ContractInstance.call"
+            ) as mock_call_base:
+
+                def init_side_effect(method, *args):
+                    if method == "activityChecker":
+                        return VALID_ADDR_4
+                    if method == "stakingToken":
+                        return VALID_ADDR_2
+                    return 0
+
+                mock_call_base.side_effect = init_side_effect
+
+                staking = StakingContract(VALID_ADDR_1)
+
+                # Test 1: Checkpoint event with rewarded services
+                mock_checkpoint_log = MagicMock()
+                mock_checkpoint_log.args = {
+                    "epoch": 42,
+                    "serviceIds": [101, 102, 103],
+                    "rewards": [1000, 2000, 3000],
+                }
+                mock_checkpoint_log.blockNumber = 999
+
+                mock_checkpoint_filter = MagicMock()
+                mock_checkpoint_filter.get_all_entries.return_value = [mock_checkpoint_log]
+                mock_contract.events.Checkpoint.create_filter.return_value = (
+                    mock_checkpoint_filter
+                )
+
+                # No warnings or evictions
+                mock_warning_filter = MagicMock()
+                mock_warning_filter.get_all_entries.return_value = []
+                mock_contract.events.ServiceInactivityWarning.create_filter.return_value = (
+                    mock_warning_filter
+                )
+
+                mock_evicted_filter = MagicMock()
+                mock_evicted_filter.get_all_entries.return_value = []
+                mock_contract.events.ServicesEvicted.create_filter.return_value = (
+                    mock_evicted_filter
+                )
+
+                result = staking.get_checkpoint_events(from_block=900, to_block=1000)
+
+                assert result["epoch"] == 42
+                assert result["checkpoint_block"] == 999
+                assert result["rewarded_services"] == {101: 1000, 102: 2000, 103: 3000}
+                assert result["inactivity_warnings"] == []
+                assert result["evicted_services"] == []
+
+
+def test_get_checkpoint_events_with_warnings():
+    """Test get_checkpoint_events with inactivity warnings."""
+    with patch("builtins.open", side_effect=side_effect_open):
+        with patch("iwa.core.contracts.contract.ChainInterfaces") as mock_interfaces:
+            mock_chain = MagicMock()
+            mock_interfaces.return_value.get.return_value = mock_chain
+
+            mock_web3 = MagicMock()
+            mock_chain.web3 = mock_web3
+            mock_chain.web3._web3 = mock_web3
+            mock_web3.eth.block_number = 1000
+
+            mock_contract = MagicMock()
+            mock_web3.eth.contract.return_value = mock_contract
+
+            mock_contract.functions.agentMech.return_value.call.return_value = VALID_ADDR_2
+            mock_contract.functions.livenessRatio.return_value.call.return_value = 10**18
+
+            with patch(
+                "iwa.plugins.olas.contracts.staking.ContractInstance.call"
+            ) as mock_call_base:
+
+                def init_side_effect(method, *args):
+                    if method == "activityChecker":
+                        return VALID_ADDR_4
+                    if method == "stakingToken":
+                        return VALID_ADDR_2
+                    return 0
+
+                mock_call_base.side_effect = init_side_effect
+
+                staking = StakingContract(VALID_ADDR_1)
+
+                # Checkpoint event
+                mock_checkpoint_log = MagicMock()
+                mock_checkpoint_log.args = {
+                    "epoch": 10,
+                    "serviceIds": [101, 102],
+                    "rewards": [1000, 2000],
+                }
+                mock_checkpoint_log.blockNumber = 999
+
+                mock_checkpoint_filter = MagicMock()
+                mock_checkpoint_filter.get_all_entries.return_value = [mock_checkpoint_log]
+                mock_contract.events.Checkpoint.create_filter.return_value = (
+                    mock_checkpoint_filter
+                )
+
+                # Inactivity warnings
+                mock_warning_log_1 = MagicMock()
+                mock_warning_log_1.args = {"serviceId": 101}
+                mock_warning_log_2 = MagicMock()
+                mock_warning_log_2.args = {"serviceId": 103}
+
+                mock_warning_filter = MagicMock()
+                mock_warning_filter.get_all_entries.return_value = [
+                    mock_warning_log_1,
+                    mock_warning_log_2,
+                ]
+                mock_contract.events.ServiceInactivityWarning.create_filter.return_value = (
+                    mock_warning_filter
+                )
+
+                mock_evicted_filter = MagicMock()
+                mock_evicted_filter.get_all_entries.return_value = []
+                mock_contract.events.ServicesEvicted.create_filter.return_value = (
+                    mock_evicted_filter
+                )
+
+                result = staking.get_checkpoint_events(from_block=900)
+
+                assert result["epoch"] == 10
+                assert result["inactivity_warnings"] == [101, 103]
+                assert result["evicted_services"] == []
+
+
+def test_get_checkpoint_events_with_evictions():
+    """Test get_checkpoint_events with evicted services."""
+    with patch("builtins.open", side_effect=side_effect_open):
+        with patch("iwa.core.contracts.contract.ChainInterfaces") as mock_interfaces:
+            mock_chain = MagicMock()
+            mock_interfaces.return_value.get.return_value = mock_chain
+
+            mock_web3 = MagicMock()
+            mock_chain.web3 = mock_web3
+            mock_chain.web3._web3 = mock_web3
+            mock_web3.eth.block_number = 1000
+
+            mock_contract = MagicMock()
+            mock_web3.eth.contract.return_value = mock_contract
+
+            mock_contract.functions.agentMech.return_value.call.return_value = VALID_ADDR_2
+            mock_contract.functions.livenessRatio.return_value.call.return_value = 10**18
+
+            with patch(
+                "iwa.plugins.olas.contracts.staking.ContractInstance.call"
+            ) as mock_call_base:
+
+                def init_side_effect(method, *args):
+                    if method == "activityChecker":
+                        return VALID_ADDR_4
+                    if method == "stakingToken":
+                        return VALID_ADDR_2
+                    return 0
+
+                mock_call_base.side_effect = init_side_effect
+
+                staking = StakingContract(VALID_ADDR_1)
+
+                # Checkpoint event
+                mock_checkpoint_log = MagicMock()
+                mock_checkpoint_log.args = {
+                    "epoch": 5,
+                    "serviceIds": [102],
+                    "rewards": [5000],
+                }
+                mock_checkpoint_log.blockNumber = 888
+
+                mock_checkpoint_filter = MagicMock()
+                mock_checkpoint_filter.get_all_entries.return_value = [mock_checkpoint_log]
+                mock_contract.events.Checkpoint.create_filter.return_value = (
+                    mock_checkpoint_filter
+                )
+
+                # No warnings
+                mock_warning_filter = MagicMock()
+                mock_warning_filter.get_all_entries.return_value = []
+                mock_contract.events.ServiceInactivityWarning.create_filter.return_value = (
+                    mock_warning_filter
+                )
+
+                # Evictions
+                mock_evicted_log = MagicMock()
+                mock_evicted_log.args = {"serviceIds": [101, 104]}
+
+                mock_evicted_filter = MagicMock()
+                mock_evicted_filter.get_all_entries.return_value = [mock_evicted_log]
+                mock_contract.events.ServicesEvicted.create_filter.return_value = (
+                    mock_evicted_filter
+                )
+
+                result = staking.get_checkpoint_events(from_block=800)
+
+                assert result["epoch"] == 5
+                assert result["checkpoint_block"] == 888
+                assert result["rewarded_services"] == {102: 5000}
+                assert result["evicted_services"] == [101, 104]
+
+
+def test_get_checkpoint_events_no_events():
+    """Test get_checkpoint_events when no checkpoint events found."""
+    with patch("builtins.open", side_effect=side_effect_open):
+        with patch("iwa.core.contracts.contract.ChainInterfaces") as mock_interfaces:
+            mock_chain = MagicMock()
+            mock_interfaces.return_value.get.return_value = mock_chain
+
+            mock_web3 = MagicMock()
+            mock_chain.web3 = mock_web3
+            mock_chain.web3._web3 = mock_web3
+            mock_web3.eth.block_number = 1000
+
+            mock_contract = MagicMock()
+            mock_web3.eth.contract.return_value = mock_contract
+
+            mock_contract.functions.agentMech.return_value.call.return_value = VALID_ADDR_2
+            mock_contract.functions.livenessRatio.return_value.call.return_value = 10**18
+
+            with patch(
+                "iwa.plugins.olas.contracts.staking.ContractInstance.call"
+            ) as mock_call_base:
+
+                def init_side_effect(method, *args):
+                    if method == "activityChecker":
+                        return VALID_ADDR_4
+                    if method == "stakingToken":
+                        return VALID_ADDR_2
+                    return 0
+
+                mock_call_base.side_effect = init_side_effect
+
+                staking = StakingContract(VALID_ADDR_1)
+
+                # No checkpoint events
+                mock_checkpoint_filter = MagicMock()
+                mock_checkpoint_filter.get_all_entries.return_value = []
+                mock_contract.events.Checkpoint.create_filter.return_value = (
+                    mock_checkpoint_filter
+                )
+
+                mock_warning_filter = MagicMock()
+                mock_warning_filter.get_all_entries.return_value = []
+                mock_contract.events.ServiceInactivityWarning.create_filter.return_value = (
+                    mock_warning_filter
+                )
+
+                mock_evicted_filter = MagicMock()
+                mock_evicted_filter.get_all_entries.return_value = []
+                mock_contract.events.ServicesEvicted.create_filter.return_value = (
+                    mock_evicted_filter
+                )
+
+                result = staking.get_checkpoint_events(from_block=900)
+
+                assert result["epoch"] is None
+                assert result["checkpoint_block"] is None
+                assert result["rewarded_services"] == {}
+                assert result["inactivity_warnings"] == []
+                assert result["evicted_services"] == []
+
+
+def test_get_checkpoint_events_handles_exceptions():
+    """Test get_checkpoint_events handles exceptions gracefully."""
+    with patch("builtins.open", side_effect=side_effect_open):
+        with patch("iwa.core.contracts.contract.ChainInterfaces") as mock_interfaces:
+            mock_chain = MagicMock()
+            mock_interfaces.return_value.get.return_value = mock_chain
+
+            mock_web3 = MagicMock()
+            mock_chain.web3 = mock_web3
+            mock_chain.web3._web3 = mock_web3
+            mock_web3.eth.block_number = 1000
+
+            mock_contract = MagicMock()
+            mock_web3.eth.contract.return_value = mock_contract
+
+            mock_contract.functions.agentMech.return_value.call.return_value = VALID_ADDR_2
+            mock_contract.functions.livenessRatio.return_value.call.return_value = 10**18
+
+            with patch(
+                "iwa.plugins.olas.contracts.staking.ContractInstance.call"
+            ) as mock_call_base:
+
+                def init_side_effect(method, *args):
+                    if method == "activityChecker":
+                        return VALID_ADDR_4
+                    if method == "stakingToken":
+                        return VALID_ADDR_2
+                    return 0
+
+                mock_call_base.side_effect = init_side_effect
+
+                staking = StakingContract(VALID_ADDR_1)
+
+                # Checkpoint filter raises an exception
+                mock_contract.events.Checkpoint.create_filter.side_effect = Exception(
+                    "RPC error"
+                )
+
+                result = staking.get_checkpoint_events(from_block=900)
+
+                # Should return default empty result
+                assert result["epoch"] is None
+                assert result["rewarded_services"] == {}
+                assert result["inactivity_warnings"] == []
+                assert result["evicted_services"] == []
+
+
+def test_fetch_events_chunked_splits_large_range():
+    """Test that _fetch_events_chunked splits large block ranges into chunks."""
+    with patch("builtins.open", side_effect=side_effect_open):
+        with patch("iwa.core.contracts.contract.ChainInterfaces") as mock_interfaces:
+            mock_chain = MagicMock()
+            mock_interfaces.return_value.get.return_value = mock_chain
+
+            mock_web3 = MagicMock()
+            mock_chain.web3 = mock_web3
+            mock_chain.web3._web3 = mock_web3
+            mock_web3.eth.block_number = 2000
+
+            mock_contract = MagicMock()
+            mock_web3.eth.contract.return_value = mock_contract
+
+            mock_contract.functions.agentMech.return_value.call.return_value = VALID_ADDR_2
+            mock_contract.functions.livenessRatio.return_value.call.return_value = 10**18
+
+            with patch(
+                "iwa.plugins.olas.contracts.staking.ContractInstance.call"
+            ) as mock_call_base:
+
+                def init_side_effect(method, *args):
+                    if method == "activityChecker":
+                        return VALID_ADDR_4
+                    if method == "stakingToken":
+                        return VALID_ADDR_2
+                    return 0
+
+                mock_call_base.side_effect = init_side_effect
+
+                staking = StakingContract(VALID_ADDR_1)
+
+                # Track calls to create_filter
+                call_ranges = []
+
+                def track_filter_calls(from_block, to_block):
+                    call_ranges.append((from_block, to_block))
+                    mock_filter = MagicMock()
+                    mock_filter.get_all_entries.return_value = []
+                    return mock_filter
+
+                mock_contract.events.Checkpoint.create_filter.side_effect = (
+                    track_filter_calls
+                )
+
+                # Fetch 1200 blocks with chunk_size=500 -> should make 3 calls
+                staking._fetch_events_chunked("Checkpoint", 0, 1199, chunk_size=500)
+
+                assert len(call_ranges) == 3
+                assert call_ranges[0] == (0, 499)
+                assert call_ranges[1] == (500, 999)
+                assert call_ranges[2] == (1000, 1199)
+
+
+def test_fetch_events_chunked_retries_with_smaller_chunks():
+    """Test that _fetch_events_chunked retries with smaller chunks on range error."""
+    with patch("builtins.open", side_effect=side_effect_open):
+        with patch("iwa.core.contracts.contract.ChainInterfaces") as mock_interfaces:
+            mock_chain = MagicMock()
+            mock_interfaces.return_value.get.return_value = mock_chain
+
+            mock_web3 = MagicMock()
+            mock_chain.web3 = mock_web3
+            mock_chain.web3._web3 = mock_web3
+            mock_web3.eth.block_number = 1000
+
+            mock_contract = MagicMock()
+            mock_web3.eth.contract.return_value = mock_contract
+
+            mock_contract.functions.agentMech.return_value.call.return_value = VALID_ADDR_2
+            mock_contract.functions.livenessRatio.return_value.call.return_value = 10**18
+
+            with patch(
+                "iwa.plugins.olas.contracts.staking.ContractInstance.call"
+            ) as mock_call_base:
+
+                def init_side_effect(method, *args):
+                    if method == "activityChecker":
+                        return VALID_ADDR_4
+                    if method == "stakingToken":
+                        return VALID_ADDR_2
+                    return 0
+
+                mock_call_base.side_effect = init_side_effect
+
+                staking = StakingContract(VALID_ADDR_1)
+
+                call_count = [0]
+
+                def fail_then_succeed(from_block, to_block):
+                    call_count[0] += 1
+                    # First call fails with range error, subsequent calls succeed
+                    if call_count[0] == 1:
+                        raise Exception("block range too large")
+                    mock_filter = MagicMock()
+                    mock_filter.get_all_entries.return_value = []
+                    return mock_filter
+
+                mock_contract.events.Checkpoint.create_filter.side_effect = (
+                    fail_then_succeed
+                )
+
+                # Should retry with smaller chunks
+                result = staking._fetch_events_chunked(
+                    "Checkpoint", 0, 499, chunk_size=500
+                )
+
+                # First call fails, then retries with chunk_size=250 (2 calls)
+                assert call_count[0] >= 2
+                assert result == []
+
+
+def test_fetch_events_chunked_aggregates_results():
+    """Test that _fetch_events_chunked aggregates events from all chunks."""
+    with patch("builtins.open", side_effect=side_effect_open):
+        with patch("iwa.core.contracts.contract.ChainInterfaces") as mock_interfaces:
+            mock_chain = MagicMock()
+            mock_interfaces.return_value.get.return_value = mock_chain
+
+            mock_web3 = MagicMock()
+            mock_chain.web3 = mock_web3
+            mock_chain.web3._web3 = mock_web3
+            mock_web3.eth.block_number = 1000
+
+            mock_contract = MagicMock()
+            mock_web3.eth.contract.return_value = mock_contract
+
+            mock_contract.functions.agentMech.return_value.call.return_value = VALID_ADDR_2
+            mock_contract.functions.livenessRatio.return_value.call.return_value = 10**18
+
+            with patch(
+                "iwa.plugins.olas.contracts.staking.ContractInstance.call"
+            ) as mock_call_base:
+
+                def init_side_effect(method, *args):
+                    if method == "activityChecker":
+                        return VALID_ADDR_4
+                    if method == "stakingToken":
+                        return VALID_ADDR_2
+                    return 0
+
+                mock_call_base.side_effect = init_side_effect
+
+                staking = StakingContract(VALID_ADDR_1)
+
+                chunk_num = [0]
+
+                def return_different_events(from_block, to_block):
+                    chunk_num[0] += 1
+                    mock_filter = MagicMock()
+                    # Each chunk returns a different event
+                    event = MagicMock()
+                    event.args = {"serviceId": 100 + chunk_num[0]}
+                    mock_filter.get_all_entries.return_value = [event]
+                    return mock_filter
+
+                mock_contract.events.ServiceInactivityWarning.create_filter.side_effect = (
+                    return_different_events
+                )
+
+                # Fetch 600 blocks with chunk_size=200 -> 3 chunks
+                result = staking._fetch_events_chunked(
+                    "ServiceInactivityWarning", 0, 599, chunk_size=200
+                )
+
+                # Should have 3 events aggregated
+                assert len(result) == 3
+                service_ids = [e.args["serviceId"] for e in result]
+                assert service_ids == [101, 102, 103]

{iwa-0.1.1.dist-info → iwa-0.1.3.dist-info}/METADATA

@@ -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.dist-info → iwa-0.1.3.dist-info}/RECORD

@@ -23,7 +23,7 @@ iwa/core/utils.py,sha256=FTYpIdQ1wnugD4lYU4TQ7d7_TlDs4CTUIhEpHGEJph4,4281
 iwa/core/wallet.py,sha256=xSGFOK5Wzh-ctLGhBMK1BySlXN0Ircpztyk1an21QiQ,13129
 iwa/core/chain/__init__.py,sha256=XJMmn0ed-_aVkY2iEMKpuTxPgIKBd41dexSVmEZTa-o,1604
 iwa/core/chain/errors.py,sha256=9SEbhxZ-qASPkzt-DoI51qq0GRJVqRgqgL720gO7a64,1275
-iwa/core/chain/interface.py,sha256=D_bDIQhQVfY9A2nLPpQ3bipmywoYsi2wVNPXPKutFec,30760
+iwa/core/chain/interface.py,sha256=Z7AcLjlYRw8uBj1zklVGep8Z21T-uBCamW48df7w0ew,30952
 iwa/core/chain/manager.py,sha256=XHwn7ciapFCZVk0rPSJopUqM5Wu3Kpp6XrenkgTE1HA,1397
 iwa/core/chain/models.py,sha256=WUhAighMKcFdbAUkPU_3dkGbWyAUpRJqXMHLcWFC1xg,5261
 iwa/core/chain/rate_limiter.py,sha256=Ps1MrR4HHtylxgUAawe6DoC9tuqKagjQdKulqcJD2gs,9093
@@ -42,7 +42,7 @@ iwa/core/services/balance.py,sha256=MSCEzPRDPlHIjaWD1A2X2oIuiMz5MFJjD7sSHUxQ8OM,
 iwa/core/services/plugin.py,sha256=GNNlbtELyHl7MNVChrypF76GYphxXduxDog4kx1MLi8,3277
 iwa/core/services/safe.py,sha256=HG3yAN5IdNR45uuHfjAuaT4XVy_tiivoMTQLoEHlEwY,15701
 iwa/core/services/safe_executor.py,sha256=uZIoE_VeB0B9b-HhZ5jNWXna1kr8e_LZ8qEt63kGxIU,17082
-iwa/core/services/transaction.py,sha256=FrGRWn1xo5rbGIr2ToZ2kPzapr3zmWW38oycyB87TK8,19971
+iwa/core/services/transaction.py,sha256=eh--51bAA3rbK1gPjfk7zA5Gm9GJ7CJ82uzG4O5A-Rs,21501
 iwa/core/services/transfer/__init__.py,sha256=7p22xtwrH0murXWTuTGNw0WRKBDqjJEnnVaUpWd8Vfo,5589
 iwa/core/services/transfer/base.py,sha256=sohz-Ss2i-pGYGl4x9bD93cnYKcSvsXaXyvyRawvgQs,9043
 iwa/core/services/transfer/erc20.py,sha256=e6RD1_QcI_-iJvP85kj7aw4p6NnCPjZcm-QSKi14RRA,10104
@@ -78,7 +78,7 @@ iwa/plugins/olas/contracts/mech.py,sha256=dXYtyORc-oiu9ga5PtTquOFkoakb6BLGKvlUst
 iwa/plugins/olas/contracts/mech_marketplace.py,sha256=hMADl5MQGvT2wLRKu4vHGe4RrAZVq8Y2M_EvXWWz528,1554
 iwa/plugins/olas/contracts/mech_marketplace_v1.py,sha256=ooF5uw1wxwYsoriGUGGxXxmaD8DtWZtK4TJBCUNTGtI,2501
 iwa/plugins/olas/contracts/service.py,sha256=BDQKeCTCnBNrwKD1a8rrlLytpKG3CAdjr-s0ec-dsFY,8243
-iwa/plugins/olas/contracts/staking.py,sha256=kKF4Uc2cFr9_drKG5OzFgzKTdgGyHIM_PUa-L0LX9gU,18486
+iwa/plugins/olas/contracts/staking.py,sha256=Qkr6yS3an-yZe560Dwer_g1wyOL3e1VIAGaeSZLCgfs,23512
 iwa/plugins/olas/contracts/abis/activity_checker.json,sha256=HT0IMbyTLMO71ITBKwoS950rHe772suPP4b8eDAodJ0,2230
 iwa/plugins/olas/contracts/abis/mech.json,sha256=bMMCXInjE_2PTPnc_sIyS_H8pod5Sm_e-xTbKgZppKc,16369
 iwa/plugins/olas/contracts/abis/mech_marketplace.json,sha256=KPnF-H_UATb3wdb_7o6ky_hSp5xwgvckD-QqylsWJLg,32468
@@ -118,7 +118,7 @@ iwa/plugins/olas/tests/test_service_manager_mech.py,sha256=qG6qu5IPRNypXUsblU2OE
 iwa/plugins/olas/tests/test_service_manager_rewards.py,sha256=2YCrXBU5bEkPuhBoGBhjnO1nA2qwHxn5Ivrror18FHM,12248
 iwa/plugins/olas/tests/test_service_manager_validation.py,sha256=ajlfH5uc4mAHf8A7GLE5cW7X8utM2vUilM0JdGDdlVg,5382
 iwa/plugins/olas/tests/test_service_staking.py,sha256=exxWsile_wG_0rz_cGbCPG-_Ubq01Ofl4D_pi0plj5Y,18332
-iwa/plugins/olas/tests/test_staking_integration.py,sha256=QCBQf6P2ZmmsEGt2k8W2r53lG2aVRuoMJE-aFxVDLss,9701
+iwa/plugins/olas/tests/test_staking_integration.py,sha256=q7zLQLrUyhtcnZf6MMymx2cX0Gmqaa7i1mRh1clnyj4,30198
 iwa/plugins/olas/tests/test_staking_validation.py,sha256=uug64jFcXYJ3Nw_lNa3O4fnhNr5wAWHHIrchSbR2MVE,4020
 iwa/plugins/olas/tui/__init__.py,sha256=5ZRsbC7J3z1xfkZRiwr4bLEklf78rNVjdswe2p7SlS8,28
 iwa/plugins/olas/tui/olas_view.py,sha256=dgZjfXCWsRRdHpygHfSOCJZFWZrgrVyieq-iYgDkK3w,37404
@@ -166,7 +166,7 @@ iwa/web/tests/test_web_endpoints.py,sha256=vA25YghHNB23sbmhD4ciesn_f_okSq0tjlkrS
 iwa/web/tests/test_web_olas.py,sha256=GunKEAzcbzL7FoUGMtEl8wqiqwYwA5lB9sOhfCNj0TA,16312
 iwa/web/tests/test_web_swap.py,sha256=7A4gBJFL01kIXPtW1E1J17SCsVc_0DmUn-R8kKrnnVA,2974
 iwa/web/tests/test_web_swap_coverage.py,sha256=zGNrzlhZ_vWDCvWmLcoUwFgqxnrp_ACbo49AtWBS_Kw,5584
-iwa-0.1.1.dist-info/licenses/LICENSE,sha256=eIubm_IlBHPYRQlLNZKbBNKhJUUP3JH0A2miZUhAVfI,1078
+iwa-0.1.3.dist-info/licenses/LICENSE,sha256=eIubm_IlBHPYRQlLNZKbBNKhJUUP3JH0A2miZUhAVfI,1078
 tests/legacy_cow.py,sha256=oOkZvIxL70ReEoD9oHQbOD5GpjIr6AGNHcOCgfPlerU,8389
 tests/legacy_safe.py,sha256=AssM2g13E74dNGODu_H0Q0y412lgqsrYnEzI97nm_Ts,2972
 tests/legacy_transaction_retry_logic.py,sha256=D9RqZ7DBu61Xr2djBAodU2p9UE939LL-DnQXswX5iQk,1497
@@ -224,8 +224,8 @@ tests/test_utils.py,sha256=vkP49rYNI8BRzLpWR3WnKdDr8upeZjZcs7Rx0pjbQMo,1292
 tests/test_workers.py,sha256=MInwdkFY5LdmFB3o1odIaSD7AQZb3263hNafO1De5PE,2793
 tools/create_and_stake_service.py,sha256=1xwy_bJQI1j9yIQ968Oc9Db_F6mk1659LuuZntTASDE,3742
 tools/verify_drain.py,sha256=PkMjblyOOAuQge88FwfEzRtCYeEtJxXhPBmtQYCoQ-8,6743
-iwa-0.1.1.dist-info/METADATA,sha256=jQxFBAjZ8GWJqgloxJkCLzHmgC7rO2YmkwZOpb0EIIM,7336
-iwa-0.1.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-iwa-0.1.1.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
-iwa-0.1.1.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
-iwa-0.1.1.dist-info/RECORD,,
+iwa-0.1.3.dist-info/METADATA,sha256=uKemLrcWBfz_raFNxn3okTiQWiwF-lLQok838PpZXtI,7336
+iwa-0.1.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+iwa-0.1.3.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
+iwa-0.1.3.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
+iwa-0.1.3.dist-info/RECORD,,