iwa 0.1.0__tar.gz → 0.1.2__tar.gz

{iwa-0.1.0/src/iwa.egg-info → iwa-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iwa
-Version: 0.1.0
+Version: 0.1.2
 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.0 → iwa-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "iwa"
-version = "0.1.0"
+version = "0.1.2"
 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.0"
+target-version = "0.1.2"
 fix = true
 
 [tool.ruff.lint]

{iwa-0.1.0 → iwa-0.1.2}/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.0 → iwa-0.1.2}/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.0 → iwa-0.1.2}/src/iwa/plugins/olas/service_manager/staking.py

@@ -547,12 +547,12 @@ class StakingManagerMixin:
             f"Preparing to unstake service {self.service.service_id} from {self._get_label(staking_contract.address)}"
         )
 
-        # Check that the service is staked
+        # Check that the service is staked or evicted (both can be unstaked)
         try:
             staking_state = staking_contract.get_staking_state(self.service.service_id)
             logger.info(f"Current staking state: {staking_state}")
 
-            if staking_state != StakingState.STAKED:
+            if staking_state not in (StakingState.STAKED, StakingState.EVICTED):
                 logger.error(
                     f"Service {self.service.service_id} is not staked (state={staking_state}), cannot unstake"
                 )
@@ -561,23 +561,24 @@ class StakingManagerMixin:
             logger.error(f"Failed to get staking state: {e}")
             return False
 
-        # Check that enough time has passed since staking
-        try:
-            service_info = staking_contract.get_service_info(self.service.service_id)
-            ts_start = service_info.get("ts_start", 0)
-            if ts_start > 0:
-                min_duration = staking_contract.min_staking_duration
-                unlock_ts = ts_start + min_duration
-                now_ts = datetime.now(timezone.utc).timestamp()
-
-                if now_ts < unlock_ts:
-                    diff = int(unlock_ts - now_ts)
-                    logger.error(
-                        f"Cannot unstake yet. Minimum staking duration not met. Unlocks in {diff} seconds."
-                    )
-                    return False
-        except Exception as e:
-            logger.warning(f"Could not verify staking duration: {e}. Proceeding with caution.")
+        # Check that enough time has passed since staking (skip for EVICTED - already expired)
+        if staking_state == StakingState.STAKED:
+            try:
+                service_info = staking_contract.get_service_info(self.service.service_id)
+                ts_start = service_info.get("ts_start", 0)
+                if ts_start > 0:
+                    min_duration = staking_contract.min_staking_duration
+                    unlock_ts = ts_start + min_duration
+                    now_ts = datetime.now(timezone.utc).timestamp()
+
+                    if now_ts < unlock_ts:
+                        diff = int(unlock_ts - now_ts)
+                        logger.error(
+                            f"Cannot unstake yet. Minimum staking duration not met. Unlocks in {diff} seconds."
+                        )
+                        return False
+            except Exception as e:
+                logger.warning(f"Could not verify staking duration: {e}. Proceeding with caution.")
 
         # Use service owner which holds the NFT (not necessarily master)
         owner_address = self.service.service_owner_address or self.wallet.master_account.address

{iwa-0.1.0 → iwa-0.1.2}/src/iwa/plugins/olas/tests/test_service_staking.py

@@ -51,6 +51,60 @@ def test_sm_unstake_not_staked(mock_wallet):
         assert result is False
 
 
+def test_sm_unstake_evicted_succeeds(mock_wallet):
+    """Cover unstake when service is EVICTED - should succeed."""
+    with (
+        patch("iwa.core.models.Config"),
+        patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache,
+        patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache),
+    ):
+        mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
+        sm = ServiceManager(mock_wallet)
+        sm.service = Service(
+            service_name="t", chain_name="gnosis", service_id=1, multisig_address=VALID_ADDR
+        )
+
+        mock_staking = MagicMock()
+        mock_staking.get_staking_state.return_value = StakingState.EVICTED
+        mock_staking.prepare_unstake_tx.return_value = {"to": VALID_ADDR}
+        mock_staking.extract_events.return_value = [{"name": "ServiceUnstaked"}]
+
+        mock_wallet.sign_and_send_transaction.return_value = (True, {"status": 1})
+
+        result = sm.unstake(mock_staking)
+        assert result is True
+        # Verify staking_contract_address is cleared
+        assert sm.service.staking_contract_address is None
+
+
+def test_sm_unstake_evicted_skips_duration_check(mock_wallet):
+    """Cover that EVICTED services skip the min_staking_duration check."""
+    with (
+        patch("iwa.core.models.Config"),
+        patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache,
+        patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache),
+    ):
+        mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
+        sm = ServiceManager(mock_wallet)
+        sm.service = Service(
+            service_name="t", chain_name="gnosis", service_id=1, multisig_address=VALID_ADDR
+        )
+
+        mock_staking = MagicMock()
+        mock_staking.get_staking_state.return_value = StakingState.EVICTED
+        mock_staking.prepare_unstake_tx.return_value = {"to": VALID_ADDR}
+        mock_staking.extract_events.return_value = [{"name": "ServiceUnstaked"}]
+        # get_service_info should NOT be called for EVICTED services
+        mock_staking.get_service_info.side_effect = AssertionError(
+            "get_service_info should not be called for EVICTED"
+        )
+
+        mock_wallet.sign_and_send_transaction.return_value = (True, {"status": 1})
+
+        result = sm.unstake(mock_staking)
+        assert result is True
+
+
 def test_sm_unstake_tx_fails(mock_wallet):
     """Cover unstake transaction failure (lines 766-768)."""
     with (

{iwa-0.1.0 → iwa-0.1.2/src/iwa.egg-info}/PKG-INFO

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