iwa 0.0.33__py3-none-any.whl → 0.0.59__py3-none-any.whl

iwa/plugins/olas/tests/test_olas_view.py

@@ -147,21 +147,25 @@ async def test_olas_view_actions(mock_wallet, mock_olas_config):
 
             app = OlasTestApp(mock_wallet)
             async with app.run_test() as pilot:
-                await pilot.pause()
+                # Wait for initial load to finish
+                await pilot.pause(0.5)
 
                 # 1. Test Claim
                 with patch.object(OlasView, "claim_rewards") as mock_claim:
                     await pilot.click("#claim-gnosis_1")
+                    await pilot.pause()
                     mock_claim.assert_called_with("gnosis:1")
 
                 # 2. Test Unstake
                 with patch.object(OlasView, "unstake_service") as mock_unstake:
                     await pilot.click("#unstake-gnosis_1")
+                    await pilot.pause()
                     mock_unstake.assert_called_with("gnosis:1")
 
                 # 3. Test Checkpoint
                 with patch.object(OlasView, "checkpoint_service") as mock_checkpoint:
                     await pilot.click("#checkpoint-gnosis_1")
+                    await pilot.pause()
                     mock_checkpoint.assert_called_with("gnosis:1")
 
 

iwa/plugins/olas/tests/test_service_manager.py

@@ -65,11 +65,11 @@ def mock_wallet():
     wallet.master_account.address = "0x1234567890123456789012345678901234567890"
     wallet.key_storage = MagicMock()
     wallet.key_storage.get_account.return_value = None  # Default
-    # Mock create_account which returns a StoredAccount or similar
+    # Mock generate_new_account which returns a StoredAccount or similar
     new_acc = MagicMock()
     new_acc.address = "0x0987654321098765432109876543210987654321"
-    wallet.key_storage.create_account.return_value = new_acc
-    wallet.key_storage.create_account.return_value = new_acc
+    wallet.key_storage.generate_new_account.return_value = new_acc
+    wallet.key_storage.generate_new_account.return_value = new_acc
     # Mock account_service
     wallet.account_service = MagicMock()
     wallet.account_service.get_tag_by_address.return_value = "mock_tag"
@@ -104,8 +104,6 @@ def mock_chain_interfaces():
         yield mock
 
 
