iwa 0.0.1a6__py3-none-any.whl → 0.0.10__py3-none-any.whl

iwa/plugins/olas/tests/test_plugin_full.py

@@ -1,6 +1,6 @@
 """Integration tests for OlasPlugin."""
 
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
 
 import pytest
 import typer
@@ -103,15 +103,18 @@ def test_import_services_cli_full(plugin, runner):
 def test_get_safe_signers_edge_cases(plugin):
     """Test _get_safe_signers with various failure scenarios."""
     # 1. No RPC configured
-    with patch("iwa.core.secrets.secrets") as mock_settings:
-        mock_settings.gnosis_rpc = None
+    with patch("iwa.core.chain.ChainInterfaces") as mock_ci_cls:
+        mock_ci = mock_ci_cls.return_value
+        mock_ci.get.return_value.chain.rpcs = []
         signers, exists = plugin._get_safe_signers("0x1", "gnosis")
         assert signers is None
         assert exists is None
 
     # 2. Safe doesn't exist (raises exception)
-    with patch("iwa.core.secrets.secrets") as mock_settings:
-        mock_settings.gnosis_rpc = MagicMock()
+    with patch("iwa.core.chain.ChainInterfaces") as mock_ci_cls:
+        mock_ci = mock_ci_cls.return_value
+        mock_ci.get.return_value.chain.rpcs = ["http://rpc"]
+        mock_ci.get.return_value.chain.rpc = "http://rpc"
         with patch("safe_eth.eth.EthereumClient"), patch("safe_eth.safe.Safe") as mock_safe_cls:
             mock_safe = mock_safe_cls.return_value
             mock_safe.retrieve_owners.side_effect = Exception("Generic error")
@@ -121,8 +124,10 @@ def test_get_safe_signers_edge_cases(plugin):
             assert exists is False
 
     # 3. Success path
-    with patch("iwa.core.secrets.secrets") as mock_settings:
-        mock_settings.gnosis_rpc = MagicMock()
+    with patch("iwa.core.chain.ChainInterfaces") as mock_ci_cls:
+        mock_ci = mock_ci_cls.return_value
+        mock_ci.get.return_value.chain.rpcs = ["http://rpc"]
+        mock_ci.get.return_value.chain.rpc = "http://rpc"
         with patch("safe_eth.eth.EthereumClient"), patch("safe_eth.safe.Safe") as mock_safe_cls:
             mock_safe = mock_safe_cls.return_value
             mock_safe.retrieve_owners.return_value = ["0xAgent"]

iwa/plugins/olas/tests/test_service_manager_validation.py

@@ -45,21 +45,22 @@ def test_drain_service_partial_failures(sm, mock_wallet):
     # 2. Safe drain failure
     # 3. Agent drain success
 
-    with patch.object(sm, "claim_rewards", return_value=(True, 10**18)):
-        # Wallet.drain is called for Safe and Agent
-        def mock_drain(from_address_or_tag=None, to_address_or_tag=None, chain_name=None):
-            if from_address_or_tag == VALID_ADDR_2:  # Safe
-                raise Exception("Safe drain failed")
-            return {"native": 0.5}
-
-        mock_wallet.drain.side_effect = mock_drain
-
-        result = sm.drain_service()
-
-        assert "safe" not in result
-        assert "agent" in result
-        assert result["agent"]["native"] == 0.5
-        # Verify it continued after Safe failure
+    with patch("time.sleep"):  # Avoid real delays in drain operations
+        with patch.object(sm, "claim_rewards", return_value=(True, 10**18)):
+            # Wallet.drain is called for Safe and Agent
+            def mock_drain(from_address_or_tag=None, to_address_or_tag=None, chain_name=None):
+                if from_address_or_tag == VALID_ADDR_2:  # Safe
+                    raise Exception("Safe drain failed")
+                return {"native": 0.5}
+
+            mock_wallet.drain.side_effect = mock_drain
+
+            result = sm.drain_service()
+
+            assert "safe" not in result
+            assert "agent" in result
+            assert result["agent"]["native"] == 0.5
+            # Verify it continued after Safe failure
 
 
 def test_unstake_failed_event_extraction(sm):

iwa/tools/list_contracts.py

@@ -11,8 +11,8 @@ from iwa.core.utils import configure_logger
 from iwa.plugins.olas.constants import OLAS_TRADER_STAKING_CONTRACTS
 from iwa.plugins.olas.contracts.staking import StakingContract
 
