ipor-fusion 4.0.0.dev30__tar.gz → 4.0.0.dev32__tar.gz

{ipor_fusion-4.0.0.dev30 → ipor_fusion-4.0.0.dev32}/AGENTS.md

@@ -285,7 +285,9 @@ or examples.
   `MarketId`, ...) name the unit, and nothing scales by decimals.
 - Ids and addresses are nominal in every signature: `ChainId`, `MarketId` (each
   `IporFusionMarkets` member is one), `RoleId | Roles`, `ChecksumAddress`;
-  `HexAddress` only for the lowercase addresses decoded from substrates. Raw input
+  `HexAddress` only for the lowercase addresses decoded from substrates;
+  `MorphoBlueMarketId` is always `0x` + 64 lowercase hex, built by
+  `parse_morpho_market_id`. Raw input
   is parsed once at the boundary (click param types, MCP tools, the user config).
   `src/`, `examples/` and `tests/typed_client/` are checked with
   `reportArgumentType` on, so a bare `int`/`str` passed for one fails pyright; the

{ipor_fusion-4.0.0.dev30 → ipor_fusion-4.0.0.dev32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ipor-fusion
-Version: 4.0.0.dev30
+Version: 4.0.0.dev32
 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.dev30 → ipor_fusion-4.0.0.dev32}/pyproject.toml

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

{ipor_fusion-4.0.0.dev30 → ipor_fusion-4.0.0.dev32}/src/ipor_fusion/__init__.py

