ipor-fusion 4.0.0.dev108__tar.gz → 4.0.0.dev110__tar.gz

{ipor_fusion-4.0.0.dev108 → ipor_fusion-4.0.0.dev110}/AGENTS.md

@@ -158,7 +158,7 @@ the lifecycle matrix follows that.
   subpackage (`core`, `config`, `fuses`, `readers`, `crosschain`,
   `crosschain.fuses`, `crosschain.ccip`, `crosschain.stargate`) also goes in that
   subpackage's `__all__`. `ipor_fusion.guide` keeps its own namespace. The
-  public modules (`about`, `chains`, `dependency_graph`, `errors`, `explorer`,
+  public modules (`about`, `cache`, `chains`, `dependency_graph`, `errors`, `explorer`,
   `field_docs`, `market_ids`, `market_info`, `morpho_api`, `substrates`, `types`,
   `validation`, `vault_data`, `vault_info`) stay importable for the names they
   define; `cli`, `mcp` and every other module are internal. Examples, the guide

{ipor_fusion-4.0.0.dev108 → ipor_fusion-4.0.0.dev110}/MIGRATION_4.md

@@ -351,8 +351,12 @@ Contract names, token symbols and decimals and deployment blocks are cached in a
   (`fetch_vault_data(metadata=True)`) and `fetch_deployment_info` use `ctx.cache`.
   `get_contract_name(chain_id, address, api_key=None, *, cache=None)` takes the cache
   explicitly (default: the file cache); pass `cache=ctx.cache` to share the
-  context's policy. `build_vault_info_json` without `resolve_name` still names
-  contracts from the default file cache; pass `resolve_name` to avoid it.
+  context's policy. The CLI's text and JSON output name contracts through the
+  context's cache.
+- `build_vault_info_json(data)` without `resolve_name` names no contract (every
+  `contract` is `"?"`) instead of reading names from the on-disk cache; pass
+  `resolve_name=partial(get_contract_name, chain_id, api_key=..., cache=ctx.cache)`
+  for the CLI's document.
 - `ipor_fusion.cache` is a public module now and exports `ContractCache`,
   `FileContractCache`, `NullCache`, `CacheKey`, `CacheField`, `cache_key` and
   `default_contract_cache` (also from `ipor_fusion`). Its 3.x functions and constants
@@ -384,7 +388,8 @@ Etherscan key) and the old file can be deleted.
 - A cache never fails a read: a corrupt or unreadable file reads as empty (logged
   warning from `ipor_fusion.cache`) and is rewritten by the next write; an unwritable
   directory (read-only file system) keeps the entries in memory for the process; a
-  custom cache that raises is treated as a miss.
+  custom cache that raises is treated as a miss, and so is a stored number that does
+  not parse.
 - `fetch_deployment_info` returns `rpc-fetch-failed` only when the creation
   transaction or its block cannot be read; a cache failure is no longer reported as
   one (the deployment block is returned).

{ipor_fusion-4.0.0.dev108 → ipor_fusion-4.0.0.dev110}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ipor-fusion
-Version: 4.0.0.dev108
+Version: 4.0.0.dev110
 Summary: The IPOR Fusion SDK for Python
 Project-URL: homepage, https://ipor.io
 Project-URL: repository, https://github.com/IPOR-Labs/ipor-fusion.py

