ipor-fusion 4.1.0.dev52__tar.gz → 4.1.0.dev56__tar.gz

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ipor-fusion
-Version: 4.1.0.dev52
+Version: 4.1.0.dev56
 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.1.0.dev52 → ipor_fusion-4.1.0.dev56}/pyproject.toml

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

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/src/ipor_fusion/__init__.py

@@ -325,6 +325,7 @@ from ipor_fusion.readers.oracle_mapping_nodes import (
     Erc4626DetailJson,
     MiddlewareFallbackDetailJson,
     MorphoFeedDetailJson,
+    MorphoOracleFeedJson,
     OracleAssetJson,
     OracleMappingJson,
     OracleNodeJson,
@@ -760,6 +761,7 @@ __all__ = [
     "Erc4626DetailJson",
     "MiddlewareFallbackDetailJson",
     "MorphoFeedDetailJson",
+    "MorphoOracleFeedJson",
     "OracleAssetJson",
     "OracleMappingJson",
     "OracleNodeJson",

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/src/ipor_fusion/core/context.py

@@ -100,6 +100,10 @@ class Web3Context:
         log_source: LogSource | None = None,
         cache: ContractCache | None = None,
     ):
+        # EIP-3668: web3 would otherwise follow a contract's OffchainLookup
+        # revert from inside eth.call, sending an HTTP request to a URL chosen
+        # by whoever deployed the contract. Nothing in the SDK reads through it.
+        web3.provider.global_ccip_read_enabled = False
         self._web3 = web3
         self._chain_id = chain_id
         # Bounds of every `get_logs` scan: wall clock, and eth_getLogs requests

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/src/ipor_fusion/errors.py

@@ -132,7 +132,9 @@ def get_revert_reason(web3: Web3, tx_hash: TxHash, receipt: TxReceipt) -> str |
             call_params["gas"] = tx["gas"]
 
         block_number = receipt["blockNumber"]
-        web3.eth.call(call_params, block_identifier=block_number)
+        web3.eth.call(
+            call_params, block_identifier=block_number, ccip_read_enabled=False
+        )
         return None  # replay succeeded — can't determine reason
     except Exception as exc:
         exc_data = getattr(exc, "data", None)

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/src/ipor_fusion/mcp/models.py

@@ -564,11 +564,21 @@ class Erc4626Detail(_Base):
     rate: str | None
 
 
+class MorphoOracleFeed(AggregatorFeedDetail):
+    """A feed behind a Morpho oracle; role names the getter it came from."""
+
+    role: str
+
+
 class MorphoFeedDetail(_Base):
     morpho_oracle: str
     collateral_token: str | None
     loan_token: str
     morpho_price: str | None
+    oracle_feeds: list[MorphoOracleFeed] | None = Field(
+        description="Feeds the oracle uses; null when it does not expose them, "
+        "so their freshness cannot be read."
+    )
 
 
 class MiddlewareFallbackDetail(_Base):

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/src/ipor_fusion/mcp/server.py

@@ -468,7 +468,9 @@ def vault_oracle_mapping(
     description, a foreign getter answering; still resolved, but verify the
     address yourself if identity matters), ERC4626PriceFeed (share→asset
     rate, recurses on the underlying), CollateralTokenOnMorphoMarketPriceFeed
-    (recurses on the loan token), middleware_fallback (no per-vault source;
+    (recurses on the loan token; source_detail.oracle_feeds lists the feeds
+    behind the Morpho oracle, null when it does not expose them),
+    middleware_fallback (no per-vault source;
     priced by the oracle's underlying global middleware, followed as a
     dependency when discoverable), custom_unknown (partial). Classification is
     heuristic interface probing: it grades on-chain evidence and cannot prove

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/src/ipor_fusion/readers/__init__.py

@@ -45,6 +45,7 @@ from ipor_fusion.readers.oracle_mapping_nodes import (
     Erc4626DetailJson,
     MiddlewareFallbackDetailJson,
     MorphoFeedDetailJson,
+    MorphoOracleFeedJson,
     OracleAssetJson,
     OracleMappingJson,
     OracleNodeJson,
@@ -94,6 +95,7 @@ __all__ = [
     "Erc4626DetailJson",
     "MiddlewareFallbackDetailJson",
     "MorphoFeedDetailJson",
+    "MorphoOracleFeedJson",
     "OracleAssetJson",
     "OracleMappingJson",
     "OracleNodeJson",

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/src/ipor_fusion/readers/oracle_mapping.py

@@ -9,7 +9,8 @@ collateral feeds). Unknown feeds are reported as partial, never dropped.
 A zero source is not a dead end: the oracle may be a manager variant that
 delegates such assets to an underlying global middleware — that delegation is
 followed and reported as ``middleware_fallback``. Every aggregator-compatible
-read (Chainlink-tier leaves, dual-cross-reference component feeds) carries
+read (Chainlink-tier leaves, dual-cross-reference component feeds, feeds
+behind a Morpho oracle) carries
 ``description()`` and the full ``latestRoundData()`` round in
 ``source_detail`` — raw values plus ISO-8601 UTC twins of the timestamps,
 no staleness judgment; ``description`` is null when the feed does not
@@ -83,6 +84,7 @@ from ipor_fusion.readers.oracle_mapping_nodes import (
     _apply_dependency_status,
     _collect_unresolved,
     _mapping_status,
+    _morpho_oracle_feeds,
     _partial,
     _price_block,
     _resolve_chainlink,
@@ -181,6 +183,7 @@ def _resolve_morpho(
         "collateral_token": collateral,
         "loan_token": loan,
         "morpho_price": str(price) if price is not None else None,
+        "oracle_feeds": _morpho_oracle_feeds(reader, morpho_oracle),
     }
     dep = _resolve(reader, loan, depth + 1, visited, max_depth)
     node.dependencies = [dep]

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/src/ipor_fusion/readers/oracle_mapping_nodes.py

@@ -30,6 +30,12 @@ TYPE_CHAINLINK = "ChainlinkAggregator"
 TYPE_CHAINLINK_STYLE = "chainlink_style"
 TYPE_ERC4626 = "ERC4626PriceFeed"
 TYPE_MORPHO = "CollateralTokenOnMorphoMarketPriceFeed"
+MORPHO_ORACLE_FEED_ROLES = (
+    "BASE_FEED_1",
+    "BASE_FEED_2",
+    "QUOTE_FEED_1",
+    "QUOTE_FEED_2",
+)
 TYPE_DUAL_XREF = "DualCrossReferencePriceFeed"
 TYPE_MIDDLEWARE_FALLBACK = "middleware_fallback"
 TYPE_UNKNOWN = "custom_unknown"
@@ -83,11 +89,21 @@ class Erc4626DetailJson(TypedDict):
     rate: str | None
 
 
+class MorphoOracleFeedJson(AggregatorFeedDetailJson):
+    """A feed behind a Morpho oracle; ``role`` names the getter it came from."""
+
+    role: str
+
+
 class MorphoFeedDetailJson(TypedDict):
+    """``oracle_feeds`` lists the feeds the oracle uses; null when the oracle
+    does not expose them, so their freshness cannot be read."""
+
     morpho_oracle: ChecksumAddress
     collateral_token: ChecksumAddress | None
     loan_token: ChecksumAddress
     morpho_price: str | None
+    oracle_feeds: list[MorphoOracleFeedJson] | None
 
 
 class MiddlewareFallbackDetailJson(TypedDict):
@@ -413,6 +429,31 @@ def _resolve_chainlink(
     return node
 
 
+def _morpho_oracle_feeds(
+    reader: OracleMappingReader, morpho_oracle: ChecksumAddress
+) -> list[MorphoOracleFeedJson] | None:
+    """The feeds behind a Morpho oracle, skipping its unused (zero) slots."""
+    feeds: list[MorphoOracleFeedJson] = []
+    for role in MORPHO_ORACLE_FEED_ROLES:
+        address = reader.morpho_oracle_feed(morpho_oracle, role)
+        if address is None:
+            return None
+        if address.lower() == ZERO_ADDRESS:
+            continue
+        feeds.append(
+            {
+                "address": address,
+                **_aggregator_detail(
+                    reader.feed_description(address),
+                    reader.feed_latest_round_data(address),
+                    reader.feed_decimals(address),
+                ),
+                "role": role,
+            }
+        )
+    return feeds
+
+
 def _resolve_dual_xref(
     reader: OracleMappingReader,
     node: OracleNode,

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/src/ipor_fusion/readers/oracle_mapping_reader.py

@@ -59,6 +59,9 @@ class _MorphoOracle(ContractWrapper):
     def price(self) -> Call[int]:
         return self._view("price()", output_types=["uint256"], decoder=int)
 
+    def feed(self, role: str) -> Call[ChecksumAddress]:
+        return self._view(f"{role}()", output_types=["address"], decoder=_addr)
+
 
 class _DualXrefFeed(ContractWrapper):
     def asset_x(self) -> Call[ChecksumAddress]:
@@ -222,6 +225,11 @@ class OracleMappingReader:
     def morpho_oracle_price(self, morpho_oracle: ChecksumAddress) -> int | None:
         return self._safe(_MorphoOracle(morpho_oracle).price())
 
+    def morpho_oracle_feed(
+        self, morpho_oracle: ChecksumAddress, role: str
+    ) -> ChecksumAddress | None:
+        return self._safe(_MorphoOracle(morpho_oracle).feed(role))
+
     def feed_asset_x(self, source: ChecksumAddress) -> ChecksumAddress | None:
         return self._safe(_DualXrefFeed(source).asset_x())
 

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/tests/_oracle_mapping_fake.py

@@ -52,6 +52,7 @@ class FakeReader:
         self.feeds: dict[str, Feed] = {}
         self.vaults: dict[str, Erc4626] = {}
         self.morpho_prices: dict[str, int] = {}
+        self.morpho_feeds: dict[str, dict[str, str]] = {}
         # oracle variant (middleware-fallback resolution); "_mw" because the
         # exact method name would be shadowed by the attribute
         self.underlying_mw: str | None = None
@@ -125,6 +126,9 @@ class FakeReader:
     def morpho_oracle_price(self, o: str) -> int | None:
         return self.morpho_prices.get(o)
 
+    def morpho_oracle_feed(self, o: str, role: str) -> str | None:
+        return self.morpho_feeds.get(o, {}).get(role)
+
     def feed_asset_x(self, s: str) -> str | None:
         return self._f(s).get("asset_x")
 

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/tests/fixtures/oracle_mapping_golden/mapping.json

@@ -300,7 +300,22 @@
         "morpho_oracle": "0x0000000000000000000000000000000000000031",
         "collateral_token": "0x0000000000000000000000000000000000000006",
         "loan_token": "0x0000000000000000000000000000000000000001",
-        "morpho_price": "970000000000000000000000"
+        "morpho_price": "970000000000000000000000",
+        "oracle_feeds": [
+          {
+            "address": "0x0000000000000000000000000000000000000032",
+            "description": "COLL / LOAN",
+            "round_id": "9",
+            "answer": "970000000000000000",
+            "decimals": 18,
+            "started_at": 1700000000,
+            "started_at_utc": "2023-11-14T22:13:20Z",
+            "updated_at": 1700000050,
+            "updated_at_utc": "2023-11-14T22:14:10Z",
+            "answered_in_round": "9",
+            "role": "BASE_FEED_1"
+          }
+        ]
       },
       "dependencies": [
         {

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/tests/fixtures/oracle_mapping_golden/mapping.mcp.json

@@ -300,7 +300,22 @@
         "morpho_oracle": "0x0000000000000000000000000000000000000031",
         "collateral_token": "0x0000000000000000000000000000000000000006",
         "loan_token": "0x0000000000000000000000000000000000000001",
-        "morpho_price": "970000000000000000000000"
+        "morpho_price": "970000000000000000000000",
+        "oracle_feeds": [
+          {
+            "address": "0x0000000000000000000000000000000000000032",
+            "description": "COLL / LOAN",
+            "round_id": "9",
+            "answer": "970000000000000000",
+            "decimals": 18,
+            "started_at": 1700000000,
+            "started_at_utc": "2023-11-14T22:13:20Z",
+            "updated_at": 1700000050,
+            "updated_at_utc": "2023-11-14T22:14:10Z",
+            "answered_in_round": "9",
+            "role": "BASE_FEED_1"
+          }
+        ]
       },
       "dependencies": [
         {

ipor_fusion-4.1.0.dev56/tests/test_ccip_read_disabled.py

@@ -0,0 +1,96 @@
+"""A contract must not be able to make the SDK send an HTTP request.
+
+EIP-3668 lets a contract revert with `OffchainLookup(urls, ...)`, which web3
+follows by default from inside `eth.call`. Any address a caller passes is
+therefore a request to a URL chosen by whoever deployed the contract.
+"""
+
+from typing import Any
+from unittest.mock import patch
+
+import pytest
+from eth_abi import encode
+from eth_typing import URI
+from web3 import Web3
+from web3.providers.base import BaseProvider
+from web3.types import RPCEndpoint, RPCResponse
+
+from ipor_fusion import NotPlasmaVaultError, Web3Context
+from ipor_fusion.core.access import resolve_access_manager
+from ipor_fusion.errors import get_revert_reason
+
+ADDRESS = Web3.to_checksum_address("0x" + "11" * 20)
+OFFCHAIN_LOOKUP_SELECTOR = bytes.fromhex("556f1830")
+LOOKUP_URL = "https://192.0.2.1/lookup"
+
+
+def _offchain_lookup_revert() -> str:
+    args = encode(
+        ["address", "string[]", "bytes", "bytes4", "bytes"],
+        [ADDRESS, [LOOKUP_URL], b"", b"\xd8\xd7\x86\x9d", b""],
+    )
+    return "0x" + (OFFCHAIN_LOOKUP_SELECTOR + args).hex()
+
+
+class _LookupProvider(BaseProvider):
+    """A chain where `ADDRESS` has code and reverts every call with a lookup."""
+
+    def make_request(self, method: RPCEndpoint, params: Any) -> RPCResponse:
+        if method == "eth_call":
+            return {
+                "jsonrpc": "2.0",
+                "id": 1,
+                "error": {
+                    "code": 3,
+                    "message": "execution reverted",
+                    "data": _offchain_lookup_revert(),
+                },
+            }
+        results: dict[str, Any] = {
+            "eth_chainId": "0x1",
+            "eth_getCode": "0x6000",
+            "eth_getTransactionByHash": {
+                "blockHash": "0x" + "22" * 32,
+                "blockNumber": "0x1",
+                "from": ADDRESS,
+                "gas": "0x5208",
+                "gasPrice": "0x1",
+                "hash": "0x" + "33" * 32,
+                "input": "0x",
+                "nonce": "0x0",
+                "to": ADDRESS,
+                "transactionIndex": "0x0",
+                "value": "0x0",
+                "type": "0x0",
+                "v": "0x1b",
+                "r": "0x1",
+                "s": "0x1",
+            },
+        }
+        return {"jsonrpc": "2.0", "id": 1, "result": results[method]}
+
+    def endpoint_uri(self) -> URI:
+        return URI("test://lookup")
+
+
+def _web3() -> Web3:
+    return Web3(_LookupProvider())
+
+
+def test_context_built_on_any_web3_does_not_follow_a_lookup() -> None:
+    ctx = Web3Context(web3=_web3(), chain_id=1)
+
+    with patch("requests.Session.request") as request:
+        with pytest.raises(NotPlasmaVaultError):
+            resolve_access_manager(ctx, ADDRESS)
+
+    request.assert_not_called()
+
+
+def test_revert_replay_does_not_follow_a_lookup() -> None:
+    receipt: Any = {"blockNumber": 1}
+
+    with patch("requests.Session.request") as request:
+        get_revert_reason(_web3(), bytes.fromhex("33" * 32), receipt)
+
+    request.assert_not_called()

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/tests/test_cli_oracle_mapping_golden.py

@@ -154,6 +154,17 @@ def _reader() -> FakeReader:
         "loan": USDC,
     }
     r.morpho_prices[addr(0x31)] = 970_000 * 10**18
+    r.morpho_feeds[addr(0x31)] = {
+        "BASE_FEED_1": addr(0x32),
+        "BASE_FEED_2": addr(0),
+        "QUOTE_FEED_1": addr(0),
+        "QUOTE_FEED_2": addr(0),
+    }
+    r.feeds[addr(0x32)] = {
+        "round": (9, 97 * 10**16, 1_700_000_000, 1_700_000_050, 9),
+        "feed_decimals": 18,
+        "description": "COLL / LOAN",
+    }
 
     r.symbols[WAT] = "WAT"
     r.decimals[WAT] = 18

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/tests/test_oracle_mapping.py

@@ -270,6 +270,53 @@ class TestResolve:
         assert [d.asset for d in node.dependencies] == [loan]
         assert node.path[:2] == ["COLL", "Morpho collateral/loan oracle"]
 
+    def test_morpho_oracle_feeds_report_their_rounds_and_skip_unused_slots(self):
+        r = FakeReader()
+        coll, loan = addr(1), addr(2)
+        feed, m_oracle, base_feed = addr(0x11), addr(0x31), addr(0x41)
+        r.sources[coll] = feed
+        r.prices[coll] = Price(asset=coll, amount=10**8, decimals=8)
+        r.feeds[feed] = {"morpho_oracle": m_oracle, "collateral": coll, "loan": loan}
+        r.feeds[base_feed] = {
+            "round": (7, 10**18, 1_700_000_000, 1_700_000_100, 7),
+            "feed_decimals": 18,
+            "description": "COLL / LOAN",
+        }
+        zero = addr(0)
+        r.morpho_feeds[m_oracle] = {
+            "BASE_FEED_1": base_feed,
+            "BASE_FEED_2": zero,
+            "QUOTE_FEED_1": zero,
+            "QUOTE_FEED_2": zero,
+        }
+        chainlink_asset(r, loan, addr(0x12), symbol="LOAN")
+
+        detail = om.resolve_asset(r, coll, max_depth=6).source_detail
+
+        assert detail is not None and "oracle_feeds" in detail
+        feeds = detail["oracle_feeds"]
+        assert feeds is not None
+        assert [(f["role"], f["address"]) for f in feeds] == [
+            ("BASE_FEED_1", base_feed)
+        ]
+        assert feeds[0]["description"] == "COLL / LOAN"
+        assert feeds[0]["updated_at"] == 1_700_000_100
+
+    def test_morpho_oracle_without_the_feed_getters_reports_none(self):
+        r = FakeReader()
+        coll, loan = addr(1), addr(2)
+        feed, m_oracle = addr(0x11), addr(0x31)
+        r.sources[coll] = feed
+        r.prices[coll] = Price(asset=coll, amount=10**8, decimals=8)
+        r.feeds[feed] = {"morpho_oracle": m_oracle, "collateral": coll, "loan": loan}
+        chainlink_asset(r, loan, addr(0x12), symbol="LOAN")
+
+        node = om.resolve_asset(r, coll, max_depth=6)
+
+        assert node.status == "resolved"
+        assert node.source_detail is not None and "oracle_feeds" in node.source_detail
+        assert node.source_detail["oracle_feeds"] is None
+
     def test_dual_xref_wins_over_chainlink(self):
         r = FakeReader()
         wsteth = addr(1)
@@ -1165,6 +1212,7 @@ class TestOracleMappingReader:
         assert reader.feed_asset_x_asset_y_feed(feed) == target
         assert reader.feed_asset_y_usd_feed(feed) == target
         assert reader.feed_aggregator(feed) == target
+        assert reader.morpho_oracle_feed(addr(0x31), "BASE_FEED_1") == target
 
         ctx.call.return_value = encode(["uint256"], [1_030_000])
         assert reader.morpho_oracle_price(addr(0x31)) == 1_030_000

{ipor_fusion-4.1.0.dev52 → ipor_fusion-4.1.0.dev56}/tests/test_public_api.py

@@ -228,6 +228,7 @@ _ALL_SNAPSHOT: dict[str, frozenset[str]] = {
             "MorphoClaimFuse",
             "MorphoCollateralFuse",
             "MorphoFeedDetailJson",
+            "MorphoOracleFeedJson",
             "MorphoFlashLoanFuse",
             "MorphoFlowCapConfigJson",
             "MorphoMarket",
@@ -952,6 +953,7 @@ _ALL_SNAPSHOT: dict[str, frozenset[str]] = {
             "MiddlewarePricedToken",
             "UnpriceableCheck",
             "MorphoFeedDetailJson",
+            "MorphoOracleFeedJson",
             "MorphoMarket",
             "MorphoMarketParams",
             "MorphoMarketRates",