ipor-fusion 4.0.0.dev74__tar.gz → 4.0.0.dev78__tar.gz

{ipor_fusion-4.0.0.dev74 → ipor_fusion-4.0.0.dev78}/MIGRATION_4.md

@@ -133,6 +133,16 @@ and the Stargate fuse's `eid=` take it (`LayerZeroEid(30101)`).
 `encode_oft_compose_msg(*, nonce=, src_eid=, amount_ld=, compose_msg=)` takes
 keyword arguments only. `ZERO_ADDRESS` is a `ChecksumAddress` (same value).
 
+**Chain registry and removed aliases.** `CHAIN_NAMES`, `CHAIN_NAME_TO_ID`,
+`SUPPORTED_CHAIN_IDS`, `GET_LOGS_RANGE_HINTS`, `BLOCK_EXPLORER_URLS`,
+`MORPHO_BLUE_ADDRESSES`, `AAVE_V3_POOL`, `PUBLIC_ALLOCATOR_ADDRESSES` and
+`HYPERCORE_PENDING_READERS` are keyed by `ChainId` (`HYPEREVM_CHAIN_ID` is one) and
+`explorer.SUPPORTED_CHAINS` is a `frozenset[ChainId]`, so
+`ensure_supported_chain(CHAIN_NAME_TO_ID["ethereum"])` type-checks;
+`PUBLIC_ALLOCATOR_ADDRESSES` values are `ChecksumAddress`. `IporFusionMarkets.RWA`
+is gone: market 50 is `IporFusionMarkets.EXTERNAL_STATE`. `MORPHO_BLUE_ADDRESS` is
+gone: use `morpho_blue_address(chain_id)`.
+
 **Markets and substrates.** Every `IporFusionMarkets` member is a `MarketId`.
 `decode_substrate`, `market_name`, `format_market_label` take `MarketId`.
 

{ipor_fusion-4.0.0.dev74 → ipor_fusion-4.0.0.dev78}/PKG-INFO

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

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

{ipor_fusion-4.0.0.dev74 → ipor_fusion-4.0.0.dev78}/src/ipor_fusion/chains.py

@@ -5,48 +5,48 @@ from __future__ import annotations
 from ipor_fusion.errors import UnsupportedChainError
 from ipor_fusion.types import ChainId
 
