iwa 0.0.16__tar.gz → 0.0.17__tar.gz

{iwa-0.0.16/src/iwa.egg-info → iwa-0.0.17}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [project]
 name = "iwa"
-version = "0.0.16"
+version = "0.0.17"
 description = "A secure, modular, and plugin-based framework for crypto agents and ops"
 readme = "README.md"
 requires-python = ">=3.12,<4.0"
@@ -71,7 +71,7 @@ where = ["src"]
 
 [tool.ruff]
 line-length = 100
-target-version = "0.0.16"
+target-version = "0.0.17"
 fix = true
 
 [tool.ruff.lint]

{iwa-0.0.16 → iwa-0.0.17}/src/iwa/plugins/olas/contracts/activity_checker.py

@@ -10,6 +10,8 @@ requests relative to the time elapsed since the last checkpoint.
 
 from typing import Tuple
 
+from web3 import Web3
+
 from iwa.core.constants import DEFAULT_MECH_CONTRACT_ADDRESS
 from iwa.core.types import EthereumAddress
 from iwa.plugins.olas.contracts.base import OLAS_ABI_PATH, ContractInstance
@@ -68,6 +70,9 @@ class ActivityCheckerContract(ContractInstance):
     def get_multisig_nonces(self, multisig: EthereumAddress) -> Tuple[int, int]:
         """Get the nonces for a multisig address.
 
+        This method reads directly from the source contracts to ensure fresh data
+        and compatibility with Legacy/MM contracts.
+
         Args:
             multisig: The multisig address to check.
 
@@ -77,8 +82,52 @@ class ActivityCheckerContract(ContractInstance):
                 - mech_requests_count: Total mech requests made
 
         """
-        nonces = self.contract.functions.getMultisigNonces(multisig).call()
-        return (nonces[0], nonces[1])
+        # 1. Get Safe Nonce
+        safe_nonce = 0
+        try:
+            # Minimal ABI for Safe nonce
+            safe_abi = [{"name": "nonce", "type": "function", "inputs": [], "outputs": [{"type": "uint256"}]}]
+            safe_contract = self.chain_interface.web3._web3.eth.contract(
+                address=Web3.to_checksum_address(multisig), abi=safe_abi
+            )
+            safe_nonce = safe_contract.functions.nonce().call()
+        except Exception as e:
+            # Fallback or log error? If safe read fails, something is very wrong.
+            # But we don't want to crash the whole status check if possible.
+            # For now, let's log and keep 0 or re-raise if critical.
+            # safe_nonce is critical for liveness check (diffNonces).
+            from loguru import logger
+            logger.warning(f"Failed to read Safe nonce for {multisig}: {e}")
+
+        # 2. Get Mech Requests Count
+        mech_requests = 0
+
+        if self.mech_marketplace:
+            # Case A: Marketplace (MM)
+            try:
+                # Minimal ABI for Marketplace mapRequestCounts
+                mp_abi = [{"name": "mapRequestCounts", "type": "function", "inputs": [{"type": "address"}], "outputs": [{"type": "uint256"}]}]
+                mp_contract = self.chain_interface.web3._web3.eth.contract(
+                    address=Web3.to_checksum_address(self.mech_marketplace), abi=mp_abi
+                )
+                mech_requests = mp_contract.functions.mapRequestCounts(multisig).call()
+            except Exception as e:
+                from loguru import logger
+                logger.warning(f"Failed to read Marketplace requests for {multisig}: {e}")
+        else:
+            # Case B: Legacy (AgentMech)
+            try:
+                # Minimal ABI for AgentMech getRequestsCount
+                mech_abi = [{"name": "getRequestsCount", "type": "function", "inputs": [{"type": "address"}], "outputs": [{"type": "uint256"}]}]
+                mech_contract = self.chain_interface.web3._web3.eth.contract(
+                    address=Web3.to_checksum_address(self.agent_mech), abi=mech_abi
+                )
+                mech_requests = mech_contract.functions.getRequestsCount(multisig).call()
+            except Exception as e:
+                from loguru import logger
+                logger.warning(f"Failed to read AgentMech requests for {multisig}: {e}")
+
+        return (safe_nonce, mech_requests)
 
     def is_ratio_pass(
         self,

{iwa-0.0.16 → iwa-0.0.17/src/iwa.egg-info}/PKG-INFO

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