iwa 0.0.1a5__py3-none-any.whl → 0.0.2__py3-none-any.whl

iwa/core/chain/models.py

@@ -78,6 +78,15 @@ class Gnosis(SupportedChain):
         if not self.rpcs and secrets.gnosis_rpc:
             self.rpcs = secrets.gnosis_rpc.get_secret_value().split(",")
 
+        # Defensive: ensure no comma-separated strings in list
+        new_rpcs = []
+        for rpc in self.rpcs:
+            if "," in rpc:
+                new_rpcs.extend([r.strip() for r in rpc.split(",") if r.strip()])
+            else:
+                new_rpcs.append(rpc)
+        self.rpcs = new_rpcs
+
 
 @singleton
 class Ethereum(SupportedChain):
@@ -98,6 +107,15 @@ class Ethereum(SupportedChain):
         if not self.rpcs and secrets.ethereum_rpc:
             self.rpcs = secrets.ethereum_rpc.get_secret_value().split(",")
 
+        # Defensive: ensure no comma-separated strings in list
+        new_rpcs = []
+        for rpc in self.rpcs:
+            if "," in rpc:
+                new_rpcs.extend([r.strip() for r in rpc.split(",") if r.strip()])
+            else:
+                new_rpcs.append(rpc)
+        self.rpcs = new_rpcs
+
 
 @singleton
 class Base(SupportedChain):
@@ -118,6 +136,15 @@ class Base(SupportedChain):
         if not self.rpcs and secrets.base_rpc:
             self.rpcs = secrets.base_rpc.get_secret_value().split(",")
 
+        # Defensive: ensure no comma-separated strings in list
+        new_rpcs = []
+        for rpc in self.rpcs:
+            if "," in rpc:
+                new_rpcs.extend([r.strip() for r in rpc.split(",") if r.strip()])
+            else:
+                new_rpcs.append(rpc)
+        self.rpcs = new_rpcs
+
 
 @singleton
 class SupportedChains:

iwa/core/constants.py

@@ -16,7 +16,7 @@ WALLET_PATH = DATA_DIR / "wallet.json"
 BACKUP_DIR = DATA_DIR / "backup"
 TENDERLY_CONFIG_PATH = Path("tenderly.yaml")
 
-ABI_PATH = PROJECT_ROOT / "src" / "iwa" / "core" / "contracts" / "abis"
+ABI_PATH = Path(__file__).parent / "contracts" / "abis"
 
 # Standard Ethereum addresses
 ZERO_ADDRESS = EthereumAddress("0x0000000000000000000000000000000000000000")

iwa/core/pricing.py

@@ -45,7 +45,13 @@ class PriceService:
             if datetime.now() - entry["timestamp"] < self.cache_ttl:
                 return entry["price"]
 
-        # Fetch from API with 2 retries
+        price = self._fetch_price_from_api(token_id, vs_currency)
+        if price is not None:
+            self.cache[cache_key] = {"price": price, "timestamp": datetime.now()}
+        return price
+
+    def _fetch_price_from_api(self, token_id: str, vs_currency: str) -> Optional[float]:
+        """Fetch price from API with retries and key fallback."""
         max_retries = 2
         for attempt in range(max_retries + 1):
             try:
@@ -57,9 +63,16 @@ class PriceService:
 
                 response = requests.get(url, params=params, headers=headers, timeout=10)
 
+                if response.status_code == 401 and self.api_key:
+                    logger.warning("CoinGecko API key invalid (401). Retrying without key...")
+                    self.api_key = None
+                    headers.pop("x-cg-demo-api-key", None)
+                    response = requests.get(url, params=params, headers=headers, timeout=10)
+
                 if response.status_code == 429:
                     logger.warning(
-                        f"CoinGecko rate limit reached (429) for {token_id}. Attempt {attempt + 1}/{max_retries + 1}"
+                        f"CoinGecko rate limit reached (429) for {token_id}. "
+                        f"Attempt {attempt + 1}/{max_retries + 1}"
                     )
                     if attempt < max_retries:
                         time.sleep(2 * (attempt + 1))
@@ -67,25 +80,19 @@ class PriceService:
                     return None
 
                 response.raise_for_status()
-
                 data = response.json()
+
                 if token_id in data and vs_currency in data[token_id]:
-                    price = float(data[token_id][vs_currency])
+                    return float(data[token_id][vs_currency])
 
-                    # Update cache
-                    self.cache[cache_key] = {"price": price, "timestamp": datetime.now()}
-                    return price
-                else:
-                    logger.warning(
-                        f"Price for {token_id} in {vs_currency} not found in response: {data}"
-                    )
-                    # Don't cache None, might be a temporary hiccup
-                    return None
+                logger.warning(
+                    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}")
                 if attempt < max_retries:
                     time.sleep(1)
                     continue
-                return None
         return None

{iwa-0.0.1a5.dist-info → iwa-0.0.2.dist-info}/METADATA

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