-CHAIN_NAMES: dict[int, str] = {
-    1: "ethereum",
-    42161: "arbitrum",
-    8453: "base",
-    10: "optimism",
-    130: "unichain",
-    137: "polygon",
-    56: "bsc",
-    239: "tac",
-    9745: "plasma",
-    43114: "avalanche",
-    250: "fantom",
-    143: "monad",
-    999: "hyperevm",
-    4663: "robinhood",
-    747474: "katana",
-    3637: "botanix",
-    57073: "ink",
-    14: "flare",
+CHAIN_NAMES: dict[ChainId, str] = {
+    ChainId(1): "ethereum",
+    ChainId(42161): "arbitrum",
+    ChainId(8453): "base",
+    ChainId(10): "optimism",
+    ChainId(130): "unichain",
+    ChainId(137): "polygon",
+    ChainId(56): "bsc",
+    ChainId(239): "tac",
+    ChainId(9745): "plasma",
+    ChainId(43114): "avalanche",
+    ChainId(250): "fantom",
+    ChainId(143): "monad",
+    ChainId(999): "hyperevm",
+    ChainId(4663): "robinhood",
+    ChainId(747474): "katana",
+    ChainId(3637): "botanix",
+    ChainId(57073): "ink",
+    ChainId(14): "flare",
 }
 
-CHAIN_NAME_TO_ID: dict[str, int] = {name: cid for cid, name in CHAIN_NAMES.items()}
+CHAIN_NAME_TO_ID: dict[str, ChainId] = {name: cid for cid, name in CHAIN_NAMES.items()}
 
 # Chains the on-chain vault tooling (vault info/health/substrate fetch) is
 # validated on. A provider for another chain may connect fine and still fail
 # deeper in the stack (a missing Multicall3, an oracle quirk, an eth_getLogs
 # cap the adaptive scan cannot page through). Extend only after the full
 # vault_info path passes on every live vault of that chain.
-SUPPORTED_CHAIN_IDS: frozenset[int] = frozenset(
-    {1, 130, 143, 999, 8453, 9745, 42161, 43114, 747474}
+SUPPORTED_CHAIN_IDS: frozenset[ChainId] = frozenset(
+    ChainId(cid) for cid in (1, 130, 143, 999, 8453, 9745, 42161, 43114, 747474)
 )
 
 # First eth_getLogs page size, in blocks, on chains whose providers cap the
 # range (10,000 blocks) or time out on wide queries. The scan still shrinks a
 # page the provider rejects; a hint only skips the whole-range attempt and the
 # probing round trips.
-GET_LOGS_RANGE_HINTS: dict[int, int] = {
-    130: 10_000,
-    9745: 10_000,
-    57073: 10_000,
-    43114: 1_000_000,
-    747474: 1_000_000,
+GET_LOGS_RANGE_HINTS: dict[ChainId, int] = {
+    ChainId(130): 10_000,
+    ChainId(9745): 10_000,
+    ChainId(57073): 10_000,
+    ChainId(43114): 1_000_000,
+    ChainId(747474): 1_000_000,
 }
 
 

{ipor_fusion-4.0.0.dev74 → ipor_fusion-4.0.0.dev78}/src/ipor_fusion/explorer.py

@@ -17,7 +17,9 @@ from ipor_fusion.types import ChainId, TxHash, parse_tx_hash
 
 ETHERSCAN_V2_URL = "https://api.etherscan.io/v2/api"
 
-SUPPORTED_CHAINS = {1, 42161, 8453, 10, 137, 56, 43114, 250}
+SUPPORTED_CHAINS: frozenset[ChainId] = frozenset(
+    ChainId(cid) for cid in (1, 42161, 8453, 10, 137, 56, 43114, 250)
+)
 
 _MAX_RETRIES = 3
 _RETRY_DELAY = 1.0

{ipor_fusion-4.0.0.dev74 → ipor_fusion-4.0.0.dev78}/src/ipor_fusion/market_ids.py

@@ -87,13 +87,6 @@ class IporFusionMarkets:
     # 4 BALANCE_ACCOUNT, 5 STALENESS_MAX, 6 BIG_CHANGE_BPS, 7 DUST_THRESHOLD,
     # 8 MIN_UPDATE_INTERVAL).
     EXTERNAL_STATE = MarketId(50)
-    # Deprecated alias of EXTERNAL_STATE, kept for backward compatibility.
-    # Reverse id->name lookups skip aliases (see _DEPRECATED_ALIASES) so the
-    # canonical name is the one displayed.
-    RWA = MarketId(50)
-    # Deprecated member names that alias a canonical member of the same value;
-    # reverse id->name lookups skip these so the canonical name wins.
-    _DEPRECATED_ALIASES = frozenset({"RWA"})
     # substrate type: AguaSubstrateLib (VAULT or ASSET)
     AGUA_GLOBAL_CARRY = MarketId(51)
     # dependence graph: balance of ERC20_VAULT_BALANCE (purchase tokens return

{ipor_fusion-4.0.0.dev74 → ipor_fusion-4.0.0.dev78}/src/ipor_fusion/morpho_api.py

@@ -26,18 +26,40 @@ MORPHO_API_URL = "https://blue-api.morpho.org/graphql"
 # Morpho API (`publicAllocators` query). Anyone can call `reallocateTo` on
 # this contract — the vault must have granted it the ALLOCATOR_ROLE for
 # public reallocation to actually go through.
-PUBLIC_ALLOCATOR_ADDRESSES: dict[int, str] = {
-    1: "0xfd32fA2ca22c76dD6E550706Ad913FC6CE91c75D",  # Ethereum
-    10: "0x0d68a97324E602E02799CD83B42D337207B40658",  # OP Mainnet
-    137: "0xfac15aff53ADd2ff80C2962127C434E8615Df0d3",  # Polygon
-    8453: "0xA090dD1a701408Df1d4d0B85b716c87565f90467",  # Base
-    42161: "0x769583Af5e9D03589F159EbEC31Cc2c23E8C355E",  # Arbitrum One
-    130: "0xB0c9a107fA17c779B3378210A7a593e88938C7C9",  # Unichain
-    480: "0xef9889B4e443DEd35FA0Bd060f2104Cca94e6A43",  # World Chain
-    143: "0xfd70575B732F9482F4197FE1075492e114E97302",  # Monad
-    999: "0x517505be22D9068687334e69ae7a02fC77edf4Fc",  # HyperEVM
-    988: "0xbCB063D4B6D479b209C186e462828CBACaC82DbE",  # Stable
-    747474: "0x39EB6Da5e88194C82B13491Df2e8B3E213eD2412",  # Katana
+PUBLIC_ALLOCATOR_ADDRESSES: dict[ChainId, ChecksumAddress] = {
+    ChainId(1): Web3.to_checksum_address(
+        "0xfd32fA2ca22c76dD6E550706Ad913FC6CE91c75D"
+    ),  # Ethereum
+    ChainId(10): Web3.to_checksum_address(
+        "0x0d68a97324E602E02799CD83B42D337207B40658"
+    ),  # OP Mainnet
+    ChainId(137): Web3.to_checksum_address(
+        "0xfac15aff53ADd2ff80C2962127C434E8615Df0d3"
+    ),  # Polygon
+    ChainId(8453): Web3.to_checksum_address(
+        "0xA090dD1a701408Df1d4d0B85b716c87565f90467"
+    ),  # Base
+    ChainId(42161): Web3.to_checksum_address(
+        "0x769583Af5e9D03589F159EbEC31Cc2c23E8C355E"
+    ),  # Arbitrum One
+    ChainId(130): Web3.to_checksum_address(
+        "0xB0c9a107fA17c779B3378210A7a593e88938C7C9"
+    ),  # Unichain
+    ChainId(480): Web3.to_checksum_address(
+        "0xef9889B4e443DEd35FA0Bd060f2104Cca94e6A43"
+    ),  # World Chain
+    ChainId(143): Web3.to_checksum_address(
+        "0xfd70575B732F9482F4197FE1075492e114E97302"
+    ),  # Monad
+    ChainId(999): Web3.to_checksum_address(
+        "0x517505be22D9068687334e69ae7a02fC77edf4Fc"
+    ),  # HyperEVM
+    ChainId(988): Web3.to_checksum_address(
+        "0xbCB063D4B6D479b209C186e462828CBACaC82DbE"
+    ),  # Stable
+    ChainId(747474): Web3.to_checksum_address(
+        "0x39EB6Da5e88194C82B13491Df2e8B3E213eD2412"
+    ),  # Katana
 }
 
 _MARKET_QUERY = """

{ipor_fusion-4.0.0.dev74 → ipor_fusion-4.0.0.dev78}/src/ipor_fusion/readers/hypercore.py

@@ -50,6 +50,7 @@ from ipor_fusion.fuses.hypercore import (
 from ipor_fusion.market_ids import IporFusionMarkets
 from ipor_fusion.substrates import decode_substrate
 from ipor_fusion.types import (
+    ChainId,
     FuseAddress,
     HyperCoreActionId,
     HyperCoreAsset,
@@ -66,12 +67,12 @@ T = TypeVar("T")
 #: New HyperCore vaults use market 55; the abandoned pilot still keys 54.
 HYPERCORE_MARKET = MarketId(IporFusionMarkets.HYPERCORE)
 #: The only chain with the HyperCore precompiles.
-HYPEREVM_CHAIN_ID = 999
+HYPEREVM_CHAIN_ID = ChainId(999)
 #: Known ``HyperCorePendingReader`` deployments per chain. The reader is a
 #: stateless helper and any deployment serves any vault. The market-55 reader
 #: is pinned in ``tests/fixtures/hypercore_market55.json`` until ``ipor-abi``
 #: publishes it.
-HYPERCORE_PENDING_READERS: dict[int, ChecksumAddress] = {
+HYPERCORE_PENDING_READERS: dict[ChainId, ChecksumAddress] = {
     HYPEREVM_CHAIN_ID: Web3.to_checksum_address(
         "0x83F54bc9eA4Dd19cb579Daa70368562C7a7534C4"
     ),

{ipor_fusion-4.0.0.dev74 → ipor_fusion-4.0.0.dev78}/src/ipor_fusion/readers/lending_health.py

@@ -24,7 +24,6 @@ from ipor_fusion.market_ids import IporFusionMarkets
 from ipor_fusion.readers.aave_v3 import AaveV3Reader
 from ipor_fusion.readers.aave_v4 import AaveV4OracleReader, AaveV4SpokeReader
 from ipor_fusion.readers.morpho import (
-    MORPHO_BLUE_ADDRESSES,
     MorphoReader,
     morpho_blue_address,
 )
@@ -43,25 +42,21 @@ WAD = 10**18
 RAY = 10**27
 ORACLE_PRICE_SCALE = 10**36
 
-# Deprecated: only valid on Ethereum and Base — use `morpho_blue_address(chain_id)`.
-# Kept so existing imports keep resolving.
-MORPHO_BLUE_ADDRESS: ChecksumAddress = MORPHO_BLUE_ADDRESSES[1]
-
 # Aave V3 Core Pool per chain — the Pool of market AAVE_V3 only. Aave V3 Prime
 # and SparkLend run on their own Pools, so a market's Pool is read from its
 # balance fuse (`AaveV3FuseReader.pool`); this map is only the fallback of
 # `fetch_vault_lending_health` for callers that pass no `aave_pools`.
-AAVE_V3_POOL: dict[int, ChecksumAddress] = {
-    1: Web3.to_checksum_address(
+AAVE_V3_POOL: dict[ChainId, ChecksumAddress] = {
+    ChainId(1): Web3.to_checksum_address(
         "0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2"
     ),  # Ethereum
-    42161: Web3.to_checksum_address(
+    ChainId(42161): Web3.to_checksum_address(
         "0x794a61358D6845594F94dc1DB02A252b5b4814aD"
     ),  # Arbitrum
-    8453: Web3.to_checksum_address(
+    ChainId(8453): Web3.to_checksum_address(
         "0xA238Dd80C259a72e81d7e4664a9801593F98d1c5"
     ),  # Base
-    10: Web3.to_checksum_address(
+    ChainId(10): Web3.to_checksum_address(
         "0x794a61358D6845594F94dc1DB02A252b5b4814aD"
     ),  # Optimism
 }

{ipor_fusion-4.0.0.dev74 → ipor_fusion-4.0.0.dev78}/src/ipor_fusion/readers/morpho.py

@@ -29,19 +29,19 @@ _addr = Web3.to_checksum_address
 
 # Morpho Blue sits at its CREATE2 address (0xBBBB…EEFFCb) on Ethereum and Base
 # only; every other chain carries an independent deployment. Keyed by chain ID.
-MORPHO_BLUE_ADDRESSES: dict[int, ChecksumAddress] = {
-    1: _addr("0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb"),  # Ethereum
-    8453: _addr("0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb"),  # Base
-    42161: _addr("0x6c247b1F6182318877311737BaC0844bAa518F5e"),  # Arbitrum One
-    130: _addr("0x8f5ae9CddB9f68de460C77730b018Ae7E04a140A"),  # Unichain
-    143: _addr("0xD5D960E8C380B724a48AC59E2DfF1b2CB4a1eAee"),  # Monad
-    999: _addr("0x68e37dE8d93d3496ae143F2E900490f6280C57cD"),  # HyperEVM
-    4663: _addr("0x9D53d5E3bd5E8d4Cbfa6DB1ca238AEA02E651010"),  # Robinhood
-    747474: _addr("0xD50F2DffFd62f94Ee4AEd9ca05C61d0753268aBc"),  # Katana
+MORPHO_BLUE_ADDRESSES: dict[ChainId, ChecksumAddress] = {
+    ChainId(1): _addr("0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb"),  # Ethereum
+    ChainId(8453): _addr("0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb"),  # Base
+    ChainId(42161): _addr("0x6c247b1F6182318877311737BaC0844bAa518F5e"),  # Arbitrum One
+    ChainId(130): _addr("0x8f5ae9CddB9f68de460C77730b018Ae7E04a140A"),  # Unichain
+    ChainId(143): _addr("0xD5D960E8C380B724a48AC59E2DfF1b2CB4a1eAee"),  # Monad
+    ChainId(999): _addr("0x68e37dE8d93d3496ae143F2E900490f6280C57cD"),  # HyperEVM
+    ChainId(4663): _addr("0x9D53d5E3bd5E8d4Cbfa6DB1ca238AEA02E651010"),  # Robinhood
+    ChainId(747474): _addr("0xD50F2DffFd62f94Ee4AEd9ca05C61d0753268aBc"),  # Katana
 }
 
 
-def _chain_label(chain_id: int) -> str:
+def _chain_label(chain_id: ChainId) -> str:
     name = CHAIN_NAMES.get(chain_id)
     return f"{chain_id} ({name})" if name else str(chain_id)
 

{ipor_fusion-4.0.0.dev74 → ipor_fusion-4.0.0.dev78}/src/ipor_fusion/substrates.py

@@ -511,7 +511,7 @@ _register_markets([11], _decode_euler_v2)
 # Async Action (typed: amount-to-outside / target+selector / exit slippage)
 _register_markets([40], _decode_async_action)
 # External State (typed: asset / target+selector / custodian / balance account
-# / four uint248 guards). RWA (50) is the deprecated alias of EXTERNAL_STATE.
+# / four uint248 guards).
 _register_markets([50], _decode_external_state)
 # Uniswap V4 (id 53 per IporFusionMarkets.sol): PoolId or pool currency.
 # TERM_FINANCE (52) stays unregistered on purpose — its substrate library is
@@ -539,10 +539,9 @@ _register_markets([55], _decode_hypercore)
 
 
 def _build_market_lookup() -> dict[int, str]:
-    aliases = IporFusionMarkets._DEPRECATED_ALIASES
     lookup: dict[int, str] = {}
     for name in dir(IporFusionMarkets):
-        if name.startswith("_") or name in aliases:
+        if name.startswith("_"):
             continue
         val = getattr(IporFusionMarkets, name)
         if isinstance(val, int):

{ipor_fusion-4.0.0.dev74 → ipor_fusion-4.0.0.dev78}/src/ipor_fusion/vault_info.py

@@ -48,15 +48,15 @@ from ipor_fusion.vault_data import (
     resolve_token_symbol,
 )
 
-BLOCK_EXPLORER_URLS: dict[int, str] = {
-    1: "https://etherscan.io",
-    42161: "https://arbiscan.io",
-    8453: "https://basescan.org",
-    10: "https://optimistic.etherscan.io",
-    137: "https://polygonscan.com",
-    56: "https://bscscan.com",
-    43114: "https://snowtrace.io",
-    250: "https://ftmscan.com",
+BLOCK_EXPLORER_URLS: dict[ChainId, str] = {
+    ChainId(1): "https://etherscan.io",
+    ChainId(42161): "https://arbiscan.io",
+    ChainId(8453): "https://basescan.org",
+    ChainId(10): "https://optimistic.etherscan.io",
+    ChainId(137): "https://polygonscan.com",
+    ChainId(56): "https://bscscan.com",
+    ChainId(43114): "https://snowtrace.io",
+    ChainId(250): "https://ftmscan.com",
 }
 
 IPOR_APP_URL = "https://app.ipor.io/fusion"

{ipor_fusion-4.0.0.dev74 → ipor_fusion-4.0.0.dev78}/tests/test_cli_lending_health.py

@@ -15,7 +15,6 @@ from ipor_fusion.readers.lending_health import (
     AAVE_V3_MARKET_IDS,
     AAVE_V3_POOL,
     AAVE_V4_MARKET_IDS,
-    MORPHO_BLUE_ADDRESS,
     MORPHO_MARKET_IDS,
     ORACLE_PRICE_SCALE,
     LendingMarketHealth,
@@ -26,8 +25,8 @@ from ipor_fusion.readers.lending_health import (
     _shares_to_assets_up,
     fetch_vault_lending_health,
 )
-from ipor_fusion.readers.morpho import MorphoReader
-from ipor_fusion.types import MorphoBlueMarketId
+from ipor_fusion.readers.morpho import MorphoReader, morpho_blue_address
+from ipor_fusion.types import ChainId, MorphoBlueMarketId
 
 VAULT_ADDR = Web3.to_checksum_address("0x1111111111111111111111111111111111111111")
 ORACLE_ADDR = Web3.to_checksum_address("0xdDdDddDdDdddDDddDDddDDDDdDdDDdDDdDDDDDDd")
@@ -84,7 +83,7 @@ def _aave_v4_substrate(spoke: str, reserve_id: int, flags: int) -> bytes:
 
 def _make_morpho_reader():
     ctx = MagicMock()
-    return MorphoReader(ctx, MORPHO_BLUE_ADDRESS), ctx
+    return MorphoReader(ctx, morpho_blue_address(ChainId(1))), ctx
 
 
 def _make_aave_reader():

{ipor_fusion-4.0.0.dev74 → ipor_fusion-4.0.0.dev78}/tests/test_solidity_mirrors.py

@@ -246,12 +246,10 @@ def test_no_argument_calldata_matches_the_contract(path, function, calldata):
 
 def test_market_ids_mirror_ipor_fusion_markets_sol():
     solidity = _solidity_constants("IporFusionMarkets.sol")
-    aliases = IporFusionMarkets._DEPRECATED_ALIASES
     python = {
         name: value
         for name in dir(IporFusionMarkets)
         if not name.startswith("_")
-        and name not in aliases
         and isinstance(value := getattr(IporFusionMarkets, name), int)
     }
     for name, value in _AHEAD_OF_UPSTREAM.items():

{ipor_fusion-4.0.0.dev74 → ipor_fusion-4.0.0.dev78}/tests/test_substrates.py

@@ -281,11 +281,8 @@ def test_market_without_decoder_is_labelled_not_guessed():
     assert info.type_label == "no_decoder(VELODROME_SUPERCHAIN)"
 
 
-def test_external_state_is_canonical_name_and_rwa_is_alias():
-    # Market 50 is EXTERNAL_STATE; RWA remains a backward-compatible alias of
-    # the same value, but the canonical name is what id->name lookups display.
+def test_external_state_is_market_50():
     assert IporFusionMarkets.EXTERNAL_STATE == 50
-    assert IporFusionMarkets.RWA == IporFusionMarkets.EXTERNAL_STATE
     assert market_name(50) == "EXTERNAL_STATE"