iwa 0.0.29__py3-none-any.whl → 0.0.31__py3-none-any.whl

iwa/core/services/transaction.py

@@ -425,7 +425,32 @@ class TransactionService:
                 return False, {}
 
         except Exception as e:
-            logger.exception(f"Safe transaction failed: {e}")
+            # Try to decode detailed revert reason
+            error_text = str(e)
+            decoded_msg = None
+
+            # Extract hex data from common error patterns
+            # Pattern 1: ('execution reverted', '0x...')
+            import re
+            hex_match = re.search(r"0x[0-9a-fA-F]{8,}", error_text)
+
+            if hex_match:
+                try:
+                    from iwa.core.contracts.decoder import ErrorDecoder
+                    data = hex_match.group(0)
+                    decoded = ErrorDecoder().decode(data)
+                    if decoded:
+                        # Use the first successful decoding
+                        name, msg, source = decoded[0]
+                        decoded_msg = f"{msg} (from {source})"
+                except Exception:
+                    pass
+
+            if decoded_msg:
+                logger.error(f"Safe transaction failed: {decoded_msg}")
+            else:
+                logger.exception(f"Safe transaction failed: {e}")
+
             return False, {}
 
     def _is_gas_too_low_error(self, err_text: str) -> bool:

iwa/plugins/olas/importer.py

@@ -888,8 +888,10 @@ class OlasServiceImporter:
     def _generate_tag(self, key: DiscoveredKey, service_name: Optional[str]) -> str:
         """Generate a unique tag for an imported key.
 
-        Tags follow the pattern: {service_name}_{role}
-        Example: trader_alpha_agent, trader_alpha_operator
+        Tags follow the pattern: {service_name}_{role}[_eoa]
+        Examples:
+          - trader_alpha_agent
+          - trader_alpha_owner_eoa (EOA keys for owner role)
         """
         # Use service name as prefix, or 'imported' as fallback
         prefix = service_name or "imported"
@@ -898,7 +900,11 @@ class OlasServiceImporter:
         prefix = re.sub(r"[^a-z0-9]+", "_", prefix.lower()).strip("_")
         role = re.sub(r"[^a-z0-9]+", "_", key.role.lower()).strip("_")
 
