iwa 0.1.0__tar.gz → 0.1.1__tar.gz

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

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

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

{iwa-0.1.0 → iwa-0.1.1}/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.1}/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.1/src/iwa.egg-info}/PKG-INFO

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