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

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/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.dist-info → iwa-0.1.1.dist-info}/METADATA

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

@@ -96,7 +96,7 @@ iwa/plugins/olas/service_manager/base.py,sha256=EBPg0ymqgtAb7ZvVSfTt31QYgv_6gp4U
 iwa/plugins/olas/service_manager/drain.py,sha256=tJLqvMEPOymxukFuxt-AdgOB4bIIciKcXoxOPx9j-LM,13983
 iwa/plugins/olas/service_manager/lifecycle.py,sha256=Jz2WTsBE_kGjFnsnpQlUBmMM2csOuqEfYdvj4cLrNuU,50586
 iwa/plugins/olas/service_manager/mech.py,sha256=NVzVbEmyOe3wK92VEzCCOSuy3HDkEP1MSoVt7Av8Psk,27949
-iwa/plugins/olas/service_manager/staking.py,sha256=kT9OOQ4fi3FrIJB2T2gsvmv7DBRD6pDxqcXXh2o6iwc,29600
+iwa/plugins/olas/service_manager/staking.py,sha256=Vl7NGzxfNhlajec1kUvqODiq-DBXyd86at5jKrwHDuc,29808
 iwa/plugins/olas/tests/conftest.py,sha256=4vM7EI00SrTGyeP0hNzsGSQHEj2-iznVgzlNh2_OGfo,739
 iwa/plugins/olas/tests/test_importer.py,sha256=i9LKov7kNRECB3hmRnhKBwcfx3uxtjWe4BB77bOOpeo,4282
 iwa/plugins/olas/tests/test_importer_error_handling.py,sha256=GeXu4Par3_FAUL9hT6Sn5PdRg2_EU2gf3iaL73atoYo,12256
@@ -117,7 +117,7 @@ iwa/plugins/olas/tests/test_service_manager_flows.py,sha256=ZSmBJNa18d_MyAaLQRoP
 iwa/plugins/olas/tests/test_service_manager_mech.py,sha256=qG6qu5IPRNypXUsblU2OEkuiuwDJ0TH8RXZbibmTFcQ,4937
 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=78yyPoLo51N1aQyDxjzj7I0a263JHKHqekL-W3oQAsw,15914
+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_validation.py,sha256=uug64jFcXYJ3Nw_lNa3O4fnhNr5wAWHHIrchSbR2MVE,4020
 iwa/plugins/olas/tui/__init__.py,sha256=5ZRsbC7J3z1xfkZRiwr4bLEklf78rNVjdswe2p7SlS8,28
@@ -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.0.dist-info/licenses/LICENSE,sha256=eIubm_IlBHPYRQlLNZKbBNKhJUUP3JH0A2miZUhAVfI,1078
+iwa-0.1.1.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.0.dist-info/METADATA,sha256=w3bjDMNL_NKmol-SCRkwdaY24JaW6LbyL1RZF9jsBiI,7336
-iwa-0.1.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-iwa-0.1.0.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
-iwa-0.1.0.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
-iwa-0.1.0.dist-info/RECORD,,
+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,,