iwa 0.0.14__tar.gz → 0.0.16__tar.gz

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

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

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

{iwa-0.0.14 → iwa-0.0.16}/src/iwa/core/contracts/contract.py

@@ -19,7 +19,18 @@ logger = configure_logger()
 ERROR_SELECTOR = "0x08c379a0"  # Error(string)
 PANIC_SELECTOR = "0x4e487b71"  # Panic(uint256)
 
+# Global cache for ABIs and error selectors to avoid redundant disk I/O and parsing
+# Format: {abi_path: {"abi": [...], "selectors": {...}}}
+_ABI_CACHE: Dict[str, Dict[str, Any]] = {}
+
+
+def clear_abi_cache() -> None:
+    """Clear the global ABI cache (mainly for testing)."""
+    global _ABI_CACHE
+    _ABI_CACHE = {}
+
 # Panic codes (from Solidity)
+# ... (rest of PANIC_CODES) ...
 PANIC_CODES = {
     0x00: "Generic compiler inserted panic",
     0x01: "Assert failed",
@@ -46,16 +57,25 @@ class ContractInstance:
         self.abi = None
         self.chain_interface = ChainInterfaces().get(chain_name)
 
-        with open(self.abi_path, "r", encoding="utf-8") as abi_file:
-            contract_abi = json.load(abi_file)
+        # Check global cache first
+        cache_key = str(self.abi_path)
+        if cache_key in _ABI_CACHE:
+            self.abi = _ABI_CACHE[cache_key]["abi"]
+            self.error_selectors = _ABI_CACHE[cache_key]["selectors"]
+        else:
+            with open(self.abi_path, "r", encoding="utf-8") as abi_file:
+                contract_abi = json.load(abi_file)
+
+                if isinstance(contract_abi, dict) and "abi" in contract_abi:
+                    self.abi = contract_abi.get("abi")
+                else:
+                    self.abi = contract_abi
 
-            if isinstance(contract_abi, dict) and "abi" in contract_abi:
-                self.abi = contract_abi.get("abi")
-            else:
-                self.abi = contract_abi
+            self.error_selectors = self.load_error_selectors()
+            # Store in global cache
+            _ABI_CACHE[cache_key] = {"abi": self.abi, "selectors": self.error_selectors}
 
         self._contract_cache = None
-        self.error_selectors = self.load_error_selectors()
 
     @property
     def contract(self) -> Contract:

{iwa-0.0.14 → iwa-0.0.16}/src/iwa/core/pricing.py

@@ -12,12 +12,14 @@ from iwa.core.secrets import secrets
 # Global cache shared across all PriceService instances
 _PRICE_CACHE: Dict[str, Dict] = {}
 _CACHE_TTL = timedelta(minutes=30)
+_NEGATIVE_CACHE_TTL = timedelta(minutes=5)
 
 
 class PriceService:
     """Service to fetch token prices from CoinGecko."""
 
     BASE_URL = "https://api.coingecko.com/api/v3"
+    DEMO_URL = "https://demo-api.coingecko.com/api/v3"
 
     def __init__(self):
         """Initialize PriceService."""
@@ -41,15 +43,16 @@ class PriceService:
         """
         cache_key = f"{token_id}_{vs_currency}"
 
-        # Check global cache
+        # Check global cache (including negative cache)
         if cache_key in _PRICE_CACHE:
             entry = _PRICE_CACHE[cache_key]
-            if datetime.now() - entry["timestamp"] < _CACHE_TTL:
+            ttl = _CACHE_TTL if entry["price"] is not None else _NEGATIVE_CACHE_TTL
+            if datetime.now() - entry["timestamp"] < ttl:
                 return entry["price"]
 
         price = self._fetch_price_from_api(token_id, vs_currency)
-        if price is not None:
-            _PRICE_CACHE[cache_key] = {"price": price, "timestamp": datetime.now()}
+        # We always cache, even if price is None (negative caching)
+        _PRICE_CACHE[cache_key] = {"price": price, "timestamp": datetime.now()}
         return price
 
     def _fetch_price_from_api(self, token_id: str, vs_currency: str) -> Optional[float]:
@@ -57,7 +60,10 @@ class PriceService:
         max_retries = 2
         for attempt in range(max_retries + 1):
             try:
-                url = f"{self.BASE_URL}/simple/price"
+                # Use demo URL if API key is present, otherwise standard URL
+                # NOTE: Demo URL is significantly more reliable for demo keys
+                base_url = self.DEMO_URL if self.api_key else self.BASE_URL
+                url = f"{base_url}/simple/price"
                 params = {"ids": token_id, "vs_currencies": vs_currency}
                 headers = {}
                 if self.api_key:
@@ -69,6 +75,8 @@ class PriceService:
                     logger.warning("CoinGecko API key invalid (401). Retrying without key...")
                     self.api_key = None
                     headers.pop("x-cg-demo-api-key", None)
+                    # Re-run with base URL
+                    url = f"{self.BASE_URL}/simple/price"
                     response = requests.get(url, params=params, headers=headers, timeout=10)
 
                 if response.status_code == 429:
@@ -87,13 +95,16 @@ class PriceService:
                 if token_id in data and vs_currency in data[token_id]:
                     return float(data[token_id][vs_currency])
 
-                logger.warning(
+                # If we got response but price not found, it's likely a wrong ID
+                logger.debug(
                     f"Price for {token_id} in {vs_currency} not found in response: {data}"
                 )
                 return None
 
             except Exception as e:
-                logger.error(f"Failed to fetch price for {token_id} (Attempt {attempt + 1}): {e}")
+                # Only log error on last attempt to avoid spamming
+                if attempt == max_retries:
+                    logger.error(f"Failed to fetch price for {token_id}: {e}")
                 if attempt < max_retries:
                     time.sleep(1)
                     continue

{iwa-0.0.14 → iwa-0.0.16}/src/iwa/plugins/olas/constants.py

@@ -51,11 +51,21 @@ OLAS_CONTRACTS: Dict[str, Dict[str, EthereumAddress]] = {
             "0xa45E64d13A30a51b91ae0eb182e88a40e9b18eD8"
         ),
         "OLAS_SERVICE_MANAGER": EthereumAddress("0x068a4f0946cF8c7f9C1B58a3b5243Ac8843bf473"),
-        # Legacy mech - used by TRADER staking contracts for liveness
+        # Legacy mech - used by NON-MM TRADER staking contracts (e.g., "Expert X (Yk OLAS)")
+        # Activity checker calls agentMech.getRequestsCount(multisig) to count requests.
         "OLAS_MECH": EthereumAddress("0x77af31De935740567Cf4fF1986D04B2c964A786a"),
-        # NEW Marketplace (v2) - no staking support yet
+        # NEW Marketplace (v2) - used by MM staking contracts (e.g., "Expert X MM (Yk OLAS)")
+        # Services staked in "Expert X MM" contracts MUST use marketplace requests.
+        # Legacy mech requests will NOT be counted by the activity checker.
         "OLAS_MECH_MARKETPLACE": EthereumAddress("0x735FAAb1c4Ec41128c367AFb5c3baC73509f70bB"),
-        # OLD Marketplace (v1) - used by Pearl Beta Mech Marketplace staking
+        # Default priority mech for marketplace requests (from olas-operate-middleware)
+        # This is the mech that will process requests sent via the marketplace.
+        # Source: https://github.com/valory-xyz/olas-operate-middleware/blob/main/operate/ledger/profiles.py
+        # DEFAULT_PRIORITY_MECH["0x735FAAb1c..."] = ("0xC05e7412...", 2182)
+        "OLAS_MECH_MARKETPLACE_PRIORITY": EthereumAddress(
+            "0xC05e7412439bD7e91730a6880E18d5D5873F632C"
+        ),
+        # OLD Marketplace (v1) - legacy, kept for reference
         "OLAS_MECH_MARKETPLACE_OLD": EthereumAddress("0x4554fE75c1f5576c1d7F765B2A036c199Adae329"),
     },
     "ethereum": {

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

@@ -43,14 +43,27 @@ class ActivityCheckerContract(ContractInstance):
         """
         super().__init__(address, chain_name=chain_name)
 
-        # Get the mech address this checker tracks
-        agent_mech_function = getattr(self.contract.functions, "agentMech", None)
-        self.agent_mech = (
-            agent_mech_function().call() if agent_mech_function else DEFAULT_MECH_CONTRACT_ADDRESS
-        )
+        # Check for marketplace-aware checker
+        try:
+            mech_mp_function = getattr(self.contract.functions, "mechMarketplace", None)
+            self.mech_marketplace = mech_mp_function().call() if mech_mp_function else None
+        except Exception:
+            self.mech_marketplace = None
+
+        # Get the mech address this checker tracks (legacy or priority mech)
+        try:
+            agent_mech_function = getattr(self.contract.functions, "agentMech", None)
+            self.agent_mech = (
+                agent_mech_function().call() if agent_mech_function else DEFAULT_MECH_CONTRACT_ADDRESS
+            )
+        except Exception:
+            self.agent_mech = DEFAULT_MECH_CONTRACT_ADDRESS
 
         # Get liveness ratio (requests per second * 1e18)
-        self.liveness_ratio = self.contract.functions.livenessRatio().call()
+        try:
+            self.liveness_ratio = self.contract.functions.livenessRatio().call()
+        except Exception:
+            self.liveness_ratio = 0
 
     def get_multisig_nonces(self, multisig: EthereumAddress) -> Tuple[int, int]:
         """Get the nonces for a multisig address.

{iwa-0.0.14 → iwa-0.0.16}/src/iwa/plugins/olas/service_manager/base.py

@@ -51,6 +51,10 @@ class ServiceManagerBase:
 
     def _init_contracts(self, chain_name: str) -> None:
         """Initialize contracts for the given chain."""
+        # OPTIMIZATION: Skip if already initialized for this chain
+        if getattr(self, "chain_name", None) == chain_name.lower() and hasattr(self, "registry"):
+            return
+
         chain_interface = ChainInterfaces().get(chain_name)
 
         # Get protocol contracts from plugin-local constants
@@ -63,9 +67,9 @@ class ServiceManagerBase:
 
         self.registry = ServiceRegistryContract(registry_address, chain_name=chain_name)
         self.manager = ServiceManagerContract(manager_address, chain_name=chain_name)
-        logger.info(f"[SM-INIT] ServiceManager initialized. Chain: {chain_name}")
-        logger.info(f"[SM-INIT] Registry Address: {self.registry.address}")
-        logger.info(f"[SM-INIT] Manager Address: {self.manager.address}")
+        logger.debug(f"[SM-INIT] ServiceManager initialized. Chain: {chain_name}")
+        logger.debug(f"[SM-INIT] Registry Address: {self.registry.address}")
+        logger.debug(f"[SM-INIT] Manager Address: {self.manager.address}")
         self.chain_interface = chain_interface
         self.chain_name = chain_name.lower()
 

{iwa-0.0.14 → iwa-0.0.16}/src/iwa/plugins/olas/service_manager/mech.py

@@ -1,4 +1,29 @@
-"""Mech manager mixin."""
+"""Mech manager mixin.
+
+This module handles sending mech requests for OLAS services. There are TWO
+distinct flows for mech requests, and the correct one MUST be used based on
+the service's staking contract:
+
+1. **Legacy Mech Flow** (use_marketplace=False):
+   - Sends requests directly to the legacy mech contract (0x77af31De...)
+   - Used by NON-MM staking contracts (e.g., "Expert X (Yk OLAS)")
+   - Activity checker calls `agentMech.getRequestsCount(multisig)` to count
+
+2. **Marketplace Flow** (use_marketplace=True):
+   - Sends requests via MechMarketplace contract (0x735FAAb1c...)
+   - Used by MM staking contracts (e.g., "Expert X MM (Yk OLAS)")
+   - Activity checker calls `mechMarketplace.mapRequestCounts(multisig)` to count
+   - Requires a priority_mech that is registered on the marketplace
+   - Default priority_mech from olas-operate-middleware: 0xC05e7412...
+
+**IMPORTANT**: If a service is staked in an MM contract but sends legacy mech
+requests, those requests will NOT be counted by the activity checker, and the
+service will not receive staking rewards.
+
+The `get_marketplace_config()` method automatically detects which flow to use
+by checking if the staking contract's activity checker has a `mechMarketplace`
+field set to a non-zero address.
+"""
 
 from typing import Optional
 
@@ -17,12 +42,60 @@ from iwa.plugins.olas.contracts.mech_marketplace import MechMarketplaceContract
 class MechManagerMixin:
     """Mixin for Mech interactions."""
 
+    def get_marketplace_config(self) -> tuple:
+        """Check if current service requires marketplace mech requests.
+
+        Queries the staking contract's activityChecker to determine if it
+        tracks marketplace requests.
+
+        Returns:
+            Tuple of (use_marketplace, marketplace_address, priority_mech):
+                - use_marketplace: True if marketplace requests are required.
+                - marketplace_address: Address of the mech marketplace (if applicable).
+                - priority_mech: Address of the priority mech (if applicable).
+
+        """
+        from iwa.core.constants import ZERO_ADDRESS
+
+        if not self.service or not self.service.staking_contract_address:
+            return (False, None, None)
+
+        try:
+            # Get staking contract with its activity checker
+            from iwa.plugins.olas.contracts.staking import StakingContract
+
+            staking = StakingContract(
+                self.service.staking_contract_address, chain_name=self.chain_name
+            )
+
+            # StakingContract has activity_checker attribute set in __init__
+            checker = staking.activity_checker
+
+            if checker.mech_marketplace and checker.mech_marketplace != ZERO_ADDRESS:
+                # Use the default marketplace priority mech from constants
+                from iwa.plugins.olas.constants import OLAS_CONTRACTS
+
+                protocol_contracts = OLAS_CONTRACTS.get(self.chain_name, {})
+                priority_mech = protocol_contracts.get("OLAS_MECH_MARKETPLACE_PRIORITY")
+
+                logger.info(
+                    f"[MECH] Service {self.service.service_id} requires marketplace requests "
+                    f"(marketplace={checker.mech_marketplace}, priority_mech={priority_mech})"
+                )
+                return (True, checker.mech_marketplace, priority_mech)
+
+            return (False, None, None)
+
+        except Exception as e:
+            logger.debug(f"[MECH] Failed to detect marketplace config: {e}")
+            return (False, None, None)
+
     def send_mech_request(
         self,
         data: bytes,
         value: Optional[int] = None,
         mech_address: Optional[str] = None,
-        use_marketplace: bool = False,
+        use_marketplace: Optional[bool] = None,
         use_new_abi: bool = False,
         priority_mech: Optional[str] = None,
         max_delivery_rate: Optional[int] = None,
@@ -37,6 +110,7 @@ class MechManagerMixin:
             value: Payment value in wei. For marketplace, should match mech's maxDeliveryRate.
             mech_address: Address of the Mech contract (for legacy/direct flow).
             use_marketplace: Whether to use the Mech Marketplace flow.
+                             If None, auto-detects based on staking contract.
             use_new_abi: Whether to use new ABI for legacy flow.
             priority_mech: Priority mech address (required for marketplace).
             max_delivery_rate: Max delivery rate in wei (for marketplace). If None, uses value.
@@ -59,6 +133,14 @@ class MechManagerMixin:
             logger.error(f"Service {service_id} has no multisig address")
             return None
 
+        # Auto-detect marketplace requirement if not explicitly specified
+        if use_marketplace is None:
+            use_marketplace, detected_marketplace, detected_priority_mech = (
+                self.get_marketplace_config()
+            )
+            if use_marketplace:
+                priority_mech = priority_mech or detected_priority_mech
+
         if use_marketplace:
             return self._send_marketplace_mech_request(
                 data=data,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iwa
-Version: 0.0.14
+Version: 0.0.16
 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.14 → iwa-0.0.16}/src/tests/test_contract.py

@@ -4,7 +4,15 @@ from unittest.mock import MagicMock, mock_open, patch
 import pytest
 from web3.exceptions import ContractCustomError
 
-from iwa.core.contracts.contract import ContractInstance
+from iwa.core.contracts.contract import ContractInstance, clear_abi_cache
+
+
+@pytest.fixture(autouse=True)
+def clean_abi_cache():
+    """Clear global ABI cache before each test."""
+    clear_abi_cache()
+    yield
+    clear_abi_cache()
 
 
 @pytest.fixture