-# Configure logger to avoid noise during execution
-logger = configure_logger()
+# Configure logger and silence noisy third-party loggers
+configure_logger()
 logging.getLogger("web3").setLevel(logging.WARNING)
 logging.getLogger("urllib3").setLevel(logging.WARNING)
 

iwa/web/dependencies.py

@@ -1,16 +1,14 @@
 """Shared dependencies for Web API routers."""
 
-import logging
 import secrets
 from typing import Optional
 
 from fastapi import Header, HTTPException, Security
 from fastapi.security import APIKeyHeader
+from loguru import logger
 
 from iwa.core.wallet import Wallet
 
-logger = logging.getLogger(__name__)
-
 # Singleton wallet instance for the web app
 wallet = Wallet()
 

iwa/web/routers/accounts.py

@@ -1,16 +1,15 @@
 """Accounts Router for Web API."""
 
-import logging
 import time
 
 from fastapi import APIRouter, Depends, HTTPException, Request
+from loguru import logger
 from slowapi import Limiter
 from slowapi.util import get_remote_address
 
 from iwa.web.dependencies import verify_auth, wallet
 from iwa.web.models import AccountCreateRequest, SafeCreateRequest
 
-logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/api/accounts", tags=["accounts"])
 
 # Rate limiter for this router

iwa/web/routers/olas/admin.py

@@ -1,8 +1,7 @@
 """Olas Admin Router."""
 
-import logging
-
 from fastapi import APIRouter, Depends, HTTPException, Request
+from loguru import logger
 from slowapi import Limiter
 from slowapi.util import get_remote_address
 
@@ -10,7 +9,6 @@ from iwa.core.models import Config
 from iwa.plugins.olas.models import OlasConfig
 from iwa.web.dependencies import verify_auth, wallet
 
-logger = logging.getLogger(__name__)
 router = APIRouter(tags=["olas"])
 limiter = Limiter(key_func=get_remote_address)
 

iwa/web/routers/olas/funding.py

@@ -1,8 +1,7 @@
 """Olas Funding Router."""
 
-import logging
-
 from fastapi import APIRouter, Depends, HTTPException, Request
+from loguru import logger
 from pydantic import BaseModel, Field
 from slowapi import Limiter
 from slowapi.util import get_remote_address
@@ -11,7 +10,6 @@ from iwa.core.models import Config
 from iwa.plugins.olas.models import OlasConfig
 from iwa.web.dependencies import verify_auth, wallet
 
-logger = logging.getLogger(__name__)
 router = APIRouter(tags=["olas"])
 limiter = Limiter(key_func=get_remote_address)
 

iwa/web/routers/olas/general.py

@@ -1,12 +1,10 @@
 """Olas General Router."""
 
-import logging
-
 from fastapi import APIRouter, Depends
+from loguru import logger
 
 from iwa.web.dependencies import verify_auth
 
-logger = logging.getLogger(__name__)
 router = APIRouter(tags=["olas"])
 
 

iwa/web/routers/olas/services.py

@@ -1,16 +1,15 @@
 """Olas Services Router."""
 
-import logging
 from typing import Optional
 
 from fastapi import APIRouter, Depends, HTTPException
+from loguru import logger
 from pydantic import BaseModel, Field
 
 from iwa.core.models import Config
 from iwa.plugins.olas.models import OlasConfig
 from iwa.web.dependencies import verify_auth, wallet
 
-logger = logging.getLogger(__name__)
 router = APIRouter(tags=["olas"])
 
 

iwa/web/routers/olas/staking.py

@@ -1,9 +1,9 @@
 """Olas Staking Router."""
 
-import logging
 from typing import Optional
 
 from fastapi import APIRouter, Depends, HTTPException, Request
+from loguru import logger
 from slowapi import Limiter
 from slowapi.util import get_remote_address
 
@@ -11,7 +11,6 @@ from iwa.core.models import Config
 from iwa.plugins.olas.models import OlasConfig
 from iwa.web.dependencies import get_config, verify_auth, wallet
 
-logger = logging.getLogger(__name__)
 router = APIRouter(tags=["olas"])
 limiter = Limiter(key_func=get_remote_address)
 