{ipor_fusion-4.0.0.dev108 → ipor_fusion-4.0.0.dev110}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ipor-fusion"
-version = "4.0.0.dev108"
+version = "4.0.0.dev110"
 description = "The IPOR Fusion SDK for Python"
 authors = [
     { name = "Adam Mydlarz", email = "amydlarz@gmail.com" },

{ipor_fusion-4.0.0.dev108 → ipor_fusion-4.0.0.dev110}/src/ipor_fusion/cli/vault_info_view.py

@@ -85,13 +85,11 @@ def _print_vault_info(
         data.deployment_error,
     ) = fetch_deployment_info(ctx, data.vault, api_key=api_key)
 
+    resolve_name = partial(
+        get_contract_name, chain_id, api_key=api_key, cache=ctx.cache
+    )
     if json_output:
-        result = build_vault_info_json(
-            data,
-            resolve_name=partial(
-                get_contract_name, chain_id, api_key=api_key, cache=ctx.cache
-            ),
-        )
+        result = build_vault_info_json(data, resolve_name=resolve_name)
         click.echo(json.dumps(result, indent=2))
         return
 
@@ -105,7 +103,7 @@ def _print_vault_info(
 
     _print_role_accounts(_role_accounts_json(data))
 
-    _print_markets(data, api_key)
+    _print_markets(data, resolve_name)
 
     validation = validate_vault_state(data)
     click.echo("ERC20 Balances (vault holdings):")

{ipor_fusion-4.0.0.dev108 → ipor_fusion-4.0.0.dev110}/src/ipor_fusion/cli/vault_markets_view.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from concurrent.futures import Future, ThreadPoolExecutor
 from typing import Any
 
@@ -13,12 +13,11 @@ from ipor_fusion.cli.vault_rendering import (
     _print_table,
     _substrate_details,
 )
-from ipor_fusion.explorer import get_contract_name
 from ipor_fusion.substrates import (
     decode_substrate,
     format_market_label,
 )
-from ipor_fusion.types import ChainId, FuseAddress, MarketId, parse_hex_address
+from ipor_fusion.types import FuseAddress, MarketId, parse_hex_address
 from ipor_fusion.vault_data import (
     GET_MARKET_SUBSTRATES,
     VaultData,
@@ -27,6 +26,10 @@ from ipor_fusion.vault_info import (
     _CAPABILITY_BALANCE_FUSES,
 )
 
+# Address to contract name, "" when unknown (`get_contract_name` bound to the
+# chain, API key and the context's cache).
+NameResolver = Callable[[HexAddress], str]
+
 
 def _print_lending_health(data: VaultData) -> None:  # noqa: C901
     lh = data.lending_health
@@ -154,16 +157,14 @@ def _print_health_lines(market: Any, indent: str) -> None:
     click.secho(f"{indent}Status:        {status}", fg=color, bold=bold)
 
 
-def _print_markets(data: VaultData, api_key: str | None) -> None:
+def _print_markets(data: VaultData, resolve_name: NameResolver) -> None:
     """Fuses, balance fuses, dependency graph and substrates."""
-    chain_id = data.chain_id
     _print_fuse_section(
         "Fuses",
         data.fuses,
         data.fuse_markets,
         data.market_substrates,
-        chain_id,
-        api_key,
+        resolve_name,
     )
     click.echo()
 
@@ -172,18 +173,17 @@ def _print_markets(data: VaultData, api_key: str | None) -> None:
         data.instant_fuses,
         data.fuse_markets,
         data.market_substrates,
-        chain_id,
-        api_key,
+        resolve_name,
     )
     click.echo()
 
-    _print_balance_fuses_table(data, api_key)
+    _print_balance_fuses_table(data, resolve_name)
     click.echo()
 
     _print_dependency_graph(data)
 
     click.echo("Substrates per Market:")
-    _print_market_substrates(data, api_key)
+    _print_market_substrates(data, resolve_name)
     click.echo()
 
 
@@ -235,8 +235,7 @@ def _print_fuse_section(
     fuses: Sequence[FuseAddress],
     fuse_markets: dict[FuseAddress, MarketId] | None,
     market_substrates: dict[MarketId, list[bytes]] | None,
-    chain_id: ChainId,
-    api_key: str | None,
+    resolve_name: NameResolver,
 ) -> None:
     """Render a fuse section (regular or instant-withdrawal) with a unified
     layout.
@@ -262,10 +261,7 @@ def _print_fuse_section(
         return
 
     with ThreadPoolExecutor() as pool:
-        name_futs = {
-            addr: pool.submit(get_contract_name, chain_id, addr, api_key)
-            for addr in counts
-        }
+        name_futs = {addr: pool.submit(resolve_name, addr) for addr in counts}
         rows: list[tuple[str, ...]] = []
         for idx, addr in enumerate(counts, 1):
             market_label = "?"
@@ -285,7 +281,7 @@ def _print_fuse_section(
     _print_table(("#", "Address", "Contract", "Market", "Substrates"), rows)
 
 
-def _print_balance_fuses_table(data: VaultData, api_key: str | None) -> None:
+def _print_balance_fuses_table(data: VaultData, resolve_name: NameResolver) -> None:
     balance_fuses = data.balance_fuses
     decimals = data.asset_decimals
     asset_symbol = data.asset_symbol
@@ -294,9 +290,7 @@ def _print_balance_fuses_table(data: VaultData, api_key: str | None) -> None:
         futures: list[tuple[int, MarketId, str, Future]] = []
         for idx, balance_fuse in enumerate(balance_fuses, 1):
             market_id_str = format_market_label(balance_fuse.market_id)
-            f_contract = pool.submit(
-                get_contract_name, data.chain_id, balance_fuse.fuse, api_key
-            )
+            f_contract = pool.submit(resolve_name, balance_fuse.fuse)
             futures.append((idx, balance_fuse.market_id, market_id_str, f_contract))
 
         venue_rows: list[tuple[str, ...]] = []
@@ -328,18 +322,18 @@ def _print_balance_fuses_table(data: VaultData, api_key: str | None) -> None:
         _print_table(header, [(str(i), *row) for i, row in enumerate(zero_rows, 1)])
 
 
-def _print_market_substrates(data: VaultData, api_key: str | None) -> set[str]:
+def _print_market_substrates(data: VaultData, resolve_name: NameResolver) -> set[str]:
     if GET_MARKET_SUBSTRATES in data.unimplemented_getters:
         click.secho(
             f"  (unavailable: the vault predates {GET_MARKET_SUBSTRATES})",
             fg="yellow",
         )
         return set()
-    return _print_substrates(data, api_key)
+    return _print_substrates(data, resolve_name)
 
 
 def _print_substrates(  # noqa: C901
-    data: VaultData, api_key: str | None
+    data: VaultData, resolve_name: NameResolver
 ) -> set[str]:
     substrates_by_market = data.market_substrates or {}
     balance_fuses = data.balance_fuses
@@ -364,8 +358,7 @@ def _print_substrates(  # noqa: C901
     resolved_symbols = data.token_symbols
     with ThreadPoolExecutor() as pool:
         contract_futs = {
-            addr: pool.submit(get_contract_name, data.chain_id, addr, api_key)
-            for addr in all_addresses
+            addr: pool.submit(resolve_name, addr) for addr in all_addresses
         }
         resolved_contracts = {addr: fut.result() for addr, fut in contract_futs.items()}
 

{ipor_fusion-4.0.0.dev108 → ipor_fusion-4.0.0.dev110}/src/ipor_fusion/vault_data.py

@@ -252,9 +252,16 @@ def resolve_token_symbol(ctx: Web3Context, address: HexAddress) -> str:
     return symbol
 
 
-def _cached_decimals(cached: dict[CacheKey, str], key: CacheKey) -> int | None:
-    value = cached.get(key)
-    return int(value) if value is not None and value.isdigit() else None
+def _cached_int(cached: dict[CacheKey, str], key: CacheKey) -> int | None:
+    """A cached non-negative integer; anything else (a corrupt or foreign
+    entry) is a miss."""
+    value = cached.get(key, "")
+    if not (value.isascii() and value.isdigit()):
+        return None
+    try:
+        return int(value)
+    except ValueError:  # beyond the int-string conversion limit
+        return None
 
 
 def resolve_token_decimals(ctx: Web3Context, address: HexAddress) -> int | None:
@@ -262,7 +269,7 @@ def resolve_token_decimals(ctx: Web3Context, address: HexAddress) -> int | None:
     (not cached) when ``address`` has no code at the context's block or does
     not answer."""
     key = cache_key(ctx.chain_id, address, "decimals")
-    if (cached := _cached_decimals(cache_get(ctx.cache, [key]), key)) is not None:
+    if (cached := _cached_int(cache_get(ctx.cache, [key]), key)) is not None:
         return cached
 
     checksum = Web3.to_checksum_address(address)
@@ -696,7 +703,7 @@ def _token_metadata(
     decimals: dict[HexAddress, int | None] = {
         a: value
         for a, k in decimals_keys.items()
-        if (value := _cached_decimals(cached, k)) is not None
+        if (value := _cached_int(cached, k)) is not None
     }
     missing_symbols = sorted((breakdown | substrate_addresses) - symbols.keys())
     missing_decimals = sorted(breakdown - decimals.keys())
@@ -771,10 +778,10 @@ def fetch_deployment_info(
     block_key = cache_key(chain_id, vault_address, "deployment_block")
     time_key = cache_key(chain_id, vault_address, "deployment_timestamp")
     cached = cache_get(ctx.cache, [block_key, time_key])
-    if (block := cached.get(block_key, "")).isdigit() and (
-        stamp := cached.get(time_key, "")
-    ).isdigit():
-        return int(block), int(stamp), None
+    block = _cached_int(cached, block_key)
+    stamp = _cached_int(cached, time_key)
+    if block is not None and stamp is not None:
+        return block, stamp, None
 
     tx_hash, error = get_deployment_tx(chain_id, vault_address, api_key)
     if not tx_hash:

{ipor_fusion-4.0.0.dev108 → ipor_fusion-4.0.0.dev110}/src/ipor_fusion/vault_info.py

@@ -6,7 +6,6 @@ from __future__ import annotations
 from collections.abc import Callable
 from concurrent.futures import Future, ThreadPoolExecutor
 from datetime import UTC, datetime
-from functools import partial
 from typing import Any
 
 from eth_typing import HexAddress
@@ -14,7 +13,6 @@ from eth_typing import HexAddress
 from ipor_fusion.chains import CHAIN_NAMES
 from ipor_fusion.core.fee_manager import HighWaterMarkPerformanceFee, RecipientFee
 from ipor_fusion.core.plasma_vault import BalanceFuse
-from ipor_fusion.explorer import get_contract_name
 from ipor_fusion.field_docs import DOCS
 from ipor_fusion.readers.aave_v3 import AaveV3PositionBreakdown
 from ipor_fusion.readers.hypercore import HyperCorePendingState, HyperCorePerpLeg
@@ -705,6 +703,10 @@ def _markets_json(
     return markets
 
 
+def _no_name(_address: HexAddress) -> str:
+    return ""
+
+
 def build_vault_info_json(
     data: VaultData,
     *,
@@ -716,14 +718,14 @@ def build_vault_info_json(
     ``data`` comes from `fetch_vault_data` (with ``metadata=True`` for token
     symbols); set its ``deployment_*`` fields first (`fetch_deployment_info`)
     for the ``deployment`` block. ``resolve_name`` names the fuses and
-    substrate contracts (address to contract name, ``""`` when unknown); the
-    default reads `ipor_fusion.explorer.get_contract_name` without an API key,
-    so only names already in the on-disk cache.
+    substrate contracts (address to contract name, ``""`` when unknown), for
+    example `ipor_fusion.explorer.get_contract_name` bound to the chain, an
+    API key and ``ctx.cache``; without it no contract is named.
     """
     chain_id = data.chain_id
     chain_label = CHAIN_NAMES.get(chain_id, str(chain_id))
     if resolve_name is None:
-        resolve_name = partial(get_contract_name, chain_id)
+        resolve_name = _no_name
 
     markets = _markets_json(data, resolve_name)
     validation = validate_vault_state(data)

{ipor_fusion-4.0.0.dev108 → ipor_fusion-4.0.0.dev110}/tests/test_cache.py

@@ -1,6 +1,7 @@
 import json
 import logging
 import os
+import threading
 from pathlib import Path
 from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
@@ -128,6 +129,30 @@ class TestFileContractCache:
         key = cache_key(BASE, LOWER, "name")
         assert cache.get([key]) == {key: "Other"}
 
+    def test_concurrent_writers_never_tear_the_file(self, path):
+        writers = [FileContractCache(path) for _ in range(4)]
+        barrier = threading.Barrier(len(writers))
+
+        def write(index: int) -> None:
+            barrier.wait()
+            for n in range(25):
+                address = f"0x{index:02x}{n:038x}"
+                writers[index].put({cache_key(ETHEREUM, address, "name"): str(n)})
+
+        threads = [threading.Thread(target=write, args=(i,)) for i in range(4)]
+        for thread in threads:
+            thread.start()
+        for thread in threads:
+            thread.join()
+        on_disk = _on_disk(path)
+        assert on_disk
+        assert all(key.endswith(":name") for key in on_disk)
+        assert sorted(p.name for p in path.parent.iterdir()) == [path.name]
+        # Each writer still serves every entry it wrote, persisted or not.
+        for index, writer in enumerate(writers):
+            key = cache_key(ETHEREUM, f"0x{index:02x}{24:038x}", "name")
+            assert writer.get([key]) == {key: "24"}
+
     @pytest.mark.skipif(os.geteuid() == 0, reason="root ignores permissions")
     def test_a_read_only_directory_degrades_to_memory(self, path, caplog):
         path.parent.mkdir(parents=True)
@@ -229,6 +254,13 @@ class TestTokenResolvers:
         ctx.web3.eth.get_code.assert_not_called()
         assert _on_disk(path) == {f"1:{LOWER}:decimals": "6"}
 
+    @pytest.mark.parametrize("value", ["\u00b2", "9" * 5000, "-1", " 6"])
+    @patch("ipor_fusion.vault_data.ERC20")
+    def test_a_corrupt_decimals_entry_is_a_miss(self, erc20, path, value):
+        _write(path, {f"1:{LOWER}:decimals": value})
+        erc20.return_value.decimals.return_value.call.return_value = 6
+        assert resolve_token_decimals(_ctx(FileContractCache(path)), CHECKSUM) == 6
+
     def test_token_metadata_reads_and_fills_the_contexts_cache(self, path):
         cache = FileContractCache(path)
         cache.put({cache_key(ETHEREUM, LOWER, "symbol"): "MAINNET"})
@@ -307,6 +339,20 @@ class TestFetchDeploymentInfo:
         ctx = _deployment_ctx(FileContractCache(path))
         assert fetch_deployment_info(ctx, VAULT) == (100, 1_700_000_000, None)
 
+    @pytest.mark.parametrize("value", ["\u00b2", "9" * 5000])
+    @patch("ipor_fusion.vault_data.get_deployment_tx", return_value=(TX, None))
+    def test_a_corrupt_deployment_entry_is_a_miss(self, get_tx, path, value):
+        _write(
+            path,
+            {
+                f"1:{LOWER}:deployment_block": value,
+                f"1:{LOWER}:deployment_timestamp": "5",
+            },
+        )
+        ctx = _deployment_ctx(FileContractCache(path))
+        assert fetch_deployment_info(ctx, VAULT) == (100, 1_700_000_000, None)
+        get_tx.assert_called_once()
+
     @patch(
         "ipor_fusion.vault_data.get_deployment_tx",
         return_value=(None, "no-api-key"),

{ipor_fusion-4.0.0.dev108 → ipor_fusion-4.0.0.dev110}/tests/test_cli_commands.py

@@ -418,9 +418,7 @@ class TestVaultInfo:
             yield
 
     @patch("ipor_fusion.vault_managers.WithdrawManager")
-    @patch(
-        "ipor_fusion.cli.vault_markets_view.get_contract_name", return_value="SomeFuse"
-    )
+    @patch("ipor_fusion.cli.vault_info_view.get_contract_name", return_value="SomeFuse")
     @patch("ipor_fusion.vault_data.price_oracle_middleware")
     @patch("ipor_fusion.vault_data.ERC20")
     @patch("ipor_fusion.vault_data.PlasmaVault")
@@ -546,9 +544,7 @@ class TestVaultInfo:
         assert f"      {ADDR_FEE_RECIPIENT}  8.0000%" in result.output
         assert "accrued, uncollected: 5" in result.output
 
-    @patch(
-        "ipor_fusion.cli.vault_markets_view.get_contract_name", return_value="SomeFuse"
-    )
+    @patch("ipor_fusion.cli.vault_info_view.get_contract_name", return_value="SomeFuse")
     @patch("ipor_fusion.vault_data.price_oracle_middleware")
     @patch("ipor_fusion.vault_data.ERC20")
     @patch("ipor_fusion.vault_data.PlasmaVault")
@@ -624,9 +620,7 @@ class TestVaultInfo:
         assert "99999" in result.output
         assert mock_ctx.default_block == 99999
 
-    @patch(
-        "ipor_fusion.cli.vault_markets_view.get_contract_name", return_value="SomeFuse"
-    )
+    @patch("ipor_fusion.cli.vault_info_view.get_contract_name", return_value="SomeFuse")
     @patch("ipor_fusion.vault_data.price_oracle_middleware")
     @patch("ipor_fusion.vault_data.ERC20")
     @patch("ipor_fusion.vault_data.PlasmaVault")
@@ -690,9 +684,7 @@ class TestVaultInfo:
         assert result.exit_code == 0, result.output
         assert "Supply Cap:       unlimited" in result.output
 
-    @patch(
-        "ipor_fusion.cli.vault_markets_view.get_contract_name", return_value="SomeFuse"
-    )
+    @patch("ipor_fusion.cli.vault_info_view.get_contract_name", return_value="SomeFuse")
     @patch("ipor_fusion.vault_data.price_oracle_middleware")
     @patch("ipor_fusion.vault_data.ERC20")
     @patch("ipor_fusion.vault_data.PlasmaVault")
@@ -766,9 +758,7 @@ class TestVaultInfo:
         "ipor_fusion.vault_data.get_deployment_tx",
         return_value=("0xdeadbeef", None),
     )
-    @patch(
-        "ipor_fusion.cli.vault_markets_view.get_contract_name", return_value="SomeFuse"
-    )
+    @patch("ipor_fusion.cli.vault_info_view.get_contract_name", return_value="SomeFuse")
     @patch("ipor_fusion.vault_data.price_oracle_middleware")
     @patch("ipor_fusion.vault_data.ERC20")
     @patch("ipor_fusion.vault_data.PlasmaVault")
@@ -836,9 +826,7 @@ class TestVaultInfo:
         assert "Deployed at:      block 18500000" in result.output
         assert "2023-11-14" in result.output
 
-    @patch(
-        "ipor_fusion.cli.vault_markets_view.get_contract_name", return_value="SomeFuse"
-    )
+    @patch("ipor_fusion.cli.vault_info_view.get_contract_name", return_value="SomeFuse")
     @patch("ipor_fusion.vault_data.price_oracle_middleware")
     @patch("ipor_fusion.vault_data.ERC20")
     @patch("ipor_fusion.vault_data.PlasmaVault")

{ipor_fusion-4.0.0.dev108 → ipor_fusion-4.0.0.dev110}/tests/test_cli_helpers.py

@@ -703,6 +703,10 @@ class TestResolveTokenSymbol:
 ADDR_1 = "0x1111111111111111111111111111111111111111"
 
 
+def _no_name(_address: str) -> str:
+    return ""
+
+
 def _snapshot(**fields: Any) -> Any:
     """The `VaultData` fields the market printers read, overridable."""
     defaults: dict[str, Any] = {
@@ -1049,16 +1053,13 @@ class TestPrintSubstrates:
 
     def test_no_substrates(self, capsys):
         _print_substrates(
-            _snapshot(balance_fuses=[FakeBalanceFuse(market_id=1, fuse=ADDR_1)]), None
+            _snapshot(balance_fuses=[FakeBalanceFuse(market_id=1, fuse=ADDR_1)]),
+            _no_name,
         )
         captured = capsys.readouterr()
         assert "(none)" in captured.out
 
-    @patch(
-        "ipor_fusion.cli.vault_markets_view.get_contract_name",
-        return_value="TestContract",
-    )
-    def test_with_substrates(self, mock_get_name, capsys):
+    def test_with_substrates(self, capsys):
         addr_bytes = bytes.fromhex("00" * 12 + "ab" * 20)
         _print_substrates(
             _snapshot(
@@ -1066,7 +1067,7 @@ class TestPrintSubstrates:
                 balance_fuses=[FakeBalanceFuse(market_id=7, fuse=ADDR_1)],
                 token_symbols={"0x" + "ab" * 20: "WETH"},
             ),
-            "key",
+            lambda _address: "TestContract",
         )
         captured = capsys.readouterr()
         assert "WETH" in captured.out
@@ -1079,7 +1080,7 @@ class TestPrintSubstrates:
                 market_substrates={14: [raw_bytes32]},
                 balance_fuses=[FakeBalanceFuse(market_id=14, fuse=ADDR_1)],
             ),
-            None,
+            _no_name,
         )
         captured = capsys.readouterr()
         assert "morpho_market_id" in captured.out
@@ -1092,7 +1093,7 @@ class TestPrintSubstrates:
                 market_substrates={7: [bad_bytes]},
                 balance_fuses=[FakeBalanceFuse(market_id=7, fuse=ADDR_1)],
             ),
-            None,
+            _no_name,
         )
         captured = capsys.readouterr()
         assert "[encoding error]" in captured.out
@@ -1106,41 +1107,37 @@ class TestPrintSubstrates:
                 market_substrates={54: [malformed_executor]},
                 balance_fuses=[FakeBalanceFuse(market_id=54, fuse=ADDR_1)],
             ),
-            None,
+            _no_name,
         )
         captured = capsys.readouterr()
         assert "[encoding error: EXECUTOR, chain_id=8453]" in captured.out
 
 
 class TestPrintBalanceFusesTable:
-    @patch("ipor_fusion.cli.vault_markets_view.get_contract_name")
-    def test_splits_venues_and_zero_balance(self, mock_get_name, capsys):
-        mock_get_name.side_effect = lambda chain, addr, key: (
-            "ZeroBalanceFuse" if addr == ADDR_2 else "MorphoBalanceFuse"
-        )
+    def test_splits_venues_and_zero_balance(self, capsys):
+        def resolve_name(addr):
+            return "ZeroBalanceFuse" if addr == ADDR_2 else "MorphoBalanceFuse"
+
         fuses = [
             FakeBalanceFuse(market_id=14, fuse=ADDR_1),
             FakeBalanceFuse(market_id=12, fuse=ADDR_2),
         ]
 
         _print_balance_fuses_table(
-            _snapshot(balance_fuses=fuses, market_balances={14: 0, 12: 0}), None
+            _snapshot(balance_fuses=fuses, market_balances={14: 0, 12: 0}),
+            resolve_name,
         )
         out = capsys.readouterr().out
         assert "Balance Fuses (1):" in out
         assert "Zero-Balance Fuses (1):" in out
 
-    @patch(
-        "ipor_fusion.cli.vault_markets_view.get_contract_name",
-        return_value="MorphoBalanceFuse",
-    )
-    def test_no_zero_balance_section_when_all_venues(self, mock_get_name, capsys):
+    def test_no_zero_balance_section_when_all_venues(self, capsys):
         _print_balance_fuses_table(
             _snapshot(
                 balance_fuses=[FakeBalanceFuse(market_id=14, fuse=ADDR_1)],
                 market_balances={14: 0},
             ),
-            None,
+            lambda _address: "MorphoBalanceFuse",
         )
         out = capsys.readouterr().out
         assert "Balance Fuses (1):" in out
@@ -2081,19 +2078,14 @@ class TestPrintFuseSection:
     Fuses. Dedupes by address, reports a Registrations column, and surfaces
     duplicate registrations in the section header."""
 
-    @patch(
-        "ipor_fusion.cli.vault_markets_view.get_contract_name",
-        return_value="MorphoSupplyFuse",
-    )
-    def test_renders_market_label_and_substrate_count(self, _mock_name, capsys):
+    def test_renders_market_label_and_substrate_count(self, capsys):
         addr = ADDR_1
         _print_fuse_section(
             "Fuses",
             [addr],
             fuse_markets={addr: IporFusionMarkets.MORPHO},
             market_substrates={IporFusionMarkets.MORPHO: [b"\x11" * 32, b"\x22" * 32]},
-            chain_id=1,
-            api_key=None,
+            resolve_name=lambda _address: "MorphoSupplyFuse",
         )
         captured = capsys.readouterr()
         assert "Fuses (1 unique)" in captured.out
@@ -2103,52 +2095,37 @@ class TestPrintFuseSection:
         # Substrate count comes from market_substrates, not from registrations
         assert "  2  " in captured.out or "2\n" in captured.out
 
-    @patch(
-        "ipor_fusion.cli.vault_markets_view.get_contract_name",
-        return_value="UnknownFuse",
-    )
-    def test_renders_question_mark_without_fuse_markets(self, _mock_name, capsys):
+    def test_renders_question_mark_without_fuse_markets(self, capsys):
         _print_fuse_section(
             "Fuses",
             [ADDR_1],
             fuse_markets=None,
             market_substrates=None,
-            chain_id=1,
-            api_key=None,
+            resolve_name=lambda _address: "UnknownFuse",
         )
         captured = capsys.readouterr()
         assert "?" in captured.out
 
-    @patch(
-        "ipor_fusion.cli.vault_markets_view.get_contract_name",
-        return_value="MorphoSupplyFuse",
-    )
-    def test_dedupes_repeated_fuse_address(self, _mock_name, capsys):
+    def test_dedupes_repeated_fuse_address(self, capsys):
         addr = ADDR_1
         _print_fuse_section(
             "Instant Withdrawal Fuses",
             [addr, addr, addr],
             fuse_markets={addr: IporFusionMarkets.MORPHO},
             market_substrates={IporFusionMarkets.MORPHO: [b"\x11" * 32] * 3},
-            chain_id=1,
-            api_key=None,
+            resolve_name=lambda _address: "MorphoSupplyFuse",
         )
         captured = capsys.readouterr()
         assert "1 unique / 3 registrations" in captured.out
         assert captured.out.count(addr) == 1
 
-    @patch(
-        "ipor_fusion.cli.vault_markets_view.get_contract_name",
-        return_value="MorphoSupplyFuse",
-    )
-    def test_no_registrations_suffix_when_unique(self, _mock_name, capsys):
+    def test_no_registrations_suffix_when_unique(self, capsys):
         _print_fuse_section(
             "Fuses",
             [ADDR_1, ADDR_2],
             fuse_markets=None,
             market_substrates=None,
-            chain_id=1,
-            api_key=None,
+            resolve_name=lambda _address: "MorphoSupplyFuse",
         )
         captured = capsys.readouterr()
         assert "registrations" not in captured.out
@@ -2160,8 +2137,7 @@ class TestPrintFuseSection:
             [],
             fuse_markets=None,
             market_substrates=None,
-            chain_id=1,
-            api_key=None,
+            resolve_name=_no_name,
         )
         captured = capsys.readouterr()
         assert "(none)" in captured.out