-
-
 @pytest.fixture
 def service_manager(
     mock_config,
@@ -113,13 +111,14 @@ def service_manager(
     mock_registry,
     mock_manager_contract,
     mock_chain_interfaces,
-
     mock_olas_config,
     mock_service,
 ):
     """ServiceManager fixture with mocked dependencies."""
-    with patch("iwa.plugins.olas.service_manager.base.Config") as local_mock_config, \
-         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache:
+    with (
+        patch("iwa.plugins.olas.service_manager.base.Config") as local_mock_config,
+        patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache,
+    ):
         instance = local_mock_config.return_value
         instance.plugins = {"olas": mock_olas_config}
         instance.save_config = MagicMock()
@@ -136,7 +135,6 @@ def service_manager(
         yield sm
 
 
-
 def test_init(service_manager):
     """Test initialization."""
     assert service_manager.registry is not None
@@ -179,9 +177,7 @@ def test_create_no_event(service_manager, mock_wallet):
     mock_wallet.sign_and_send_transaction.return_value = (True, {})
     service_manager.registry.extract_events.return_value = []
 
-    res = service_manager.create(
-        token_address_or_tag="0x1111111111111111111111111111111111111111"
-    )
+    res = service_manager.create(token_address_or_tag="0x1111111111111111111111111111111111111111")
     # create() finds no ID, logs error, returns None for service_id.
     assert res is None
 
@@ -219,7 +215,7 @@ def test_register_agent_success(service_manager, mock_wallet):
         "security_deposit": 50000000000000000000,
     }
 
-    # create_account is already mocked
+    # generate_new_account is already mocked
     mock_wallet.send.return_value = "0xMockTxHash"  # wallet.send returns tx_hash
     mock_wallet.sign_and_send_transaction.return_value = (True, {})
     service_manager.registry.extract_events.return_value = [{"name": "RegisterInstance"}]
@@ -331,7 +327,7 @@ def test_register_agent_with_existing_address(service_manager, mock_wallet):
     assert service_manager.register_agent(agent_address=existing_agent) is True
     assert service_manager.service.agent_address == TEST_EXISTING_AGENT_ADDR
     # Should NOT create a new account
-    mock_wallet.key_storage.create_account.assert_not_called()
+    mock_wallet.key_storage.generate_new_account.assert_not_called()
     # Should NOT fund the agent (only for new accounts)
     mock_wallet.send.assert_not_called()
 
@@ -349,7 +345,7 @@ def test_register_agent_creates_new_if_none(service_manager, mock_wallet):
 
     assert service_manager.register_agent() is True
     # Should create a new account
-    mock_wallet.key_storage.create_account.assert_called()
+    mock_wallet.key_storage.generate_new_account.assert_called()
     # Should fund the new agent
     mock_wallet.send.assert_called()
 
@@ -661,7 +657,7 @@ def test_spin_up_with_existing_agent(service_manager, mock_wallet):
     existing_agent = TEST_EXISTING_AGENT_ADDR
     assert service_manager.spin_up(agent_address=existing_agent) is True
     # Verify agent address was not newly created
-    mock_wallet.key_storage.create_account.assert_not_called()
+    mock_wallet.key_storage.generate_new_account.assert_not_called()
 
 
 # --- Tests for wind_down ---
@@ -911,7 +907,9 @@ def test_activate_registration_token_service_sends_security_deposit_as_value(
 
     # Mock balance check to pass
     mock_wallet.balance_service = MagicMock()
-    mock_wallet.balance_service.get_erc20_balance_wei.return_value = 100 * 10**18  # Plenty of balance
+    mock_wallet.balance_service.get_erc20_balance_wei.return_value = (
+        100 * 10**18
+    )  # Plenty of balance
 
     # Mock allowance to pass check (return an int)
     mock_wallet.transfer_service.get_erc20_allowance.return_value = 10**20  # Plenty of allowance

iwa/plugins/olas/tests/test_service_manager_errors.py

@@ -18,7 +18,7 @@ def mock_wallet():
     wallet.master_account.address = VALID_ADDR
     wallet.chain_interface.chain_name = "gnosis"
     wallet.sign_and_send_transaction.return_value = (True, {"transactionHash": b"\x00" * 32})
-    wallet.key_storage.create_account.return_value.address = VALID_ADDR
+    wallet.key_storage.generate_new_account.return_value.address = VALID_ADDR
     wallet.key_storage.get_account.return_value.address = VALID_ADDR
     return wallet
 
@@ -26,10 +26,11 @@ def 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, \
-         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
-         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
-
+    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

iwa/plugins/olas/tests/test_service_manager_flows.py

@@ -17,7 +17,7 @@ def mock_wallet():
     wallet.key_storage.get_account.return_value.address = (
         "0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
     )
-    wallet.key_storage.create_account.return_value.address = (
+    wallet.key_storage.generate_new_account.return_value.address = (
         "0xBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB"
     )
     wallet.sign_and_send_transaction.return_value = (True, {"status": 1})
@@ -237,7 +237,9 @@ def test_activate_registration(
 @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_register_agent(mock_cache, mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet):
+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
@@ -354,7 +356,9 @@ def test_deploy(mock_cache, mock_sm_contract, mock_registry_contract, mock_confi
 @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_terminate(mock_cache, mock_sm_contract, mock_registry_contract, mock_config_cls, mock_wallet):
+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
@@ -457,7 +461,6 @@ def test_stake(mock_cache, mock_sm_contract, mock_registry_contract, mock_config
         "required_agent_bond": 50000000000000000000,
     }
 
-
     success = manager.stake(mock_staking)
     assert success is True
     assert manager.service.staking_contract_address == "0xDDdDddDdDdddDDddDDddDDDDdDdDDdDDdDDDDDDd"
@@ -480,8 +483,6 @@ def test_stake(mock_cache, mock_sm_contract, mock_registry_contract, mock_config
     assert manager.stake(mock_staking) is False
     mock_staking.get_service_ids.return_value = []
 
-
-
     # 4. Approve fail
     mock_wallet.sign_and_send_transaction.return_value = (False, {})
     assert manager.stake(mock_staking) is False

iwa/plugins/olas/tests/test_service_manager_rewards.py

@@ -197,7 +197,11 @@ def test_withdraw_rewards_no_withdrawal_address(mock_wallet):
     )
     manager.olas_config.withdrawal_address = None
 
-    success, amount = manager.withdraw_rewards()
+    with patch("iwa.plugins.olas.service_manager.drain.ERC20Contract") as mock_erc20_cls:
+        mock_erc20 = mock_erc20_cls.return_value
+        mock_erc20.balance_of_wei.return_value = 0
+
+        success, amount = manager.withdraw_rewards()
 
     assert success is False
     assert amount == 0

iwa/plugins/olas/tests/test_service_staking.py

@@ -33,9 +33,11 @@ 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"), \
-         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
-         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+    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(
@@ -51,9 +53,11 @@ 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"), \
-         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
-         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+    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(
@@ -77,9 +81,11 @@ 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"), \
-         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
-         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+    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(
@@ -97,9 +103,11 @@ 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"), \
-         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
-         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+    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(
@@ -142,9 +150,11 @@ 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"), \
-         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
-         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+    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
@@ -156,9 +166,11 @@ 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"), \
-         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
-         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+    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(
@@ -171,9 +183,11 @@ 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"), \
-         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
-         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+    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(
@@ -199,9 +213,11 @@ def test_sm_claim_rewards_tx_fails(mock_wallet):
 
         mock_wallet.sign_and_send_transaction.return_value = (False, None)
 
-        with patch("iwa.plugins.olas.service_manager.drain.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) ===
@@ -209,9 +225,11 @@ 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"), \
-         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
-         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+    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,9 +251,11 @@ 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"), \
-         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
-         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+    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)
@@ -253,9 +273,11 @@ 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"), \
-         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
-         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+    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)
@@ -273,9 +295,11 @@ 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"), \
-         patch("iwa.plugins.olas.service_manager.base.ContractCache") as mock_cache, \
-         patch("iwa.plugins.olas.service_manager.staking.ContractCache", mock_cache):
+    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)
@@ -293,8 +317,10 @@ 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"), \
-         patch("iwa.plugins.olas.service_manager.base.ContractCache"):
+    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/tools/drain_accounts.py

@@ -0,0 +1,61 @@
+"""Tool to drain specific accounts to a master address."""
+
+import argparse
+import sys
+from pathlib import Path
+
+from dotenv import load_dotenv
+
+# Ensure src is in pythonpath
+sys.path.append(str(Path(__file__).resolve().parents[2]))
+
+from loguru import logger
+
+from iwa.core.constants import SECRETS_PATH
+from iwa.core.wallet import Wallet
+
+
+def main() -> None:
+    """Run the account draining tool."""
+    parser = argparse.ArgumentParser(description="Drain specific accounts to master.")
+    parser.add_argument(
+        "tags",
+        nargs="+",
+        help="List of account tags to drain (or 'all' for all configured accounts)",
+    )
+    parser.add_argument(
+        "--chain",
+        "-c",
+        default="gnosis",
+        help="Target chain (default: gnosis)",
+    )
+    args = parser.parse_args()
+
+    # Load secrets
+    if SECRETS_PATH.exists():
+        load_dotenv(SECRETS_PATH, override=True)
+
+    wallet = Wallet()
+
+    tags = args.tags
+    if "all" in tags:
+        # Get all configured accounts except master
+        all_accounts = wallet.account_service.get_account_data()
+        tags = [acc.tag for acc in all_accounts.values() if acc.tag != "master"]
+        logger.info(f"Draining ALL accounts: {tags}")
+
+    for tag in tags:
+        logger.info(f"Processing drain for account: {tag}")
+        try:
+            tx_hash = wallet.drain(from_address_or_tag=tag, chain_name=args.chain)
+            if tx_hash:
+                logger.success(f"Drain tx sent for {tag}: {tx_hash}")
+                # Optional: link to explorer
+            else:
+                logger.warning(f"Drain failed or nothing to drain for {tag}")
+        except Exception:
+            logger.exception(f"Error draining {tag}")
+
+
+if __name__ == "__main__":
+    main()

iwa/tools/list_contracts.py

@@ -101,6 +101,7 @@ def print_table(console, contract_data, chain_name, sort_criterion):
     table.add_column("Available Rewards", justify="right", style="yellow")
     table.add_column("Contract Balance", justify="right", style="blue")
     table.add_column("Epoch End (UTC)", justify="right", style="white")
+    table.add_column("Epoch End (Local)", justify="right", style="white")
 
     for item in contract_data:
         if item.get("error"):
@@ -113,6 +114,7 @@ def print_table(console, contract_data, chain_name, sort_criterion):
                 f"{item['rewards_olas']:,.2f} OLAS",
                 f"{item['balance_olas']:,.2f} OLAS",
                 item["epoch_end"].strftime("%Y-%m-%d %H:%M:%S"),
+                item["epoch_end"].astimezone().strftime("%Y-%m-%d %H:%M:%S"),
             )
     console.print(table)
 

iwa/tools/reset_env.py

@@ -25,6 +25,7 @@ def _reset_tenderly(profile: int) -> None:
         env = {"PYTHONPATH": "src"}
         # Merge with current env to keep PATH etc.
         import os
+
         full_env = os.environ.copy()
         full_env.update(env)
 
@@ -110,7 +111,7 @@ def main():
     parser.add_argument(
         "--keep-data",
         action="store_true",
-        help="Reset only Tenderly, keeping config.yaml and wallet.json intact."
+        help="Reset only Tenderly, keeping config.yaml and wallet.json intact.",
     )
     args = parser.parse_args()
 

iwa/tools/test_chainlist.py

@@ -1,4 +1,5 @@
 """Script to verify ChainlistRPC functionality."""
+
 from iwa.core.chainlist import ChainlistRPC
 
 
@@ -32,7 +33,10 @@ def main() -> None:
 
     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})")
+        print(
+            f"  - {node.url}: Tracking={node.is_tracking} (Privacy={node.privacy}, Tracking={node.tracking})"
+        )
+
 
 if __name__ == "__main__":
     main()

iwa/tui/screens/wallets.py

@@ -330,9 +330,7 @@ class WalletsScreen(VerticalScroll):
 
     def _fetch_single_token_balance(self, address: str, token: str, chain_name: str) -> str:
         """Fetch a single token balance using BalanceService."""
-        val_token = self.wallet.balance_service.get_erc20_balance_with_retry(
-            address, token, chain_name
-        )
+        val_token = self.wallet.balance_service.get_erc20_balance_eth(address, token, chain_name)
         val_token_str = f"{val_token:.4f}" if val_token is not None else "-"
 
         if val_token is not None:
@@ -442,7 +440,7 @@ class WalletsScreen(VerticalScroll):
             def handler(tag):
                 if tag is not None:
                     tag = tag or f"Account {len(self.wallet.key_storage.accounts) + 1}"
-                    self.wallet.key_storage.create_account(tag)
+                    self.wallet.key_storage.generate_new_account(tag)
                     self.notify(f"Created new EOA: {escape(tag)}")
                     self.refresh_accounts()
 

iwa/web/routers/accounts.py

@@ -68,7 +68,7 @@ def get_accounts(
 def create_eoa(request: Request, req: AccountCreateRequest, auth: bool = Depends(verify_auth)):
     """Create a new EOA account with the given tag."""
     try:
-        wallet.key_storage.create_account(req.tag)
+        wallet.key_storage.generate_new_account(req.tag)
         return {"status": "success"}
     except Exception as e:
         raise HTTPException(status_code=400, detail=str(e)) from None

iwa/web/routers/olas/services.py

@@ -41,7 +41,9 @@ def _determine_bond_amount(req: CreateServiceRequest) -> int:
 
     if req.token_address and req.staking_contract:
         # If a contract is specified, we MUST use its requirements
-        staking_name = wallet.account_service.get_tag_by_address(req.staking_contract) or req.staking_contract
+        staking_name = (
+            wallet.account_service.get_tag_by_address(req.staking_contract) or req.staking_contract
+        )
         logger.info(f"Fetching requirements from {staking_name}...")
         staking_contract = StakingContract(req.staking_contract, req.chain)
         reqs = staking_contract.get_requirements()
@@ -73,6 +75,7 @@ def _determine_bond_amount(req: CreateServiceRequest) -> int:
                     )
     return bond_amount
 
+
 @router.post(
     "/create",
     summary="Create Service",
@@ -81,7 +84,6 @@ def _determine_bond_amount(req: CreateServiceRequest) -> int:
 def create_service(req: CreateServiceRequest, auth: bool = Depends(verify_auth)):
     """Create a new Olas service using spin_up for seamless deployment."""
     try:
-
         from iwa.plugins.olas.contracts.staking import StakingContract
         from iwa.plugins.olas.service_manager import ServiceManager
 
@@ -196,7 +198,9 @@ def deploy_service(
         if staking_contract:
             try:
                 staking_obj = StakingContract(staking_contract, service.chain_name)
-                staking_name = wallet.account_service.get_tag_by_address(staking_contract) or staking_contract
+                staking_name = (
+                    wallet.account_service.get_tag_by_address(staking_contract) or staking_contract
+                )
                 logger.info(f"Will stake in {staking_name} after deployment")
             except Exception as e:
                 logger.warning(f"Could not set up staking contract: {e}")
@@ -230,7 +234,6 @@ def deploy_service(
         raise HTTPException(status_code=400, detail=str(e)) from None
 
 
-
 def _resolve_service_accounts(service) -> dict:
     """Resolve basic accounts info including owner_signer if applicable."""
     accounts = {}
@@ -279,7 +282,9 @@ def _resolve_service_balances(service, chain: str) -> dict:
             if role == "owner" and stored and hasattr(stored, "signers") and stored.signers:
                 signer_addr = stored.signers[0]
                 s_native = wallet.get_native_balance_eth(signer_addr, chain)
-                s_olas_wei = wallet.balance_service.get_erc20_balance_wei(signer_addr, "OLAS", chain)
+                s_olas_wei = wallet.balance_service.get_erc20_balance_wei(
+                    signer_addr, "OLAS", chain
+                )
                 s_olas = float(s_olas_wei) / 1e18 if s_olas_wei else 0
                 s_stored = wallet.key_storage.find_stored_account(signer_addr)
                 balances["owner_signer"] = {