iwa 0.0.19__py3-none-any.whl → 0.0.21__py3-none-any.whl

iwa/plugins/olas/tests/test_service_manager_errors.py

@@ -23,12 +23,19 @@ def mock_wallet():
     return wallet
 
 
-def setup_manager(mock_wallet):
+@pytest.fixture
+def mock_manager(mock_wallet):
     """Setup a ServiceManager with mocked dependencies."""
-    with patch("iwa.plugins.olas.service_manager.base.Config") as mock_cfg_cls:
+    with patch("iwa.plugins.olas.service_manager.base.Config") as mock_cfg_cls, \
+         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
+         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+
+        mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
+
         mock_cfg = mock_cfg_cls.return_value
         mock_cfg.plugins = {"olas": MagicMock()}
         mock_cfg.plugins["olas"].get_service.return_value = None
+
         with patch(
             "iwa.plugins.olas.service_manager.OLAS_CONTRACTS",
             {
@@ -43,18 +50,22 @@ def setup_manager(mock_wallet):
                 mock_if = mock_if_cls.return_value
                 mock_if.get.return_value.chain.name.lower.return_value = "gnosis"
                 mock_if.get.return_value.get_contract_address.return_value = VALID_ADDR
+
                 manager = ServiceManager(mock_wallet)
                 manager.registry = MagicMock()
                 manager.manager_contract = MagicMock()
                 manager.olas_config = mock_cfg.plugins["olas"]
                 manager.chain_name = "gnosis"
+                # Fix recursive mock issue by setting explicit return value
+                manager.registry.chain_interface = MagicMock()
                 manager.registry.chain_interface.get_contract_address.return_value = VALID_ADDR
-                return manager
+
+                yield manager
 
 
-def test_service_manager_mech_requests_failures(mock_wallet):
+def test_service_manager_mech_requests_failures(mock_manager):
     """Test failure paths in mech requests."""
-    manager = setup_manager(mock_wallet)
+    manager = mock_manager
 
     # Service missing
     manager.service = None
@@ -99,9 +110,9 @@ def test_service_manager_mech_requests_failures(mock_wallet):
         assert manager.send_mech_request(b"data", use_marketplace=False) is None
 
 
-def test_service_manager_lifecycle_failures(mock_wallet):
+def test_service_manager_lifecycle_failures(mock_manager, mock_wallet):
     """Test failure paths in lifecycle methods."""
-    manager = setup_manager(mock_wallet)
+    manager = mock_manager
     manager.service = Service(service_name="t", chain_name="gnosis", service_id=1, agent_ids=[1])
 
     # register_agent failures
@@ -147,9 +158,9 @@ def test_service_manager_lifecycle_failures(mock_wallet):
     assert manager.wind_down() is True
 
 
-def test_service_manager_staking_status_failures(mock_wallet):
+def test_service_manager_staking_status_failures(mock_manager):
     """Test failure paths in get_staking_status."""
-    manager = setup_manager(mock_wallet)
+    manager = mock_manager
 
     # Service missing
     manager.service = None
@@ -178,9 +189,9 @@ def test_service_manager_staking_status_failures(mock_wallet):
         assert status.mech_requests_this_epoch == 0
 
 
-def test_service_manager_verify_event_exception(mock_wallet):
+def test_service_manager_verify_event_exception(mock_manager):
     """Test exception path in _execute_mech_tx."""
-    manager = setup_manager(mock_wallet)
+    manager = mock_manager
     manager.service = Service(
         service_name="t",
         chain_name="gnosis",

iwa/plugins/olas/tests/test_service_manager_flows.py

@@ -45,10 +45,12 @@ def mock_config():
 @patch("iwa.plugins.olas.service_manager.base.Config")
 @patch("iwa.plugins.olas.service_manager.base.ServiceRegistryContract")
 @patch("iwa.plugins.olas.service_manager.base.ServiceManagerContract")
+@patch("iwa.plugins.olas.service_manager.base.ContractCache")
 def test_create_service_success(
-    mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet
+    mock_cache, mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet
 ):
     """Test successful service creation."""
+    mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
     # Setup Config with new OlasConfig structure
     mock_config_inst = mock_config_cls.return_value
     mock_olas_config = MagicMock()
@@ -84,10 +86,12 @@ def test_create_service_success(
 @patch("iwa.plugins.olas.service_manager.base.Config")
 @patch("iwa.plugins.olas.service_manager.base.ServiceRegistryContract")
 @patch("iwa.plugins.olas.service_manager.base.ServiceManagerContract")
+@patch("iwa.plugins.olas.service_manager.base.ContractCache")
 def test_create_service_failures(
-    mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet
+    mock_cache, mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet
 ):
     """Test service creation failure modes."""
+    mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
     mock_config_inst = mock_config_cls.return_value
     mock_olas_config = MagicMock()
     mock_olas_config.get_service.return_value = None
@@ -139,10 +143,12 @@ def test_create_service_failures(
 @patch("iwa.plugins.olas.service_manager.base.Config")
 @patch("iwa.plugins.olas.service_manager.base.ServiceRegistryContract")
 @patch("iwa.plugins.olas.service_manager.base.ServiceManagerContract")
+@patch("iwa.plugins.olas.service_manager.base.ContractCache")
 def test_create_service_with_approval(
-    mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet
+    mock_cache, mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet
 ):
     """Test service creation with token approval."""
+    mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
     mock_config_inst = mock_config_cls.return_value
     mock_olas_config = MagicMock()
     mock_olas_config.get_service.return_value = None
@@ -170,10 +176,12 @@ def test_create_service_with_approval(
 @patch("iwa.plugins.olas.service_manager.base.Config")
 @patch("iwa.plugins.olas.service_manager.base.ServiceRegistryContract")
 @patch("iwa.plugins.olas.service_manager.base.ServiceManagerContract")
+@patch("iwa.plugins.olas.service_manager.base.ContractCache")
 def test_activate_registration(
-    mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet
+    mock_cache, mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet
 ):
     """Test service registration activation."""
+    mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
     mock_config_inst = mock_config_cls.return_value
     mock_olas_config = MagicMock()
     mock_service = MagicMock()
@@ -228,8 +236,10 @@ def test_activate_registration(
 @patch("iwa.plugins.olas.service_manager.base.Config")
 @patch("iwa.plugins.olas.service_manager.base.ServiceRegistryContract")
 @patch("iwa.plugins.olas.service_manager.base.ServiceManagerContract")
-def test_register_agent(mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet):
+@patch("iwa.plugins.olas.service_manager.base.ContractCache")
+def test_register_agent(mock_cache, mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet):
     """Test agent registration flow."""
+    mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
     mock_config_inst = mock_config_cls.return_value
     mock_olas_config = MagicMock()
     mock_service = MagicMock()
@@ -277,8 +287,10 @@ def test_register_agent(mock_sm_contract, mock_registry_contract, mock_config_cl
 @patch("iwa.plugins.olas.service_manager.base.Config")
 @patch("iwa.plugins.olas.service_manager.base.ServiceRegistryContract")
 @patch("iwa.plugins.olas.service_manager.base.ServiceManagerContract")
-def test_deploy(mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet):
+@patch("iwa.plugins.olas.service_manager.base.ContractCache")
+def test_deploy(mock_cache, mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet):
     """Test service deployment."""
+    mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
     # Setup mock service
     mock_service = MagicMock()
     mock_service.service_id = 123
@@ -341,8 +353,10 @@ def test_deploy(mock_sm_contract, mock_registry_contract, mock_config_cls, mock_
 @patch("iwa.plugins.olas.service_manager.base.Config")
 @patch("iwa.plugins.olas.service_manager.base.ServiceRegistryContract")
 @patch("iwa.plugins.olas.service_manager.base.ServiceManagerContract")
-def test_terminate(mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet):
+@patch("iwa.plugins.olas.service_manager.base.ContractCache")
+def test_terminate(mock_cache, mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet):
     """Test service termination."""
+    mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
     # Setup mock service
     mock_service = MagicMock()
     mock_service.service_id = 123
@@ -401,8 +415,10 @@ def test_terminate(mock_sm_contract, mock_registry_contract, mock_config_cls, mo
 @patch(
     "iwa.plugins.olas.service_manager.base.ServiceManagerContract"
 )  # MUST mock specifically here
-def test_stake(mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet):
+@patch("iwa.plugins.olas.service_manager.base.ContractCache")
+def test_stake(mock_cache, mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet):
     """Test service staking."""
+    mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
     # Setup mock service
     mock_service = MagicMock()
     mock_service.service_id = 123

iwa/plugins/olas/tests/test_service_staking.py

@@ -33,7 +33,10 @@ def mock_wallet():
 
 def test_sm_unstake_not_staked(mock_wallet):
     """Cover unstake when not staked (lines 736-738)."""
-    with patch("iwa.core.models.Config"):
+    with patch("iwa.core.models.Config"), \
+         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
+         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+        mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
         sm = ServiceManager(mock_wallet)
         sm.service = Service(
             service_name="t", chain_name="gnosis", service_id=1, multisig_address=VALID_ADDR
@@ -48,7 +51,10 @@ def test_sm_unstake_not_staked(mock_wallet):
 
 def test_sm_unstake_tx_fails(mock_wallet):
     """Cover unstake transaction failure (lines 766-768)."""
-    with patch("iwa.core.models.Config"):
+    with patch("iwa.core.models.Config"), \
+         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
+         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+        mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
         sm = ServiceManager(mock_wallet)
         sm.service = Service(
             service_name="t", chain_name="gnosis", service_id=1, multisig_address=VALID_ADDR
@@ -71,7 +77,10 @@ def test_sm_unstake_tx_fails(mock_wallet):
 
 def test_sm_get_staking_status_no_staking_address(mock_wallet):
     """Cover get_staking_status with no staking address (lines 831)."""
-    with patch("iwa.core.models.Config"):
+    with patch("iwa.core.models.Config"), \
+         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
+         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+        mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
         sm = ServiceManager(mock_wallet)
         sm.service = Service(
             service_name="t", chain_name="gnosis", service_id=1, staking_contract_address=VALID_ADDR
@@ -88,7 +97,10 @@ def test_sm_get_staking_status_no_staking_address(mock_wallet):
 
 def test_sm_get_staking_status_with_full_info(mock_wallet):
     """Cover get_staking_status with complete info (lines 866-891)."""
-    with patch("iwa.core.models.Config"):
+    with patch("iwa.core.models.Config"), \
+         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
+         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+        mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
         sm = ServiceManager(mock_wallet)
         sm.service = Service(
             service_name="t", chain_name="gnosis", service_id=1, staking_contract_address=VALID_ADDR
@@ -130,7 +142,10 @@ def test_sm_get_staking_status_with_full_info(mock_wallet):
 
 def test_sm_claim_rewards_no_service(mock_wallet):
     """Cover claim_rewards with no service (lines 936-938)."""
-    with patch("iwa.core.models.Config"):
+    with patch("iwa.core.models.Config"), \
+         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
+         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+        mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
         sm = ServiceManager(mock_wallet)
         sm.service = None
 
@@ -141,7 +156,10 @@ def test_sm_claim_rewards_no_service(mock_wallet):
 
 def test_sm_claim_rewards_no_staking_address(mock_wallet):
     """Cover claim_rewards with no staking address (lines 939-943)."""
-    with patch("iwa.core.models.Config"):
+    with patch("iwa.core.models.Config"), \
+         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
+         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+        mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
         sm = ServiceManager(mock_wallet)
         sm.service = Service(
             service_name="t", chain_name="gnosis", service_id=1, staking_contract_address=None
@@ -153,7 +171,10 @@ def test_sm_claim_rewards_no_staking_address(mock_wallet):
 
 def test_sm_claim_rewards_tx_fails(mock_wallet):
     """Cover claim_rewards transaction failure (lines 967-968)."""
-    with patch("iwa.core.models.Config"):
+    with patch("iwa.core.models.Config"), \
+         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
+         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+        mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
         sm = ServiceManager(mock_wallet)
         sm.service = Service(
             service_name="t",
@@ -165,12 +186,22 @@ def test_sm_claim_rewards_tx_fails(mock_wallet):
 
         mock_staking = MagicMock()
         mock_staking.prepare_claim_tx.return_value = {"to": VALID_ADDR}
+        mock_staking.get_staking_state.return_value = StakingState.STAKED
+        mock_staking.get_accrued_rewards.return_value = 100
+
+        def get_contract_side_effect(cls, *args, **kwargs):
+            print(f"DEBUG: get_contract called with {cls!r}")
+            if "StakingContract" in str(cls):
+                return mock_staking
+            return cls(*args, **kwargs)
+
+        mock_cache.return_value.get_contract.side_effect = get_contract_side_effect
 
         mock_wallet.sign_and_send_transaction.return_value = (False, None)
 
-        with patch("iwa.plugins.olas.service_manager.StakingContract", return_value=mock_staking):
-            success, amount = sm.claim_rewards()
-            assert success is False
+        with patch("iwa.plugins.olas.service_manager.drain.StakingContract", return_value=mock_staking):
+             success, amount = sm.claim_rewards()
+             assert success is False
 
 
 # === SERVICE MANAGER SPIN_UP STATE TRANSITIONS (lines 1188-1241) ===
@@ -178,7 +209,10 @@ def test_sm_claim_rewards_tx_fails(mock_wallet):
 
 def test_sm_spin_up_state_mismatch_after_activation(mock_wallet):
     """Cover spin_up state mismatch after activation (lines 1188-1191)."""
-    with patch("iwa.core.models.Config"):
+    with patch("iwa.core.models.Config"), \
+         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
+         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+        mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
         sm = ServiceManager(mock_wallet)
         sm.service = Service(service_name="t", chain_name="gnosis", service_id=1)
 
@@ -199,7 +233,10 @@ def test_sm_spin_up_state_mismatch_after_activation(mock_wallet):
 
 def test_sm_spin_up_registration_fails(mock_wallet):
     """Cover spin_up registration failure (lines 1199-1201)."""
-    with patch("iwa.core.models.Config"):
+    with patch("iwa.core.models.Config"), \
+         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
+         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+        mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
         sm = ServiceManager(mock_wallet)
         sm.service = Service(service_name="t", chain_name="gnosis", service_id=1)
 
@@ -216,7 +253,10 @@ def test_sm_spin_up_registration_fails(mock_wallet):
 
 def test_sm_spin_up_deploy_fails(mock_wallet):
     """Cover spin_up deploy failure (lines 1216-1218)."""
-    with patch("iwa.core.models.Config"):
+    with patch("iwa.core.models.Config"), \
+         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
+         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+        mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
         sm = ServiceManager(mock_wallet)
         sm.service = Service(service_name="t", chain_name="gnosis", service_id=1)
 
@@ -233,7 +273,10 @@ def test_sm_spin_up_deploy_fails(mock_wallet):
 
 def test_sm_wind_down_terminate_fails(mock_wallet):
     """Cover wind_down terminate failure (lines 1299-1301)."""
-    with patch("iwa.core.models.Config"):
+    with patch("iwa.core.models.Config"), \
+         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
+         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+        mock_cache.return_value.get_contract.side_effect = lambda cls, *a, **k: cls(*a, **k)
         sm = ServiceManager(mock_wallet)
         sm.service = Service(service_name="t", chain_name="gnosis", service_id=1)
 
@@ -250,7 +293,8 @@ def test_sm_wind_down_terminate_fails(mock_wallet):
 
 def test_sm_wind_down_unbond_fails(mock_wallet):
     """Cover wind_down unbond failure (lines 1315-1317)."""
-    with patch("iwa.core.models.Config"):
+    with patch("iwa.core.models.Config"), \
+         patch("iwa.plugins.olas.service_manager.base.ContractCache"):
         sm = ServiceManager(mock_wallet)
         sm.service = Service(service_name="t", chain_name="gnosis", service_id=1)
 

iwa/plugins/olas/tests/test_staking_validation.py

@@ -25,19 +25,12 @@ def mock_staking():
 def test_staking_get_service_info_nested_tuple(mock_staking):
     """Test get_service_info with nested tuple result from web3."""
     nested_result = (("0xMultisig", "0xOwner", (1, 2), 1000, 500, 0),)
-    mock_staking.call.side_effect = [
-        "0x1",  # activityChecker
-        100,  # availableRewards
-        200,  # balance
-        3600,  # livenessPeriod
-        10,  # rewardsPerSecond
-        10,  # maxNumServices
-        50,  # minStakingDeposit
-        7200,  # minStakingDuration
-        "0xToken",  # stakingToken
-        nested_result,  # getServiceInfo
-        2000,  # getNextRewardCheckpointTimestamp
-    ]
+    mock_staking.call.side_effect = (
+        ["0x1"]  # activityChecker
+        + [nested_result]  # getServiceInfo
+        + [2000] * 5  # getNextRewardCheckpointTimestamp and any others
+    )
+
     # Re-init to trigger calls
     with (
         patch("iwa.plugins.olas.contracts.staking.ActivityCheckerContract"),
@@ -45,7 +38,8 @@ def test_staking_get_service_info_nested_tuple(mock_staking):
     ):
         mock_ci.get_instance.return_value.web3.eth.contract.return_value = MagicMock()
         staking = StakingContract("0x78731D3Ca6b7E34aC0F824c42a7cC18A495cabaB", "gnosis")
-        staking.call = MagicMock(side_effect=[nested_result, 2000])
+        # Update call on the new instance
+        staking.call = MagicMock(side_effect=mock_staking.call.side_effect)
         staking.activity_checker.get_multisig_nonces.return_value = (1, 3)
         staking.get_required_requests = MagicMock(return_value=5)
 

iwa/tools/test_chainlist.py

@@ -0,0 +1,38 @@
+"""Script to verify ChainlistRPC functionality."""
+from iwa.core.chainlist import ChainlistRPC
+
+
+def main() -> None:
+    """Run the verification script."""
+    print("Initializing ChainlistRPC...")
+    chainlist = ChainlistRPC()
+
+    print("Fetching data...")
+    chainlist.fetch_data()
+
+    gnosis_chain_id = 100
+    print(f"\n--- Gnosis Chain (ID: {gnosis_chain_id}) ---")
+
+    all_rpcs = chainlist.get_rpcs(gnosis_chain_id)
+    print(f"Total RPCs found: {len(all_rpcs)}")
+
+    https_rpcs = chainlist.get_https_rpcs(gnosis_chain_id)
+    print(f"HTTPS RPCs ({len(https_rpcs)}):")
+    for url in https_rpcs[:5]:
+        print(f"  - {url}")
+    if len(https_rpcs) > 5:
+        print("  ... and more")
+
+    wss_rpcs = chainlist.get_wss_rpcs(gnosis_chain_id)
+    print(f"WSS RPCs ({len(wss_rpcs)}):")
+    for url in wss_rpcs[:5]:
+        print(f"  - {url}")
+    if len(wss_rpcs) > 5:
+        print("  ... and more")
+
+    print("\nTracking info for first 5 RPCs:")
+    for node in all_rpcs[:5]:
+        print(f"  - {node.url}: Tracking={node.is_tracking} (Privacy={node.privacy}, Tracking={node.tracking})")
+
+if __name__ == "__main__":
+    main()

iwa/tui/rpc.py

@@ -38,7 +38,7 @@ class RPCView(Static):
                 results.append((chain_name, "N/A", "Not Configured", "-"))
                 continue
 
-            rpc_url = interface.chain.rpc
+            rpc_url = interface.current_rpc
             if not rpc_url:
                 results.append((chain_name, "None", "Missing URL", "-"))
                 continue

iwa/tui/screens/wallets.py

@@ -381,7 +381,7 @@ class WalletsScreen(VerticalScroll):
         self.stop_monitor()
         addresses = [acc.address for acc in self.wallet.key_storage.accounts.values()]
         for chain_name, interface in ChainInterfaces().items():
-            if interface.chain.rpc:
+            if interface.current_rpc:
                 monitor = EventMonitor(addresses, self.monitor_callback, chain_name)
 
                 # Worker wrapper
@@ -497,7 +497,7 @@ class WalletsScreen(VerticalScroll):
         """Handle blockchain selection changes."""
         if event.value and event.value != self.active_chain:
             interface = ChainInterfaces().get(event.value)
-            if not interface or not interface.chain.rpc:
+            if not interface or not interface.current_rpc:
                 self.notify(f"No RPC for {event.value}", severity="warning")
                 event.control.value = self.active_chain
                 return

iwa/tui/tests/test_rpc.py

@@ -71,7 +71,7 @@ def test_check_rpcs_success(rpc_view, mock_chain_interfaces):
     """Test check_rpcs with successful connections."""
     # Setup mock chain interfaces
     mock_gnosis = MagicMock()
-    mock_gnosis.chain.rpc = "http://gnosis"
+    mock_gnosis.current_rpc = "http://gnosis"
     mock_gnosis.web3.is_connected.return_value = True
 
     mock_chain_interfaces.get.side_effect = lambda name: mock_gnosis if name == "gnosis" else None
@@ -99,7 +99,7 @@ def test_check_rpcs_success(rpc_view, mock_chain_interfaces):
 def test_check_rpcs_error(rpc_view, mock_chain_interfaces):
     """Test check_rpcs with connection error."""
     mock_eth = MagicMock()
-    mock_eth.chain.rpc = "http://eth"
+    mock_eth.current_rpc = "http://eth"
     mock_eth.web3.is_connected.side_effect = Exception("Connection fail")
 
     mock_chain_interfaces.get.side_effect = lambda name: mock_eth if name == "ethereum" else None

iwa/tui/widgets/base.py

@@ -39,7 +39,7 @@ class ChainSelector(Horizontal):
 
         for name in chain_names:
             interface = ChainInterfaces().get(name)
-            if interface.chain.rpc:
+            if interface.current_rpc:
                 label = name.title()
                 chain_options.append((label, name))
             else:

iwa/web/routers/olas/staking.py

@@ -105,16 +105,21 @@ 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.core.contracts.cache import ContractCache
     from iwa.plugins.olas.contracts.staking import StakingContract
 
     try:
-        contract = StakingContract(address, chain_name=interface.chain.name)
+        # Use ContractCache to benefit from shared instances and property caching
+        contract = ContractCache().get_contract(
+            StakingContract, address, chain_name=interface.chain.name
+        )
 
         # StakingContract uses .call() which handles with_retry and rotation
+        # Use properties instead of .call() to leverage caching
         service_ids = contract.call("getServiceIds")
-        max_services = contract.call("maxNumServices")
-        min_deposit = contract.call("minStakingDeposit")
-        staking_token = contract.call("stakingToken")
+        max_services = contract.max_num_services
+        min_deposit = contract.min_staking_deposit
+        staking_token = contract.staking_token_address
         used = len(service_ids)
 
         return {

{iwa-0.0.19.dist-info → iwa-0.0.21.dist-info}/METADATA

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