ipor-fusion 4.1.0.dev35__tar.gz → 4.1.0.dev38__tar.gz

{ipor_fusion-4.1.0.dev35 → ipor_fusion-4.1.0.dev38}/PKG-INFO

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

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

{ipor_fusion-4.1.0.dev35 → ipor_fusion-4.1.0.dev38}/src/ipor_fusion/readers/oracle_mapping.py

@@ -236,15 +236,32 @@ def _resolve_middleware_fallback(
     node.source_type = TYPE_MIDDLEWARE_FALLBACK
     node.status = "resolved"
     if underlying_middleware is not None:
-        # Same asset, different oracle — must not be in `visited` yet; runaway
-        # manager→manager chains are bounded by max_depth instead.
-        dep = _resolve(
-            reader.delegate(underlying_middleware),
-            asset,
-            depth + 1,
-            visited,
-            max_depth,
-        )
+        # Same asset, different oracle: the asset key is not in `visited` yet,
+        # so the hop is keyed by (oracle, asset) — a manager chain that loops
+        # back ends as a cycle instead of running to max_depth.
+        hop = f"{underlying_middleware.lower()}/{asset.lower()}"
+        if hop in visited:
+            return _partial(
+                asset,
+                symbol,
+                decimals,
+                source,
+                TYPE_UNKNOWN,
+                "cycle_detected",
+                [label],
+                price,
+            )
+        visited.add(hop)
+        try:
+            dep = _resolve(
+                reader.delegate(underlying_middleware),
+                asset,
+                depth + 1,
+                visited,
+                max_depth,
+            )
+        finally:
+            visited.discard(hop)
         node.dependencies = [dep]
         # dep re-resolves the same asset, so drop its leading label from the path.
         node.path = [label, "middleware fallback", *dep.path[1:]]

{ipor_fusion-4.1.0.dev35 → ipor_fusion-4.1.0.dev38}/src/ipor_fusion/vault_data.py

@@ -312,7 +312,21 @@ def resolve_token_decimals(ctx: Web3Context, address: HexAddress) -> Decimals |
     return decimals
 
 
-def _block_timestamp(ctx: Web3Context, block: int) -> Timestamp:
+def _latest_head(ctx: Web3Context) -> tuple[int, Timestamp]:
+    """The latest block's number and timestamp from one read.
+
+    Reading the head number first and the block by number second can reach a
+    node behind a load balancer that has not seen that block yet.
+    """
+    head = ctx.web3.eth.get_block("latest")
+    return head["number"], head["timestamp"]
+
+
+def _block_timestamp(
+    ctx: Web3Context, block: int, known: Timestamp | None
+) -> Timestamp:
+    if known is not None:
+        return known
     return ctx.web3.eth.get_block(block)["timestamp"]
 
 
@@ -634,14 +648,18 @@ def fetch_vault_data(
     ensure_supported_chain(ctx.chain_id)
     if block is None:
         block = _pinned_default_block(ctx)
-    resolved_block = ctx.web3.eth.block_number if block is None else block
     is_latest = block is None
+    head_timestamp: Timestamp | None = None
+    if block is None:
+        resolved_block, head_timestamp = _latest_head(ctx)
+    else:
+        resolved_block = block
     ctx = ctx.at_block(resolved_block)
     plasma_vault = PlasmaVault(vault)
     with ThreadPoolExecutor() as pool:
         # Independent pipelines, each a short chain of batched reads; none of
         # them waits on a pool future, so they cannot starve the pool.
-        f_timestamp = pool.submit(_block_timestamp, ctx, resolved_block)
+        f_timestamp = pool.submit(_block_timestamp, ctx, resolved_block, head_timestamp)
         f_vault = pool.submit(_fetch_vault_reads, ctx, plasma_vault)
         f_fees = pool.submit(_fetch_fee_data, ctx, plasma_vault)
         f_withdraw = pool.submit(_fetch_withdraw_manager, ctx, plasma_vault)

{ipor_fusion-4.1.0.dev35 → ipor_fusion-4.1.0.dev38}/tests/test_cli_commands.py

@@ -443,7 +443,10 @@ class TestVaultInfo:
         mock_ctx.cache = NullCache()
         mock_ctx.web3.eth.block_number = 12345678
         mock_ctx.default_block = "latest"
-        mock_ctx.web3.eth.get_block.return_value = {"timestamp": 1700000000}
+        mock_ctx.web3.eth.get_block.return_value = {
+            "number": 12345678,
+            "timestamp": 1700000000,
+        }
         mock_ctx.chain_id = 1
         mock_ctx.at_block.return_value = mock_ctx
         mock_ctx_cls.from_url.return_value = mock_ctx
@@ -573,7 +576,10 @@ class TestVaultInfo:
         mock_ctx.cache = NullCache()
         mock_ctx.web3.eth.block_number = 12345678
         mock_ctx.default_block = "latest"
-        mock_ctx.web3.eth.get_block.return_value = {"timestamp": 1700000000}
+        mock_ctx.web3.eth.get_block.return_value = {
+            "number": 12345678,
+            "timestamp": 1700000000,
+        }
         mock_ctx.chain_id = 1
         mock_ctx.at_block.return_value = mock_ctx
         mock_ctx_cls.from_url.return_value = mock_ctx
@@ -654,7 +660,10 @@ class TestVaultInfo:
         mock_ctx.cache = NullCache()
         mock_ctx.web3.eth.block_number = 100
         mock_ctx.default_block = "latest"
-        mock_ctx.web3.eth.get_block.return_value = {"timestamp": 1700000000}
+        mock_ctx.web3.eth.get_block.return_value = {
+            "number": 100,
+            "timestamp": 1700000000,
+        }
         mock_ctx.chain_id = 1
         mock_ctx.at_block.return_value = mock_ctx
         mock_ctx_cls.from_url.return_value = mock_ctx
@@ -723,7 +732,10 @@ class TestVaultInfo:
         mock_ctx.cache = NullCache()
         mock_ctx.web3.eth.block_number = 100
         mock_ctx.default_block = "latest"
-        mock_ctx.web3.eth.get_block.return_value = {"timestamp": 1700000000}
+        mock_ctx.web3.eth.get_block.return_value = {
+            "number": 100,
+            "timestamp": 1700000000,
+        }
         mock_ctx.chain_id = 1
         mock_ctx.at_block.return_value = mock_ctx
         mock_ctx_cls.from_url.return_value = mock_ctx
@@ -804,7 +816,10 @@ class TestVaultInfo:
         mock_ctx.cache = NullCache()
         mock_ctx.web3.eth.block_number = 100
         mock_ctx.default_block = "latest"
-        mock_ctx.web3.eth.get_block.return_value = {"timestamp": 1700000000}
+        mock_ctx.web3.eth.get_block.return_value = {
+            "number": 100,
+            "timestamp": 1700000000,
+        }
         mock_ctx.web3.eth.get_transaction.return_value = {"blockNumber": 18500000}
         mock_ctx.chain_id = 1
         mock_ctx.at_block.return_value = mock_ctx
@@ -875,7 +890,10 @@ class TestVaultInfo:
         mock_ctx.cache = NullCache()
         mock_ctx.web3.eth.block_number = 100
         mock_ctx.default_block = "latest"
-        mock_ctx.web3.eth.get_block.return_value = {"timestamp": 1700000000}
+        mock_ctx.web3.eth.get_block.return_value = {
+            "number": 100,
+            "timestamp": 1700000000,
+        }
         mock_ctx.chain_id = 1
         mock_ctx.at_block.return_value = mock_ctx
         mock_ctx_cls.from_url.return_value = mock_ctx
@@ -986,7 +1004,10 @@ class TestVaultInfoJson:
         mock_ctx.chain_id = 1
         mock_ctx.web3.eth.block_number = 12345678
         mock_ctx.default_block = "latest"
-        mock_ctx.web3.eth.get_block.return_value = {"timestamp": 1700000000}
+        mock_ctx.web3.eth.get_block.return_value = {
+            "number": 12345678,
+            "timestamp": 1700000000,
+        }
         mock_ctx.chain_id = 1
         mock_ctx.at_block.return_value = mock_ctx
         mock_ctx_cls.from_url.return_value = mock_ctx
@@ -1165,7 +1186,10 @@ class TestVaultInfoJson:
         mock_ctx.cache = NullCache()
         mock_ctx.web3.eth.block_number = 100
         mock_ctx.default_block = "latest"
-        mock_ctx.web3.eth.get_block.return_value = {"timestamp": 1700000000}
+        mock_ctx.web3.eth.get_block.return_value = {
+            "number": 100,
+            "timestamp": 1700000000,
+        }
         mock_ctx.web3.eth.get_transaction.return_value = {"blockNumber": 18500000}
         mock_ctx.chain_id = 1
         mock_ctx.at_block.return_value = mock_ctx
@@ -1246,7 +1270,10 @@ class TestVaultInfoJson:
         mock_ctx.cache = NullCache()
         mock_ctx.web3.eth.block_number = 100
         mock_ctx.default_block = "latest"
-        mock_ctx.web3.eth.get_block.return_value = {"timestamp": 1700000000}
+        mock_ctx.web3.eth.get_block.return_value = {
+            "number": 100,
+            "timestamp": 1700000000,
+        }
         mock_ctx.chain_id = 1
         mock_ctx.at_block.return_value = mock_ctx
         mock_ctx_cls.from_url.return_value = mock_ctx

{ipor_fusion-4.1.0.dev35 → ipor_fusion-4.1.0.dev38}/tests/test_oracle_mapping.py

@@ -636,6 +636,26 @@ class TestResolve:
             "chainlink_feed_registry": None,
         }
 
+    def test_manager_delegating_to_itself_ends_as_a_cycle(self):
+        r = FakeReader()
+        weth = addr(1)
+        mw = addr(0x51)
+        zero = Web3.to_checksum_address(om.ZERO_ADDRESS)
+        r.symbols[weth] = "WETH"
+        r.decimals[weth] = 18
+        r.sources[weth] = zero
+        r.prices[weth] = Price(asset=weth, amount=2_000 * 10**18, decimals=18)
+        r.underlying_mw = mw
+        r.delegated = r  # the manager names itself as its underlying middleware
+
+        node = om.resolve_asset(r, weth, max_depth=50)
+
+        # one hop back to the same manager, not 50 down to max_depth
+        (dep,) = node.dependencies
+        assert dep.reason == "cycle_detected"
+        assert not dep.dependencies
+        assert node.status == "partially_resolved"
+
     def test_zero_underlying_middleware_treated_as_absent(self):
         r = FakeReader()
         asset = addr(1)

{ipor_fusion-4.1.0.dev35 → ipor_fusion-4.1.0.dev38}/tests/test_vault_data_block.py

@@ -5,7 +5,7 @@ import pytest
 from ipor_fusion import Web3Context
 from ipor_fusion.cache import NullCache
 from ipor_fusion.types import ChainId
-from ipor_fusion.vault_data import _pinned_default_block
+from ipor_fusion.vault_data import _latest_head, _pinned_default_block
 
 
 def _ctx() -> tuple[Web3Context, MagicMock]:
@@ -32,3 +32,13 @@ def test_tag_or_hash_resolves_to_its_number_once(tag: str):
     ctx, web3 = _ctx()
     assert _pinned_default_block(ctx.at_block(tag)) == 4242  # type: ignore[arg-type]
     web3.eth.get_block.assert_called_once_with(tag)
+
+
+def test_latest_head_reads_number_and_timestamp_in_one_call():
+    # The head number and then get_block(number) can reach a node behind a
+    # load balancer that has not seen that block yet.
+    web3 = MagicMock()
+    web3.eth.get_block.return_value = {"number": 4242, "timestamp": 1_700_000_000}
+    ctx = Web3Context(web3, ChainId(1), cache=NullCache())
+    assert _latest_head(ctx) == (4242, 1_700_000_000)
+    web3.eth.get_block.assert_called_once_with("latest")