iwa 0.0.14__py3-none-any.whl → 0.0.15__py3-none-any.whl

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

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

@@ -10,7 +10,7 @@ iwa/core/mnemonic.py,sha256=LiG1VmpydQoHQ0pHUJ1OIlrWJry47VSMnOqPM_Yk-O8,12930
 iwa/core/models.py,sha256=kBQ0cBe6uFmL2QfW7mjKiMFeZxhT-FRN-RyK3Ko0vE8,12849
 iwa/core/monitor.py,sha256=OmhKVMkfhvtxig3wDUL6iGwBIClTx0YUqMncCao4SqI,7953
 iwa/core/plugins.py,sha256=FLvOG4S397fKi0aTH1fWBEtexn4yvGv_QzGWqFrhSKE,1102
-iwa/core/pricing.py,sha256=B8dAUszv9t5EqvXQ7gh9CNBqlMLR598-c6Pv3NqtpO4,3561
+iwa/core/pricing.py,sha256=U-vIjJwzh6O7MZTAFZx6mFFxaiLcwn6PnsZc4g0z4IQ,4293
 iwa/core/secrets.py,sha256=U7DZKrwKuSOFV00Ij3ISrrO1cWn_t1GBW_0PyAqjcD4,2588
 iwa/core/tables.py,sha256=y7Cg67PAGHYVMVyAjbo_CQ9t2iz7UXE-OTuUHRyFRTo,2021
 iwa/core/test.py,sha256=gey0dql5eajo1itOhgkSrgfyGWue2eSfpr0xzX3vc38,643
@@ -25,7 +25,7 @@ iwa/core/chain/manager.py,sha256=cFEzh6pK5OyVhjhpeMAqhc9RnRDQR1DjIGiGKp-FXBI,115
 iwa/core/chain/models.py,sha256=0OgBo08FZEQisOdd00YUMXSAV7BC0CcWpqJ2y-gs0cI,4863
 iwa/core/chain/rate_limiter.py,sha256=gU7TmWdH9D_wbXKT1X7mIgoIUCWVuebgvRhxiyLGAmI,6613
 iwa/core/contracts/__init__.py,sha256=P5GFY_pnuI02teqVY2U0t98bn1_SSPAbcAzRMpCdTi4,34
-iwa/core/contracts/contract.py,sha256=Gx9L9wRithMALhdnQeF-0JA30_ZRHzlczAGiJXEfU5k,11766
+iwa/core/contracts/contract.py,sha256=N2I4-38O_6awqVrTEdJFh4XhsMbeu2JtFvkboUC4ZMg,12517
 iwa/core/contracts/erc20.py,sha256=VqriOdUXej0ilTgpukpm1FUF_9sSrVMAPuEpIvyZ2SQ,2646
 iwa/core/contracts/multisend.py,sha256=tSdBCWe7LSdBoKZ7z2QebmRFK4M2ln7H3kmJBeEb4Ho,2431
 iwa/core/contracts/abis/erc20.json,sha256=vrdExMWcIogg_nO59j1Pmipmpa2Ulj3oCCdcdrrFVCE,16995
@@ -79,7 +79,7 @@ iwa/plugins/olas/contracts/abis/staking_token.json,sha256=cuUOmi1s4Z6VSIX0an_IxK
 iwa/plugins/olas/scripts/test_full_mech_flow.py,sha256=id9IxC06FOKwexgwsG5nbsTB2rQLlIq5a5soMvK0IgY,9021
 iwa/plugins/olas/scripts/test_simple_lifecycle.py,sha256=8T50tOZx3afeECSfCNAb0rAHNtYOsBaeXlMwKXElCk8,2099
 iwa/plugins/olas/service_manager/__init__.py,sha256=GXiThMEY3nPgHUl1i-DLrF4h96z9jPxxI8Jepo2E1PM,1926
-iwa/plugins/olas/service_manager/base.py,sha256=V4o71ZYUSc_GzM-RWocaAGsrqI-fa5V7CcyloVpcjwE,4666
+iwa/plugins/olas/service_manager/base.py,sha256=CCTH7RiYtgyFwRszrMLxNf1rNM_6leWHuJJmse4m2wI,4854
 iwa/plugins/olas/service_manager/drain.py,sha256=IS7YYKuQdkULcNdxfHVzjcq95pXKdpajolzLL78u4jc,12430
 iwa/plugins/olas/service_manager/lifecycle.py,sha256=DIB6yrP0VPICu6558uQJuFp2sgrA66iVNTzZVUUowGw,47159
 iwa/plugins/olas/service_manager/mech.py,sha256=72-tEap-aYd0gebcH6y_De1SNeL6OrXn7sWuv_Ok_-Y,12224
@@ -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.14.dist-info/licenses/LICENSE,sha256=eIubm_IlBHPYRQlLNZKbBNKhJUUP3JH0A2miZUhAVfI,1078
+iwa-0.0.15.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
@@ -163,7 +163,7 @@ tests/test_chain.py,sha256=z3Mo9mHNQZ0aXSlrHUcdtNgGqsNyOwWYQAmmKa_dqiM,17221
 tests/test_chain_interface.py,sha256=Wu0q0sREtmYBp7YvWrBIrrSTtqeQj18oJp2VmMUEMec,8312
 tests/test_chain_interface_coverage.py,sha256=fvrVvw8-DMwdsSFKQHUhpbfutrVRxnnTc-tjB7Bb-jo,3327
 tests/test_cli.py,sha256=WW6EDeHLws5-BqFNOy11pH_D5lttuyspD5hrDCFpR0Q,3968
-tests/test_contract.py,sha256=EP0dJzViJn0Hbqw3hkCN6nygx5O1v2-DH7Lu8iDBACM,14235
+tests/test_contract.py,sha256=tApHAxsfKGawYJWA9PhTNrOZUE0VVAq79ruIe3KxeWY,14412
 tests/test_db.py,sha256=dmbrupj0qlUeiiycZ2mzMFjf7HrDa6tcqMPY8zpiKIk,5710
 tests/test_drain_coverage.py,sha256=jtN5tIXzSTlS2IjwLS60azyMYsjFDlSTUa98JM1bMic,6786
 tests/test_erc20.py,sha256=kNEw1afpm5EbXRNXkjpkBNZIy7Af1nqGlztKH5IWAwU,3074
@@ -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.14.dist-info/METADATA,sha256=7Ymm-F6pLqq7zyN1r-5FQAfLhhtEDzjpPpgGuMf1-Vo,7295
-iwa-0.0.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-iwa-0.0.14.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
-iwa-0.0.14.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
-iwa-0.0.14.dist-info/RECORD,,
+iwa-0.0.15.dist-info/METADATA,sha256=J9pChdhUaRH85yUje-9tNp2xCTdncgmxJHnMuV9kv7M,7295
+iwa-0.0.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+iwa-0.0.15.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
+iwa-0.0.15.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
+iwa-0.0.15.dist-info/RECORD,,

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