iwa 0.0.16__py3-none-any.whl → 0.0.17__py3-none-any.whl

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

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

@@ -61,7 +61,7 @@ iwa/plugins/olas/importer.py,sha256=f8KlZ9dGcNbpg8uoTYbO9sDvbluZoslhpWFLqPjPnLA,
 iwa/plugins/olas/mech_reference.py,sha256=CaSCpQnQL4F7wOG6Ox6Zdoy-uNEQ78YBwVLILQZKL8Q,5782
 iwa/plugins/olas/models.py,sha256=xC5hYakX53pBT6zZteM9cyiC7t6XRLLpobjQmDYueOo,3520
 iwa/plugins/olas/plugin.py,sha256=S_vnvZ02VdVWD7N5kp7u5JIRQ2JLtfwGDZ7OHkAN0M8,9390
-iwa/plugins/olas/contracts/activity_checker.py,sha256=PTLvsFdi3PdsFMxRVcXfwlQMRyJYHIzrHf3OaPVtFqU,3943
+iwa/plugins/olas/contracts/activity_checker.py,sha256=sQSzBWF7meXzCzVw4G0wowjTTRddraGPppQ8PyLcuaU,6429
 iwa/plugins/olas/contracts/base.py,sha256=y73aQbDq6l4zUpz_eQAg4MsLkTAEqjjupXlcvxjfgCI,240
 iwa/plugins/olas/contracts/mech.py,sha256=dXYtyORc-oiu9ga5PtTquOFkoakb6BLGKvlUsteygIg,2767
 iwa/plugins/olas/contracts/mech_marketplace.py,sha256=hMADl5MQGvT2wLRKu4vHGe4RrAZVq8Y2M_EvXWWz528,1554
@@ -150,7 +150,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.16.dist-info/licenses/LICENSE,sha256=eIubm_IlBHPYRQlLNZKbBNKhJUUP3JH0A2miZUhAVfI,1078
+iwa-0.0.17.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
@@ -202,8 +202,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.16.dist-info/METADATA,sha256=4uDBeClkmX50DO4TFAPhy0DpCiiLp4zwDFsrIzV6SwA,7295
-iwa-0.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-iwa-0.0.16.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
-iwa-0.0.16.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
-iwa-0.0.16.dist-info/RECORD,,
+iwa-0.0.17.dist-info/METADATA,sha256=vzZKb09UmfMfeWTcLbJnUCxWHIr-DGWNvSvUM5k9RcQ,7295
+iwa-0.0.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+iwa-0.0.17.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
+iwa-0.0.17.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
+iwa-0.0.17.dist-info/RECORD,,