@@ -336,6 +336,7 @@ from ipor_fusion.types import (
     Tick,
     TokenId,
     TransferId,
+    parse_morpho_market_id,
 )
 from ipor_fusion.validation import (
     Erc20Holding,
@@ -605,6 +606,7 @@ __all__ = [
     "RoleId",
     "ChainId",
     "MorphoBlueMarketId",
+    "parse_morpho_market_id",
     "AssetId",
     "CommandId",
     "DeploymentRequestId",

{ipor_fusion-4.0.0.dev30 → ipor_fusion-4.0.0.dev32}/src/ipor_fusion/cli/market_cmd.py

@@ -42,7 +42,7 @@ from ipor_fusion.readers.morpho import (
     MorphoReader,
     morpho_blue_address,
 )
-from ipor_fusion.types import ChainId, MorphoBlueMarketId
+from ipor_fusion.types import ChainId, MorphoBlueMarketId, parse_morpho_market_id
 from ipor_fusion.vault_info import BLOCK_EXPLORER_URLS
 
 
@@ -54,12 +54,10 @@ class MarketIdType(click.ParamType):
     def convert(self, value, param, ctx):  # type: ignore[override]
         if not isinstance(value, str):
             self.fail(f"expected string, got {type(value).__name__}", param, ctx)
-        raw = value.strip().removeprefix("0x").removeprefix("0X")
-        if len(raw) != 64 or not all(c in "0123456789abcdefABCDEF" for c in raw):
-            self.fail(
-                f"invalid Morpho market ID (expected 32-byte hex): {value}", param, ctx
-            )
-        return raw.lower()
+        try:
+            return parse_morpho_market_id(value)
+        except ValueError as exc:
+            self.fail(str(exc), param, ctx)
 
 
 MARKET_ID = MarketIdType()
@@ -106,7 +104,7 @@ def market() -> None:
     help="Emit machine-readable JSON instead of a table.",
 )
 def morpho_blue(
-    market_id: str,
+    market_id: MorphoBlueMarketId,
     chain_id: ChainId,
     block: int | None,
     no_api: bool,
@@ -127,7 +125,7 @@ def morpho_blue(
     if block is not None:
         ctx.default_block = block
     reader = MorphoReader(ctx, morpho_blue_address(chain_id))
-    mid = MorphoBlueMarketId(market_id)
+    mid = market_id
     params, state = reader.require_market(mid)
     rates = reader.rates_from(state, params)
 
@@ -171,7 +169,7 @@ def morpho_blue(
 
 
 def _print_market(
-    market_id: str,
+    market_id: MorphoBlueMarketId,
     chain_id: ChainId,
     params: MorphoMarketParams,
     state: MorphoMarket,
@@ -181,11 +179,11 @@ def _print_market(
     chain_name = CHAIN_NAMES.get(chain_id, str(chain_id))
     explorer = BLOCK_EXPLORER_URLS.get(chain_id, "")
     liquidity = state.total_supply_assets - state.total_borrow_assets
-    click.secho(f"Morpho Blue market 0x{market_id}", bold=True)
+    click.secho(f"Morpho Blue market {market_id}", bold=True)
     click.echo(f"  Chain:           {chain_name} (id {chain_id})")
     if explorer:
         click.echo(
-            f"  App:             https://app.morpho.org/{chain_name}/market/0x{market_id}"
+            f"  App:             https://app.morpho.org/{chain_name}/market/{market_id}"
         )
     click.echo(f"  Loan token:      {params.loan_token}")
     click.echo(f"  Collateral:      {params.collateral_token}")
@@ -332,7 +330,7 @@ def _print_reallocate_hint(params: MorphoMarketParams) -> None:
 @click.option(
     "--market",
     "market_filter",
-    type=str,
+    type=MARKET_ID,
     default=None,
     help="Filter caps/allocations to a single Morpho Blue market ID.",
 )
@@ -346,7 +344,7 @@ def _print_reallocate_hint(params: MorphoMarketParams) -> None:
 def meta_morpho(
     vault_address: ChecksumAddress,
     chain_id: ChainId,
-    market_filter: str | None,
+    market_filter: MorphoBlueMarketId | None,
     json_output: bool,
 ) -> None:
     """Inspect a MetaMorpho V1 or Morpho Vault V2 by address.
@@ -361,22 +359,18 @@ def meta_morpho(
     except MorphoApiError as exc:
         raise click.UsageError(str(exc)) from exc
 
-    market_filter_norm = (
-        ("0x" + market_filter.removeprefix("0x").lower()) if market_filter else None
-    )
-
     if json_output:
         click.echo(json_lib.dumps(build_meta_morpho_json(info, chain_id), indent=2))
         return
 
     if isinstance(info, VaultV2Info):
-        _print_vault_v2(info, chain_id, market_filter_norm)
+        _print_vault_v2(info, chain_id, market_filter)
     else:
-        _print_vault_v1(info, chain_id, market_filter_norm)
+        _print_vault_v1(info, chain_id, market_filter)
 
 
 def _print_vault_v2(
-    vault: VaultV2Info, chain_id: ChainId, market_filter: str | None
+    vault: VaultV2Info, chain_id: ChainId, market_filter: MorphoBlueMarketId | None
 ) -> None:
     chain_name = CHAIN_NAMES.get(chain_id, str(chain_id))
     click.secho(f"Morpho Vault V2 — {vault.name} ({vault.symbol})", bold=True)
@@ -433,9 +427,7 @@ def _print_vault_v2(
     market_caps = [c for c in vault.caps if c.cap_type == "MarketV1"]
     other_caps = [c for c in vault.caps if c.cap_type != "MarketV1"]
     if market_filter:
-        market_caps = [
-            c for c in market_caps if (c.market_id or "").lower() == market_filter
-        ]
+        market_caps = [c for c in market_caps if c.market_id == market_filter]
 
     click.secho(f"Morpho Blue market caps ({len(market_caps)}):", bold=True)
     _print_market_caps(market_caps, vault.asset_symbol, vault.asset_decimals)
@@ -508,7 +500,7 @@ def _print_other_caps(
 
 
 def _print_vault_v1(
-    vault: VaultV1Info, chain_id: ChainId, market_filter: str | None
+    vault: VaultV1Info, chain_id: ChainId, market_filter: MorphoBlueMarketId | None
 ) -> None:
     chain_name = CHAIN_NAMES.get(chain_id, str(chain_id))
     public_allocator = PUBLIC_ALLOCATOR_ADDRESSES.get(chain_id)
@@ -552,7 +544,7 @@ def _print_vault_v1(
 
     allocations = vault.allocations
     if market_filter:
-        allocations = [a for a in allocations if a.market_id.lower() == market_filter]
+        allocations = [a for a in allocations if a.market_id == market_filter]
     click.secho(f"Allocations ({len(allocations)}):", bold=True)
     if not allocations:
         click.echo("  (none)")

{ipor_fusion-4.0.0.dev30 → ipor_fusion-4.0.0.dev32}/src/ipor_fusion/market_info.py

@@ -17,11 +17,11 @@ from ipor_fusion.readers.morpho import (
     MorphoMarketParams,
     MorphoMarketRates,
 )
-from ipor_fusion.types import ChainId
+from ipor_fusion.types import ChainId, MorphoBlueMarketId
 
 
 def build_morpho_blue_market_json(
-    market_id: str,
+    market_id: MorphoBlueMarketId,
     chain_id: ChainId,
     params: MorphoMarketParams,
     state: MorphoMarket,
@@ -36,7 +36,7 @@ def build_morpho_blue_market_json(
     given, or ``api_error`` when that lookup failed. ``market_id`` is the
     64-hex-char id without ``0x``."""
     out: dict = {
-        "market_id": "0x" + market_id,
+        "market_id": market_id,
         "chain_id": chain_id,
         "public_allocator": public_allocator,
         "market_params": {

{ipor_fusion-4.0.0.dev30 → ipor_fusion-4.0.0.dev32}/src/ipor_fusion/mcp/server.py

@@ -55,7 +55,7 @@ from ipor_fusion.morpho_api import (
 )
 from ipor_fusion.readers.morpho import MorphoReader, morpho_blue_address
 from ipor_fusion.readers.oracle_mapping import build_oracle_mapping
-from ipor_fusion.types import ChainId, MorphoBlueMarketId
+from ipor_fusion.types import ChainId, parse_morpho_market_id
 from ipor_fusion.validation import validate_vault
 from ipor_fusion.vault_data import (
     fetch_deployment_info,
@@ -580,16 +580,11 @@ def market_morpho_blue(
         block_number: Block number for on-chain reads (latest if 0).
         no_api: Skip Morpho API call (no vault discovery / PublicAllocator info).
     """
-    raw = market_id.strip().removeprefix("0x").removeprefix("0X").lower()
-    if len(raw) != 64 or not all(c in "0123456789abcdef" for c in raw):
-        raise ValueError(
-            f"invalid Morpho market ID (expected 32-byte hex): {market_id}"
-        )
+    mid = parse_morpho_market_id(market_id)
 
     cfg = load_config()
     ctx, _ = _build_ctx(cfg, chain_id, block_number)
     reader = MorphoReader(ctx, morpho_blue_address(chain_id))
-    mid = MorphoBlueMarketId(raw)
     params, state = reader.require_market(mid)
     rates = reader.rates_from(state, params)
 
@@ -597,13 +592,13 @@ def market_morpho_blue(
     api_error: str | None = None
     if not no_api:
         try:
-            api_market = fetch_market(raw, chain_id)
+            api_market = fetch_market(mid, chain_id)
         except MorphoApiError as exc:
             api_error = str(exc)
 
     public_allocator = PUBLIC_ALLOCATOR_ADDRESSES.get(chain_id)
     payload = build_morpho_blue_market_json(
-        raw, chain_id, params, state, rates, api_market, api_error, public_allocator
+        mid, chain_id, params, state, rates, api_market, api_error, public_allocator
     )
     return MorphoBlueMarketResponse.model_validate(payload)
 

{ipor_fusion-4.0.0.dev30 → ipor_fusion-4.0.0.dev32}/src/ipor_fusion/morpho_api.py

@@ -17,7 +17,7 @@ from eth_abi import decode, encode
 from eth_utils import keccak
 from web3 import Web3
 
-from ipor_fusion.types import ChainId
+from ipor_fusion.types import ChainId, MorphoBlueMarketId, parse_morpho_market_id
 
 MORPHO_API_URL = "https://blue-api.morpho.org/graphql"
 
@@ -113,7 +113,7 @@ class VaultAllocation:
 class MorphoApiMarket:
     """Snapshot of a Morpho Blue market plus the vaults supplying to it."""
 
-    market_id: str
+    market_id: MorphoBlueMarketId
     lltv: int
     loan_token: str
     loan_symbol: str
@@ -139,7 +139,7 @@ class MorphoApiError(RuntimeError):
 
 
 def fetch_market(
-    market_id: str, chain_id: ChainId, *, timeout: float = 10.0
+    market_id: MorphoBlueMarketId, chain_id: ChainId, *, timeout: float = 10.0
 ) -> MorphoApiMarket:
     """Fetch a Morpho Blue market with its supplying vaults from the public API.
 
@@ -147,8 +147,6 @@ def fetch_market(
     ID (1 = mainnet, 8453 = base, ...). Raises `MorphoApiError` on network failure
     or if the market is not indexed.
     """
-    if not market_id.startswith("0x"):
-        market_id = "0x" + market_id
     payload = json.dumps(
         {
             "query": _MARKET_QUERY,
@@ -182,7 +180,7 @@ def fetch_market(
 def _parse_market(raw: dict) -> MorphoApiMarket:
     state = raw.get("state") or {}
     return MorphoApiMarket(
-        market_id=raw["marketId"],
+        market_id=_api_market_id(raw.get("marketId")),
         lltv=int(raw["lltv"]),
         loan_token=raw["loanAsset"]["address"],
         loan_symbol=raw["loanAsset"]["symbol"],
@@ -282,7 +280,7 @@ class VaultV2Cap:
     absolute_cap: int
     relative_cap_wad: int
     allocation: int
-    market_id: str | None
+    market_id: MorphoBlueMarketId | None
     loan_token: str | None
     collateral_token: str | None
     oracle: str | None
@@ -337,7 +335,7 @@ class VaultV2Info:
 class VaultV1MarketAllocation:
     """A MetaMorpho V1 allocation entry."""
 
-    market_id: str
+    market_id: MorphoBlueMarketId
     lltv: int
     loan_symbol: str
     loan_decimals: int
@@ -550,9 +548,18 @@ def _decode_market_v1_id_data(
     )
 
 
+def _api_market_id(value: object) -> MorphoBlueMarketId:
+    try:
+        return parse_morpho_market_id(str(value or ""))
+    except ValueError as exc:
+        raise MorphoApiError(
+            f"Morpho API returned an invalid market id: {value!r}"
+        ) from exc
+
+
 def _morpho_blue_market_id(
     loan: str, collateral: str, oracle: str, irm: str, lltv: int
-) -> str:
+) -> MorphoBlueMarketId:
     """Compute a Morpho Blue market unique key from MarketParams.
 
     `marketId = keccak256(abi.encode(loanToken, collateralToken, oracle, irm, lltv))`
@@ -562,7 +569,7 @@ def _morpho_blue_market_id(
         ["address", "address", "address", "address", "uint256"],
         [loan, collateral, oracle, irm, lltv],
     )
-    return "0x" + keccak(encoded).hex()
+    return parse_morpho_market_id(keccak(encoded))
 
 
 def _parse_vault_v1(raw: dict) -> VaultV1Info:
@@ -576,7 +583,7 @@ def _parse_vault_v1(raw: dict) -> VaultV1Info:
         collat_asset = market.get("collateralAsset") or {}
         allocations.append(
             VaultV1MarketAllocation(
-                market_id=market.get("marketId") or "",
+                market_id=_api_market_id(market.get("marketId")),
                 lltv=int(market.get("lltv") or 0),
                 loan_symbol=loan_asset.get("symbol") or "",
                 loan_decimals=int(loan_asset.get("decimals") or 0),
@@ -626,14 +633,14 @@ def _parse_vault_v1(raw: dict) -> VaultV1Info:
     )
 
 
-def _parse_vault(raw: dict, market_id: str) -> VaultAllocation:
+def _parse_vault(raw: dict, market_id: MorphoBlueMarketId) -> VaultAllocation:
     asset = raw.get("asset") or {}
     state = raw.get("state") or {}
     allocation_for_market: dict = next(
         (
             a
             for a in (state.get("allocation") or [])
-            if (a.get("market") or {}).get("marketId", "").lower() == market_id.lower()
+            if (a.get("market") or {}).get("marketId", "").lower() == market_id
         ),
         {},
     )

{ipor_fusion-4.0.0.dev30 → ipor_fusion-4.0.0.dev32}/src/ipor_fusion/readers/lending_health.py

@@ -29,7 +29,12 @@ from ipor_fusion.readers.morpho import (
     morpho_blue_address,
 )
 from ipor_fusion.substrates import decode_substrate, market_name
-from ipor_fusion.types import ChainId, MarketId, MorphoBlueMarketId
+from ipor_fusion.types import (
+    ChainId,
+    MarketId,
+    MorphoBlueMarketId,
+    parse_morpho_market_id,
+)
 
 _logger = logging.getLogger(__name__)
 
@@ -374,9 +379,8 @@ def _collect_lending_markets(
         if mid in MORPHO_MARKET_IDS:
             substrates = market_substrates.get(mid, [])
             for sub in substrates:
-                hex_str = sub.hex()
-                if len(hex_str) == 64:
-                    markets.morpho.append((mid, name, MorphoBlueMarketId(hex_str)))
+                if len(sub) == 32:
+                    markets.morpho.append((mid, name, parse_morpho_market_id(sub)))
         elif mid in AAVE_V3_MARKET_IDS:
             if aave_pool := aave_pools.get(mid):
                 markets.aave_v3.append((mid, name, aave_pool))

{ipor_fusion-4.0.0.dev30 → ipor_fusion-4.0.0.dev32}/src/ipor_fusion/types.py

@@ -13,7 +13,9 @@ Tick = NewType("Tick", int)
 Liquidity = NewType("Liquidity", int)
 RoleId = NewType("RoleId", int)
 ChainId = NewType("ChainId", int)
-# Hex string without 0x prefix (e.g. "abc123..." not "0xabc123...")
+# A Morpho Blue market id (bytes32) in its canonical spelling: "0x" and 64
+# lowercase hex digits, as the Morpho API reports it. Build one with
+# parse_morpho_market_id.
 MorphoBlueMarketId = NewType("MorphoBlueMarketId", str)
 # Crosschain identifiers (bytes32 unless noted), named after the contracts' fields.
 CommandId = NewType("CommandId", bytes)
@@ -98,3 +100,16 @@ Period.MINUTE = Period(60 * Period.SECOND)
 Period.HOUR = Period(60 * Period.MINUTE)
 Period.DAY = Period(24 * Period.HOUR)
 Period.WEEK = Period(7 * Period.DAY)
+
+
+def parse_morpho_market_id(value: str | bytes) -> MorphoBlueMarketId:
+    """A Morpho Blue market id from 32 raw bytes or from hex with or without
+    ``0x``, in any case; raises ``ValueError`` on anything else."""
+    if isinstance(value, bytes):
+        if len(value) != 32:
+            raise ValueError(f"invalid Morpho market ID (expected 32 bytes): {value!r}")
+        return MorphoBlueMarketId("0x" + value.hex())
+    digits = value.strip().removeprefix("0x").removeprefix("0X").lower()
+    if len(digits) != 64 or any(c not in "0123456789abcdef" for c in digits):
+        raise ValueError(f"invalid Morpho market ID (expected 32-byte hex): {value}")
+    return MorphoBlueMarketId("0x" + digits)

{ipor_fusion-4.0.0.dev30 → ipor_fusion-4.0.0.dev32}/src/ipor_fusion/vault_data.py

@@ -78,7 +78,12 @@ from ipor_fusion.readers.unpriceable import (
     MiddlewarePricedToken,
     fetch_unpriceable_priced_tokens,
 )
-from ipor_fusion.types import ChainId, MarketId, MorphoBlueMarketId
+from ipor_fusion.types import (
+    ChainId,
+    MarketId,
+    MorphoBlueMarketId,
+    parse_morpho_market_id,
+)
 
 T = TypeVar("T")
 
@@ -484,9 +489,7 @@ def _collect_morpho_substrates(
     for mid, subs in market_substrates.items():
         if mid not in MORPHO_MARKET_IDS:
             continue
-        morpho_ids = [
-            MorphoBlueMarketId(sub.hex()) for sub in subs if len(sub.hex()) == 64
-        ]
+        morpho_ids = [parse_morpho_market_id(sub) for sub in subs if len(sub) == 32]
         if morpho_ids:
             result[mid] = morpho_ids
     return result

{ipor_fusion-4.0.0.dev30 → ipor_fusion-4.0.0.dev32}/tests/test_cli_market_morpho_blue.py

@@ -196,7 +196,9 @@ class TestMorphoBlueCommand:
 
         assert result.exit_code != 0
         assert isinstance(result.exception, MorphoMarketNotFoundError)
-        assert f"market {MARKET_ID} does not exist on chain 1" in str(result.exception)
+        assert f"market 0x{MARKET_ID} does not exist on chain 1" in str(
+            result.exception
+        )
         mock_fetch.assert_not_called()
 
     def test_no_api_skips_vault_section(

{ipor_fusion-4.0.0.dev30 → ipor_fusion-4.0.0.dev32}/tests/typed_client/consumer.py

@@ -19,6 +19,7 @@ from ipor_fusion import (
     fetch_vault_data,
     format_market_label,
     market_name,
+    parse_morpho_market_id,
     validate_vault,
 )
 from ipor_fusion.chains import ensure_supported_chain
@@ -31,7 +32,7 @@ from ipor_fusion.crosschain.contracts import (
     CrosschainFactory,
 )
 from ipor_fusion.explorer import get_contract_name
-from ipor_fusion.morpho_api import fetch_vault
+from ipor_fusion.morpho_api import fetch_market, fetch_vault
 from ipor_fusion.readers.morpho import morpho_blue_address
 from ipor_fusion.readers.unpriceable import fetch_unpriceable_priced_tokens
 from ipor_fusion.types import (
@@ -74,6 +75,7 @@ def lookups() -> None:
     get_contract_name(ETHEREUM, VAULT)
     morpho_blue_address(ETHEREUM)
     fetch_vault(VAULT, ETHEREUM)
+    fetch_market(parse_morpho_market_id("0x" + "ab" * 32), ETHEREUM)
 
 
 def crosschain(