-        base_tag = f"{prefix}_{role}"
+        # Add _eoa suffix for owner/operator keys to distinguish from owner_safe
+        if role in ["owner", "operator"]:
+            base_tag = f"{prefix}_{role}_eoa"
+        else:
+            base_tag = f"{prefix}_{role}"
 
         # Check if tag already exists
         existing_tags = {

iwa/plugins/olas/service_manager/lifecycle.py

@@ -877,8 +877,14 @@ class LifecycleManagerMixin:
         """Terminate the service."""
         # Check that the service is deployed
         service_state = self.registry.get_service(self.service.service_id)["state"]
-        if service_state != ServiceState.DEPLOYED:
-            logger.error("Service is not deployed, cannot terminate")
+        if service_state not in [
+            ServiceState.DEPLOYED,
+            ServiceState.ACTIVE_REGISTRATION,
+            ServiceState.FINISHED_REGISTRATION,
+        ]:
+            logger.error(
+                f"Service is in {service_state.name}, cannot terminate (must be active or deployed)"
+            )
             return False
 
         # Check that the service is not staked
@@ -1133,8 +1139,13 @@ class LifecycleManagerMixin:
 
     def _process_wind_down_state(self, current_state: ServiceState) -> bool:
         """Process a single state transition for wind down."""
-        if current_state == ServiceState.DEPLOYED:
-            logger.info("Terminating service...")
+        # Allow termination from any active state > PRE_REGISTRATION
+        if current_state in [
+            ServiceState.DEPLOYED,
+            ServiceState.ACTIVE_REGISTRATION,
+            ServiceState.FINISHED_REGISTRATION,
+        ]:
+            logger.info(f"Terminating service from state {current_state.name}...")
             if not self.terminate():
                 logger.error("Failed to terminate service")
                 return False
@@ -1146,7 +1157,7 @@ class LifecycleManagerMixin:
         else:
             # Should not happen if logic is correct map of transitions
             logger.error(
-                f"State {current_state.name} is not a valid start for wind_down (expected DEPLOYED or TERMINATED_BONDED)"
+                f"State {current_state.name} is not a valid start for wind_down (expected active state or TERMINATED_BONDED)"
             )
             return False
         return True

iwa/plugins/olas/tui/olas_view.py

@@ -508,14 +508,33 @@ class OlasView(Static):
         self._show_stake_contracts_modal(filtered_contracts, service_key)
 
     def _get_service_bond(self, service_key: str) -> Optional[int]:
-        """Fetch the security deposit (bond) for a service."""
+        """Fetch the security deposit (bond) for a service.
+
+        Uses ServiceRegistryTokenUtilityContract.get_service_token_deposit() which returns
+        the persistent bond value even for terminated services.
+        """
+        from iwa.core.contracts.cache import ContractCache
+        from iwa.plugins.olas.constants import OLAS_CONTRACTS
+        from iwa.plugins.olas.contracts.service import ServiceRegistryTokenUtilityContract
         from iwa.plugins.olas.service_manager import ServiceManager
 
         try:
             manager = ServiceManager(self._wallet, service_key=service_key)
             if manager.service:
-                service_info = manager.registry.get_service(manager.service.service_id)
-                return service_info.get("security_deposit", 0)
+                service_id = manager.service.service_id
+                chain_name = manager.service.chain_name
+
+                protocol_contracts = OLAS_CONTRACTS.get(chain_name.lower(), {})
+                utility_address = protocol_contracts.get("OLAS_SERVICE_REGISTRY_TOKEN_UTILITY")
+
+                if utility_address:
+                    token_utility = ContractCache().get_contract(
+                        ServiceRegistryTokenUtilityContract,
+                        address=str(utility_address),
+                        chain_name=chain_name,
+                    )
+                    _, security_deposit = token_utility.get_service_token_deposit(service_id)
+                    return security_deposit
         except Exception as e:
             self.notify(f"Warning: Could not fetch service bond: {e}", severity="warning")
         return None

iwa/web/routers/olas/staking.py

@@ -68,30 +68,54 @@ def get_staking_contracts(
 
 
 def _get_service_filter_info(service_key: Optional[str]) -> tuple[Optional[int], Optional[str]]:
-    """Retrieve service bond and token if service_key is provided."""
+    """Retrieve service bond and token if service_key is provided.
+
+    Uses ServiceRegistryTokenUtilityContract.get_service_token_deposit() which returns
+    the persistent bond value, even for terminated services. This is the correct source
+    because bonds are stored separately from service state.
+    """
     service_bond = None
     service_token = None
 
     if service_key:
         try:
+            from iwa.core.contracts.cache import ContractCache
+            from iwa.plugins.olas.constants import OLAS_CONTRACTS
+            from iwa.plugins.olas.contracts.service import ServiceRegistryTokenUtilityContract
             from iwa.plugins.olas.service_manager import ServiceManager
 
             # Initialize wallet dependencies for ServiceManager
             manager = ServiceManager(wallet, service_key)
             if manager.service:
-                # Get service requirements
-                service_token = (manager.service.token_address or "").lower()
                 service_id_int = manager.service.service_id
+                chain_name = manager.service.chain_name
 
-                # Get security deposit from registry - this is the actual bond value
+                # Get token and deposit from TokenUtility contract (persists after terminate)
                 try:
-                    service_info = manager.registry.get_service(service_id_int)
-                    service_bond = service_info.get("security_deposit", 0)
-                    logger.info(
-                        f"Filtering for service {service_key}: security_deposit={service_bond}, token={service_token}"
-                    )
+                    protocol_contracts = OLAS_CONTRACTS.get(chain_name.lower(), {})
+                    utility_address = protocol_contracts.get("OLAS_SERVICE_REGISTRY_TOKEN_UTILITY")
+
+                    if utility_address:
+                        token_utility = ContractCache().get_contract(
+                            ServiceRegistryTokenUtilityContract,
+                            address=str(utility_address),
+                            chain_name=chain_name,
+                        )
+                        token_addr, security_deposit = token_utility.get_service_token_deposit(
+                            service_id_int
+                        )
+                        service_bond = security_deposit
+                        service_token = token_addr.lower() if token_addr else ""
+                        logger.info(
+                            f"Filtering for service {service_key}: security_deposit={service_bond}, token={service_token}"
+                        )
+                    else:
+                        logger.warning(f"Token utility address not found for chain {chain_name}")
+                        service_token = (manager.service.token_address or "").lower()
                 except Exception as e:
-                    logger.warning(f"Failed to get service info for filtering: {e}")
+                    logger.warning(f"Failed to get token deposit for filtering: {e}")
+                    # Fallback to configured token_address
+                    service_token = (manager.service.token_address or "").lower()
 
         except Exception as e:
             logger.warning(f"Could not fetch service details for filtering: {e}")

{iwa-0.0.29.dist-info → iwa-0.0.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iwa
-Version: 0.0.29
+Version: 0.0.31
 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.0.29.dist-info → iwa-0.0.31.dist-info}/RECORD

@@ -40,7 +40,7 @@ iwa/core/services/account.py,sha256=01MoEvl6FJlMnMB4fGwsPtnGa4kgA-d5hJeKu_ACg7Y,
 iwa/core/services/balance.py,sha256=mPE12CuOFfCaJXaQXWOcQM1O03ZF3ghpy_-oOjNk_GE,4104
 iwa/core/services/plugin.py,sha256=GNNlbtELyHl7MNVChrypF76GYphxXduxDog4kx1MLi8,3277
 iwa/core/services/safe.py,sha256=ZmgVwbQhYlH5r3qhlY5uP8nCPtkkvV3sNnYG7_UCWUQ,14831
-iwa/core/services/transaction.py,sha256=1O8FAmXZak2oVu15ooUQsc0ByIS2F-O0vWxcAV2ylqk,17525
+iwa/core/services/transaction.py,sha256=FP-Qw7v0LrWTkgDPWeuoB48D7Gl9TrKVQt_trGNolRc,18462
 iwa/core/services/transfer/__init__.py,sha256=ZJfshFxJRsp8rkOqfVvd1cqEzIJ9tqBJh8pc0l90GLk,5576
 iwa/core/services/transfer/base.py,sha256=sohz-Ss2i-pGYGl4x9bD93cnYKcSvsXaXyvyRawvgQs,9043
 iwa/core/services/transfer/erc20.py,sha256=958ctXPWxq_KSQNoaG7RqWbC8SRb9NB3MzhtC2dp_NU,8960
@@ -62,7 +62,7 @@ iwa/plugins/gnosis/tests/test_safe.py,sha256=hQHVHBWQhGnuvzvx4U9fOWEwASJWwql42q6
 iwa/plugins/olas/__init__.py,sha256=_NhBczzM61fhGYwGhnWfEeL8Jywyy_730GASe2BxzeQ,106
 iwa/plugins/olas/constants.py,sha256=iTFoO2QW3KbhL5k5sKsJxxyDytl9wVIb_9hAih55KrE,7728
 iwa/plugins/olas/events.py,sha256=SWD3wYdQ-l6dLUJSkfh_WsLmedH4Vsw_EvYXg7QC3yc,5970
-iwa/plugins/olas/importer.py,sha256=KQr8YXTL9SzoEBTAezh_zmJrIJqDQA_yqy8WoBX6wyM,41796
+iwa/plugins/olas/importer.py,sha256=CLWalbnXRnOwuCBVvUFpOkr1cGdkunrElfWNUl6NQMs,42040
 iwa/plugins/olas/mech_reference.py,sha256=CaSCpQnQL4F7wOG6Ox6Zdoy-uNEQ78YBwVLILQZKL8Q,5782
 iwa/plugins/olas/models.py,sha256=36N2Wuia7DVfpekJJ2pXPeS0lqhe5ED-Hjdox9YQG2c,5230
 iwa/plugins/olas/plugin.py,sha256=zOPWyoVkSVh6guJ3TZj5enJFuiIbP3fRM8FkziPB-c0,15606
@@ -88,7 +88,7 @@ iwa/plugins/olas/scripts/test_simple_lifecycle.py,sha256=8T50tOZx3afeECSfCNAb0rA
 iwa/plugins/olas/service_manager/__init__.py,sha256=GXiThMEY3nPgHUl1i-DLrF4h96z9jPxxI8Jepo2E1PM,1926
 iwa/plugins/olas/service_manager/base.py,sha256=EBPg0ymqgtAb7ZvVSfTt31QYgv_6gp4UAc6je00NLAg,5009
 iwa/plugins/olas/service_manager/drain.py,sha256=1Ku7axThwLtKxaNTkwhP4j1yjIXbFXAqNFDrCSmgfto,12569
-iwa/plugins/olas/service_manager/lifecycle.py,sha256=Aibd4D-R_UjFEqSTEsVaMFKbrtEOY8fo0Td0eFYjcDI,48732
+iwa/plugins/olas/service_manager/lifecycle.py,sha256=-YE2mqgF8twO_Q4iYhnFBFXN4W0KJ1qJzNXJRXJJdUo,49151
 iwa/plugins/olas/service_manager/mech.py,sha256=NVzVbEmyOe3wK92VEzCCOSuy3HDkEP1MSoVt7Av8Psk,27949
 iwa/plugins/olas/service_manager/staking.py,sha256=4WS1m1E1ddX5EbQuvNnNswZjT20nc7I9IKzjrBuUCFw,28701
 iwa/plugins/olas/tests/conftest.py,sha256=4vM7EI00SrTGyeP0hNzsGSQHEj2-iznVgzlNh2_OGfo,739
@@ -114,7 +114,7 @@ iwa/plugins/olas/tests/test_service_staking.py,sha256=miNGZZoIrZf0Am-pJ8gTyvVAru
 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
-iwa/plugins/olas/tui/olas_view.py,sha256=qcPxhurDPJjHWln6R64ZVAJ2h82IXzw48unhRvQVZqQ,36448
+iwa/plugins/olas/tui/olas_view.py,sha256=OlhciDK1Ni4BdzggqTzQeYnP2azB-We02hH6jQhbZuU,37388
 iwa/tools/__init__.py,sha256=jQyuwDQGRigSe7S9JMb4yK3CXPgZFJNffzt6N2v9PU0,21
 iwa/tools/check_profile.py,sha256=0LAv9wx4wMM610mX88-6tIoDi2I5LDzh0W9nkprt42s,2177
 iwa/tools/list_contracts.py,sha256=2w-LYB2RVS-eGil2kLiBIEm3tYYhYzT4lAuGO6VtLJU,4861
@@ -150,7 +150,7 @@ iwa/web/routers/olas/admin.py,sha256=PMRdNelqYgQ1xbqh3floFV5xrVtBRQiwZPd8J9_ffxg
 iwa/web/routers/olas/funding.py,sha256=f8fADNtbZEBFl-vuVKfas6os38Vot6K5tJBTenZmCD0,4832
 iwa/web/routers/olas/general.py,sha256=dPsBQppTGoQY1RztliUhseOHOZGeeCR10lhThD9kyXo,803
 iwa/web/routers/olas/services.py,sha256=IpjvkpJeCwREbdHt47gov-fvTl9bY4EBUmZZZEHi3iI,16310
-iwa/web/routers/olas/staking.py,sha256=Ak29SIIMNAgPqIij6sdNAG4z7LUeUGRVRpplZw4hsAU,12666
+iwa/web/routers/olas/staking.py,sha256=jktJ2C1Q9X4aC0tWJByN3sHpEXY0EIvr3rr4N0MtXXc,14081
 iwa/web/static/app.js,sha256=CWm_TR2nKSDe8z0-nUQp7VaBHIGJg7mAOU-XJDveFsk,113487
 iwa/web/static/index.html,sha256=q7s7plnMbN1Nkzr5bRxZgvgOFerUChEGIZW7SpAVtPc,28514
 iwa/web/static/style.css,sha256=aTtE42mmfYV6y7xfo9cUgUhT8x-KyNC1zmPjSdskxIk,24315
@@ -158,7 +158,7 @@ iwa/web/tests/test_web_endpoints.py,sha256=C264MH-CTyDW4GLUrTXBgLJKUk4-89pFAScBd
 iwa/web/tests/test_web_olas.py,sha256=0CVSsrncOeJ3x0ECV7mVLQV_CXZRrOqGiVjgLIi6hZ8,16308
 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.0.29.dist-info/licenses/LICENSE,sha256=eIubm_IlBHPYRQlLNZKbBNKhJUUP3JH0A2miZUhAVfI,1078
+iwa-0.0.31.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
@@ -211,8 +211,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.0.29.dist-info/METADATA,sha256=zgMk6FzzMD7GUiUl9TBDKFuRvoaRgOYxnWOWt3s14AU,7295
-iwa-0.0.29.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-iwa-0.0.29.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
-iwa-0.0.29.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
-iwa-0.0.29.dist-info/RECORD,,
+iwa-0.0.31.dist-info/METADATA,sha256=RiJtuR4SmuW363r5cA7niuwufEjRFzIBV_zg9eeb5DM,7295
+iwa-0.0.31.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+iwa-0.0.31.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
+iwa-0.0.31.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
+iwa-0.0.31.dist-info/RECORD,,