@@ -34,25 +33,18 @@ def get_staking_contracts(
         raise HTTPException(status_code=400, detail="Invalid chain name")
 
     try:
-        import json
-
-        from iwa.core.chain import ChainInterface
+        from iwa.core.chain import ChainInterfaces
         from iwa.plugins.olas.constants import OLAS_TRADER_STAKING_CONTRACTS
-        from iwa.plugins.olas.contracts.base import OLAS_ABI_PATH
 
         contracts = OLAS_TRADER_STAKING_CONTRACTS.get(chain, {})
 
         # Get service bond and token if filtered
         service_bond, service_token = _get_service_filter_info(service_key)
 
-        # Load ABI once
-        with open(OLAS_ABI_PATH / "staking.json", "r") as f:
-            abi = json.load(f)
-
-        # Get correct web3 instance
-        w3 = ChainInterface(chain).web3
+        # Get correct interface from singleton manager
+        interface = ChainInterfaces().get(chain)
 
-        results = _fetch_all_contracts(contracts, w3, abi)
+        results = _fetch_all_contracts(contracts, interface)
         filtered_results = _filter_contracts(results, service_bond, service_token)
 
         # Return with filter metadata so frontend can explain filtering
@@ -109,14 +101,20 @@ def _get_service_filter_info(service_key: Optional[str]) -> tuple[Optional[int],
     return service_bond, service_token
 
 
-def _check_availability(name, address, w3, abi):
+def _check_availability(name, address, interface):
     """Check availability of a single staking contract."""
+    # Import at module level would cause circular import, but we can cache it
+    # The import is cached by Python after first call so this is efficient
+    from iwa.plugins.olas.contracts.staking import StakingContract
+
     try:
-        contract = w3.eth.contract(address=address, abi=abi)
-        service_ids = contract.functions.getServiceIds().call()
-        max_services = contract.functions.maxNumServices().call()
-        min_deposit = contract.functions.minStakingDeposit().call()
-        staking_token = contract.functions.stakingToken().call()
+        contract = StakingContract(address, chain_name=interface.chain.name)
+
+        # StakingContract uses .call() which handles with_retry and rotation
+        service_ids = contract.call("getServiceIds")
+        max_services = contract.call("maxNumServices")
+        min_deposit = contract.call("minStakingDeposit")
+        staking_token = contract.call("stakingToken")
         used = len(service_ids)
 
         return {
@@ -141,15 +139,14 @@ def _check_availability(name, address, w3, abi):
         }
 
 
-def _fetch_all_contracts(contracts: dict, w3, abi) -> list:
+def _fetch_all_contracts(contracts: dict, interface) -> list:
     """Fetch availability for all contracts using threads."""
     from concurrent.futures import ThreadPoolExecutor
 
     results = []
     with ThreadPoolExecutor(max_workers=10) as executor:
-        # Pass w3 and abi to the helper
         futures = [
-            executor.submit(_check_availability, name, addr, w3, abi)
+            executor.submit(_check_availability, name, addr, interface)
             for name, addr in contracts.items()
         ]
         for future in futures:

iwa/web/routers/swap.py

@@ -1,12 +1,12 @@
 """Swap Router for Web API."""
 
 import asyncio
-import logging
 from concurrent.futures import ThreadPoolExecutor
 from functools import lru_cache
 from typing import Any, Optional
 
 from fastapi import APIRouter, Depends, HTTPException, Request
+from loguru import logger
 from pydantic import BaseModel, Field, field_validator
 from slowapi import Limiter
 from slowapi.util import get_remote_address
@@ -16,7 +16,6 @@ from iwa.core.chain import ChainInterfaces, SupportedChain
 from iwa.plugins.gnosis.cow import CowSwap
 from iwa.web.dependencies import verify_auth, wallet
 
-logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/api/swap", tags=["swap"])
 
 limiter = Limiter(key_func=get_remote_address)

iwa/web/routers/transactions.py

@@ -2,7 +2,6 @@
 
 import datetime
 import json
-import logging
 
 from fastapi import APIRouter, Depends, HTTPException, Request
 from pydantic import BaseModel, Field, field_validator
@@ -13,7 +12,6 @@ from web3 import Web3
 from iwa.core.db import SentTransaction
 from iwa.web.dependencies import verify_auth, wallet
 
-logger = logging.getLogger(__name__)
 router = APIRouter(prefix="/api", tags=["transactions"])
 
 # Rate limiter for this router

iwa/web/server.py

@@ -9,11 +9,13 @@ from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
+from loguru import logger
 from slowapi import Limiter, _rate_limit_exceeded_handler
 from slowapi.errors import RateLimitExceeded
 from slowapi.util import get_remote_address
 from starlette.middleware.base import BaseHTTPMiddleware
 
+from iwa.core.utils import configure_logger
 from iwa.core.wallet import init_db
 
 # Pre-load cowdao_cowpy modules BEFORE async loop starts
@@ -21,15 +23,15 @@ from iwa.core.wallet import init_db
 # which fails if called from an already running event loop
 from iwa.plugins.gnosis.cow_utils import get_cowpy_module
 
-get_cowpy_module("DEFAULT_APP_DATA_HASH")  # Forces import now, not during async
-
-# Import dependencies to ensure initialization
 # Import routers
-from iwa.web.routers import accounts, olas, state, swap, transactions  # noqa: E402
+from iwa.web.routers import accounts, olas, state, swap, transactions
+
+get_cowpy_module("DEFAULT_APP_DATA_HASH")  # Forces import now, not during async
 
-# Configure logging
+# Configure logging (writes to iwa.log for frontend visibility)
+configure_logger()
+# Initialize standard logging for third-party libs (silenced by configure_logger but needed for basics)
 logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
 
 
 # Rate limiter (in-memory storage, resets on restart)

iwa/web/static/app.js

@@ -2564,6 +2564,8 @@ document.addEventListener("DOMContentLoaded", () => {
     // Show spinner, hide select, disable button
     select.style.display = "none";
     spinnerDiv.style.display = "block";
+    spinnerDiv.innerHTML =
+      '<span class="loading-spinner"></span> Loading contracts...';
     confirmBtn.disabled = true;
     modal.classList.add("active");
 
@@ -2689,6 +2691,8 @@ document.addEventListener("DOMContentLoaded", () => {
     // Load staking contracts
     contractSelect.style.display = "none";
     spinnerDiv.style.display = "block";
+    spinnerDiv.innerHTML =
+      '<span class="loading-spinner"></span> Loading contracts...';
     submitBtn.disabled = true;
 
     try {
@@ -2877,22 +2881,40 @@ document.addEventListener("DOMContentLoaded", () => {
           'button[type="submit"]',
         );
         contractSelect.style.display = "none";
+
+        // Remove hidden class to ensure visibility (overrides CSS !important)
+        spinnerDiv.classList.remove("hidden");
         spinnerDiv.style.display = "block";
+        spinnerDiv.innerHTML =
+          '<span class="loading-spinner"></span> Loading contracts...';
+
         submitBtn.disabled = true;
+
         authFetch("/api/olas/staking-contracts?chain=gnosis")
           .then((resp) => resp.json())
           .then((contracts) => {
             state.stakingContractsCache = contracts;
             contractSelect.innerHTML = renderContractOptions(contracts);
+
             contractSelect.style.display = "";
+            contractSelect.classList.remove("hidden");
+
+            // Hide spinner
             spinnerDiv.style.display = "none";
+            spinnerDiv.classList.add("hidden");
+
             submitBtn.disabled = false;
           })
           .catch(() => {
             contractSelect.innerHTML =
               '<option value="">None (don\'t stake)</option>';
             contractSelect.style.display = "";
+            contractSelect.classList.remove("hidden");
+
+            // Hide spinner even on error
             spinnerDiv.style.display = "none";
+            spinnerDiv.classList.add("hidden");
+
             submitBtn.disabled = false;
           });
       }

iwa/web/tests/test_web_endpoints.py

@@ -26,7 +26,7 @@ async def override_verify_auth():
 app.dependency_overrides[verify_auth] = override_verify_auth
 
 
-@pytest.fixture
+@pytest.fixture(scope="module")
 def client():
     """TestClient for FastAPI app."""
     return TestClient(app, raise_server_exceptions=False)

iwa/web/tests/test_web_olas.py

@@ -28,7 +28,7 @@ async def override_verify_auth():
 app.dependency_overrides[verify_auth] = override_verify_auth
 
 
-@pytest.fixture
+@pytest.fixture(scope="module")
 def client():
     """TestClient for FastAPI app."""
     return TestClient(app)

{iwa-0.0.1a6.dist-info → iwa-0.0.10.dist-info}/METADATA

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