@@ -2,7 +2,7 @@ iwa/__init__.py,sha256=vu12UytYNREtMRvIWp6AfV1GgUe53XWwCMhYyqKAPgo,19
 iwa/__main__.py,sha256=eJU5Uxeu9Y7shWg5dt5Mcq0pMC4wFVNWjeYGKSf4Apw,88
 iwa/core/__init__.py,sha256=GJv4LJOXeZ3hgGvbt5I6omkoFkP2A9qhHjpDlOep9ik,24
 iwa/core/cli.py,sha256=iUZ3VBUwjYLp_m8UxvMrIsIDxUs2n5a6zVElLiDfSwo,7507
-iwa/core/constants.py,sha256=JBjGyxpAdsn8mBOWHljllmAw45oGNgi8qqkH_vYkcrg,982
+iwa/core/constants.py,sha256=En-1uT5Anv0_NCSMdQjTGvjqiNAWfbSb_kGlH4Ct0Ag,966
 iwa/core/db.py,sha256=WI-mP0tQAmwFPeEi9w7RCa_Mcf_zBfd_7JcbHJwU1aU,10377
 iwa/core/ipfs.py,sha256=aHjq_pflgwDVHl8g5EMQv0q2RAmMs-a0pOTVsj_L5xE,4980
 iwa/core/keys.py,sha256=ckacVZxm_02V9hlmHIxz-CkxjXdGHqvGGAXfO6EeHCw,22365
@@ -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=yC_zMT30KBZStLvQ0OEm6KmL6jn_B3kP2iBOVc5avU4,3211
+iwa/core/pricing.py,sha256=5D2WAaDRuY1iOmj9fwgh_etnjjU6wdJmIgwoy8DbA2E,3614
 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
@@ -22,7 +22,7 @@ iwa/core/chain/__init__.py,sha256=XJMmn0ed-_aVkY2iEMKpuTxPgIKBd41dexSVmEZTa-o,16
 iwa/core/chain/errors.py,sha256=9SEbhxZ-qASPkzt-DoI51qq0GRJVqRgqgL720gO7a64,1275
 iwa/core/chain/interface.py,sha256=3tyMvnOZCTTvM0Y3YgxuN6zlXyJ1EIZUoyVosGtsUI8,20228
 iwa/core/chain/manager.py,sha256=cFEzh6pK5OyVhjhpeMAqhc9RnRDQR1DjIGiGKp-FXBI,1159
-iwa/core/chain/models.py,sha256=ZVhzde2yHS50qYKkgpeWzFRtjnp2HiFU_D10SrD8RYI,4035
+iwa/core/chain/models.py,sha256=h3-vygtsAHaY1-JSqTujr0JYs7OpzBfYTRsh-vOoEV4,4962
 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=ERWViqZNqhsmf-tKVxn5XfQTJ8S_1MXVk0Tjq8davd0,11228
@@ -149,7 +149,7 @@ iwa/web/tests/test_web_endpoints.py,sha256=vZUGmrudkQHA8gBmSyO8i2SgZpsr1He-YRm2J
 iwa/web/tests/test_web_olas.py,sha256=oN__4nUT_H_j-_ALEqSp-si5xMbY0Bcxhvhuhxsg4Q8,16292
 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.1a5.dist-info/licenses/LICENSE,sha256=eIubm_IlBHPYRQlLNZKbBNKhJUUP3JH0A2miZUhAVfI,1078
+iwa-0.0.2.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
@@ -199,8 +199,8 @@ tests/test_ui_coverage.py,sha256=N-7uhPlKOXCKyS32VjwG3JQRnAS1PoAJxR-InaOZtCQ,242
 tests/test_utils.py,sha256=vkP49rYNI8BRzLpWR3WnKdDr8upeZjZcs7Rx0pjbQMo,1292
 tests/test_workers.py,sha256=MInwdkFY5LdmFB3o1odIaSD7AQZb3263hNafO1De5PE,2793
 tools/verify_drain.py,sha256=1On4GmXWETA-CHfFjd7qAqIQuSgKIaEomKKXM7S8wfk,6881
-iwa-0.0.1a5.dist-info/METADATA,sha256=QoKlrod8k2js2_pYay2mKrH7dPLq9pwT0Hwg0IJjbFs,7296
-iwa-0.0.1a5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-iwa-0.0.1a5.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
-iwa-0.0.1a5.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
-iwa-0.0.1a5.dist-info/RECORD,,
+iwa-0.0.2.dist-info/METADATA,sha256=LI8zcRvzlRmevpeYLa1O5KdZbF6GX5L-Xp7QLUcgSI8,7294
+iwa-0.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+iwa-0.0.2.dist-info/entry_points.txt,sha256=nwB6kscrfA7M00pYmL2j-sBH6eF6h2ga9IK1BZxdiyQ,241
+iwa-0.0.2.dist-info/top_level.txt,sha256=kedS9cRUbm4JE2wYeabIXilhHjN8KCw0IGbqqqsw0Bs,16
+iwa-0.0.2.dist-info/RECORD,,