ipor-fusion 4.0.0.dev39__tar.gz → 4.0.0.dev43__tar.gz

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev43}/PKG-INFO

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

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

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev43}/src/ipor_fusion/cli/vault_cmd.py

@@ -131,7 +131,7 @@ def add(address: ChecksumAddress, label: str | None, chain_id: ChainId | None) -
 
 @vault.command("remove")
 @click.argument("address", type=ADDRESS)
-def remove(address: str) -> None:
+def remove(address: ChecksumAddress) -> None:
     """Remove a saved vault."""
     cfg = load_config()
     before = len(cfg.vaults)

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev43}/src/ipor_fusion/crosschain/ccip/contracts.py

@@ -165,9 +165,12 @@ class CcipCrosschainExecutor(CrosschainExecutor):
             "lastRemoteStateVersion(uint256)", chain_id, output_types=["uint64"]
         )
 
-    def active_return(self, chain_id: ChainId) -> Call[bytes]:
+    def active_return(self, chain_id: ChainId) -> Call[OperationId]:
         return self._view(
-            "activeReturn(uint256)", chain_id, output_types=["bytes32"], decoder=bytes
+            "activeReturn(uint256)",
+            chain_id,
+            output_types=["bytes32"],
+            decoder=lambda v: OperationId(bytes(v)),
         )
 
     def active_command(self, chain_id: ChainId) -> Call[CommandId]:
@@ -194,11 +197,14 @@ class CcipCrosschainExecutor(CrosschainExecutor):
         every value-moving operation bumps to invalidate the active proposal."""
         return self._view("accountingEpoch(uint256)", chain_id, output_types=["uint64"])
 
-    def active_proposal_id(self, chain_id: ChainId) -> Call[int]:
+    def active_proposal_id(self, chain_id: ChainId) -> Call[ProposalId]:
         """``activeProposalId(uint256)``: the active balance proposal id for
         the chain, 0 when there is none."""
         return self._view(
-            "activeProposalId(uint256)", chain_id, output_types=["uint256"]
+            "activeProposalId(uint256)",
+            chain_id,
+            output_types=["uint256"],
+            decoder=ProposalId,
         )
 
     def attestation_anchor_principal(self, chain_id: ChainId) -> Call[Amount]:
@@ -233,7 +239,7 @@ class CcipCrosschainExecutor(CrosschainExecutor):
             "processedCcipMessage(bytes32)", message_id, output_types=["bool"]
         )
 
-    def propose_balance(self, observation: BalanceObservation) -> Call[int]:
+    def propose_balance(self, observation: BalanceObservation) -> Call[ProposalId]:
         """``BALANCE_PROPOSER`` only; ``settled_balance`` in local decimals.
 
         A write: ``.send()`` it, or ``.call()`` inside a simulation to preview
@@ -243,6 +249,7 @@ class CcipCrosschainExecutor(CrosschainExecutor):
             "proposeBalance(uint256,uint256,uint64,uint64,uint64,uint64,bytes32)",
             *observation.as_tuple(),
             output_types=["uint256"],
+            decoder=ProposalId,
         )
 
     def reject_balance_and_block(self, proposal_id: ProposalId) -> Call[None]:
@@ -285,9 +292,11 @@ class CcipCrosschainDispatcher(CrosschainDispatcher):
     def tracked_vaults_length(self) -> Call[int]:
         return self._view("trackedVaultsLength()", output_types=["uint256"])
 
-    def tracked_position_set_hash(self) -> Call[bytes]:
+    def tracked_position_set_hash(self) -> Call[PositionSetHash]:
         return self._view(
-            "trackedPositionSetHash()", output_types=["bytes32"], decoder=bytes
+            "trackedPositionSetHash()",
+            output_types=["bytes32"],
+            decoder=lambda v: PositionSetHash(bytes(v)),
         )
 
     def response_queue_head(self) -> Call[int]:

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev43}/src/ipor_fusion/crosschain/ccip/lane.py

@@ -22,7 +22,7 @@ from ipor_fusion.fuses.crosschain.ccip import (
     CcipCrosschainSupplyFuse,
     CcipSendParams,
 )
-from ipor_fusion.types import Amount, ChainId
+from ipor_fusion.types import Amount, ChainId, ProposalId
 
 
 class CcipLane(CrosschainLane):
@@ -134,7 +134,7 @@ class CcipLane(CrosschainLane):
             lambda observation: _to_lane(observation, rate)
         )
 
-    def propose_balance(self, observation: BalanceObservation) -> Call[int]:
+    def propose_balance(self, observation: BalanceObservation) -> Call[ProposalId]:
         """Returns the proposal id (the function's return value)."""
         self._require_spoke(observation)
         return self.executor.propose_balance(observation)

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev43}/src/ipor_fusion/crosschain/contracts.py

@@ -76,8 +76,10 @@ class CrosschainExecutor(ContractWrapper):
     def asset(self) -> Call[ChecksumAddress]:
         return self._view("ASSET()", output_types=["address"], decoder=_address)
 
-    def asset_id(self) -> Call[bytes]:
-        return self._view("ASSET_ID()", output_types=["bytes32"], decoder=bytes)
+    def asset_id(self) -> Call[AssetId]:
+        return self._view(
+            "ASSET_ID()", output_types=["bytes32"], decoder=lambda v: AssetId(bytes(v))
+        )
 
     def factory(self) -> Call[ChecksumAddress]:
         return self._view("FACTORY()", output_types=["address"], decoder=_address)
@@ -172,8 +174,10 @@ class CrosschainDispatcher(ContractWrapper):
     def asset(self) -> Call[ChecksumAddress]:
         return self._view("ASSET()", output_types=["address"], decoder=_address)
 
-    def asset_id(self) -> Call[bytes]:
-        return self._view("ASSET_ID()", output_types=["bytes32"], decoder=bytes)
+    def asset_id(self) -> Call[AssetId]:
+        return self._view(
+            "ASSET_ID()", output_types=["bytes32"], decoder=lambda v: AssetId(bytes(v))
+        )
 
     def factory(self) -> Call[ChecksumAddress]:
         return self._view("FACTORY()", output_types=["address"], decoder=_address)

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev43}/src/ipor_fusion/crosschain/stargate/contracts.py

@@ -170,9 +170,12 @@ class StargateCrosschainExecutor(CrosschainExecutor):
             "pendingTransferCount(uint256)", chain_id, output_types=["uint256"]
         )
 
-    def pending_request_by_chain(self, chain_id: ChainId) -> Call[int]:
+    def pending_request_by_chain(self, chain_id: ChainId) -> Call[DeploymentRequestId]:
         return self._view(
-            "pendingRequestByChain(uint256)", chain_id, output_types=["uint256"]
+            "pendingRequestByChain(uint256)",
+            chain_id,
+            output_types=["uint256"],
+            decoder=DeploymentRequestId,
         )
 
     def active_command(self, chain_id: ChainId) -> Call[ActiveCommand]:
@@ -191,9 +194,12 @@ class StargateCrosschainExecutor(CrosschainExecutor):
             decoder=_active_command_decoder,
         )
 
-    def active_proposal_id(self, chain_id: ChainId) -> Call[int]:
+    def active_proposal_id(self, chain_id: ChainId) -> Call[ProposalId]:
         return self._view(
-            "activeProposalId(uint256)", chain_id, output_types=["uint256"]
+            "activeProposalId(uint256)",
+            chain_id,
+            output_types=["uint256"],
+            decoder=ProposalId,
         )
 
     def last_approval_at(self, chain_id: ChainId) -> Call[int]:

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev43}/src/ipor_fusion/mcp/server.py

@@ -437,6 +437,7 @@ def vault_add(
         label: Human-readable label (fetched from on-chain name() if empty).
         chain_id: Chain ID (auto-detected when only one provider configured).
     """
+    checksum = Web3.to_checksum_address(address)
     cfg = load_config()
 
     if not chain_id:
@@ -451,26 +452,21 @@ def vault_add(
     if not label:
         provider_url = _resolve_provider(cfg, chain_id)
         ctx = Web3Context.from_url(provider_url)
-        checksum = Web3.to_checksum_address(address)
         try:
             label = PlasmaVault(ctx, checksum).name().call()
         except Exception:
             label = checksum
 
     for vault_entry in cfg.vaults:
-        if vault_entry.address.lower() == address.lower():
+        if vault_entry.address.lower() == checksum.lower():
             vault_entry.label = label
             vault_entry.chain_id = chain_id
             save_config(cfg)
-            return ActionResult(message=f"Vault {label} ({address}) updated.")
+            return ActionResult(message=f"Vault {label} ({checksum}) updated.")
 
-    cfg.vaults.append(
-        VaultEntry(
-            address=Web3.to_checksum_address(address), label=label, chain_id=chain_id
-        )
-    )
+    cfg.vaults.append(VaultEntry(address=checksum, label=label, chain_id=chain_id))
     save_config(cfg)
-    return ActionResult(message=f"Vault {label} ({address}) added.")
+    return ActionResult(message=f"Vault {label} ({checksum}) added.")
 
 
 @mcp.tool()
@@ -635,7 +631,7 @@ def market_meta_morpho(
         chain_id: EVM chain ID.
     """
     try:
-        info = fetch_vault(vault_address, chain_id)
+        info = fetch_vault(Web3.to_checksum_address(vault_address), chain_id)
     except MorphoApiError as exc:
         raise ValueError(str(exc)) from exc
     payload = build_meta_morpho_json(info, chain_id)

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev43}/src/ipor_fusion/morpho_api.py

@@ -91,7 +91,7 @@ class VaultFlowCap:
     fee_wei: int
     max_in: int
     max_out: int
-    admin: str | None  # the address that can configure these flow caps
+    admin: ChecksumAddress | None  # the address that can configure these flow caps
 
 
 @dataclass(slots=True)
@@ -106,7 +106,7 @@ class VaultAllocation:
     total_assets: int
     supply_assets: int  # currently allocated to *this* market
     supply_cap: int  # cap configured by curator for *this* market
-    allocators: list[str]  # addresses with ALLOCATOR_ROLE on the vault
+    allocators: list[ChecksumAddress]  # addresses with ALLOCATOR_ROLE on the vault
     flow_cap: VaultFlowCap | None  # None if PublicAllocator not configured
 
 
@@ -122,8 +122,8 @@ class MorphoApiMarket:
     collateral_token: ChecksumAddress
     collateral_symbol: str
     collateral_decimals: int
-    oracle: str
-    irm: str
+    oracle: ChecksumAddress
+    irm: ChecksumAddress
     supply_assets: int
     borrow_assets: int
     liquidity_assets: int
@@ -190,8 +190,8 @@ def _parse_market(raw: dict) -> MorphoApiMarket:
         collateral_token=_api_address(raw["collateralAsset"]["address"]),
         collateral_symbol=raw["collateralAsset"]["symbol"],
         collateral_decimals=int(raw["collateralAsset"]["decimals"]),
-        oracle=raw["oracle"]["address"],
-        irm=raw["irmAddress"],
+        oracle=_api_address(raw["oracle"]["address"]),
+        irm=_api_address(raw["irmAddress"]),
         supply_assets=int(state.get("supplyAssets") or 0),
         borrow_assets=int(state.get("borrowAssets") or 0),
         liquidity_assets=int(state.get("liquidityAssets") or 0),
@@ -283,8 +283,8 @@ class VaultV2Cap:
     market_id: MorphoBlueMarketId | None
     loan_token: ChecksumAddress | None
     collateral_token: ChecksumAddress | None
-    oracle: str | None
-    irm: str | None
+    oracle: ChecksumAddress | None
+    irm: ChecksumAddress | None
     lltv: int | None
 
     @property
@@ -378,7 +378,7 @@ class VaultV1Info:
 
 
 def fetch_vault(
-    address: str, chain_id: ChainId, *, timeout: float = 10.0
+    address: ChecksumAddress, chain_id: ChainId, *, timeout: float = 10.0
 ) -> VaultV2Info | VaultV1Info:
     """Fetch a Morpho vault by address. Tries V2 first, falls back to V1.
 
@@ -625,7 +625,7 @@ def _parse_vault_v1(raw: dict) -> VaultV1Info:
             fee_wei=int(pac.get("fee") or 0),
             max_in=0,
             max_out=0,
-            admin=pac.get("admin"),
+            admin=_api_optional_address(pac.get("admin")),
         )
         for fc in pac.get("flowCaps") or []:
             if raw_mid := (fc.get("market") or {}).get("marketId"):
@@ -687,10 +687,12 @@ def _parse_vault(raw: dict, market_id: MorphoBlueMarketId) -> VaultAllocation:
                 fee_wei=int(pac.get("fee") or 0),
                 max_in=int(flow_for_market.get("maxIn") or 0),
                 max_out=int(flow_for_market.get("maxOut") or 0),
-                admin=pac.get("admin"),
+                admin=_api_optional_address(pac.get("admin")),
             )
     allocators = [
-        a["address"] for a in (raw.get("allocators") or []) if a.get("address")
+        _api_address(a["address"])
+        for a in (raw.get("allocators") or [])
+        if a.get("address")
     ]
     return VaultAllocation(
         vault_address=_api_address(raw["address"]),

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev43}/tests/test_cli_market_morpho_blue.py

@@ -4,6 +4,7 @@
 import json
 from unittest.mock import MagicMock, patch
 
+import pytest
 from click.testing import CliRunner
 from eth_abi import encode
 from web3 import Web3
@@ -18,6 +19,7 @@ from ipor_fusion.morpho_api import (
     MorphoApiMarket,
     VaultAllocation,
     VaultFlowCap,
+    _parse_market,
     fetch_market,
     fetch_vault,
 )
@@ -786,3 +788,31 @@ class TestMetaMorphoCommand:
         assert len(market_caps) == 1
         assert market_caps[0]["loan_token"] == LOAN_TOKEN
         assert market_caps[0]["lltv"] == str(915 * 10**15)
+
+
+class TestMorphoApiAddresses:
+    def _raw(self, oracle: str) -> dict:
+        return {
+            "marketId": "0x" + MARKET_ID,
+            "lltv": "915000000000000000",
+            "loanAsset": {"address": LOAN_TOKEN.lower(), "symbol": "U", "decimals": 6},
+            "collateralAsset": {
+                "address": COLLATERAL_TOKEN,
+                "symbol": "C",
+                "decimals": 18,
+            },
+            "oracle": {"address": oracle},
+            "irmAddress": IRM.lower(),
+            "state": {},
+            "supplyingVaults": [],
+        }
+
+    def test_addresses_are_checksummed(self):
+        market = _parse_market(self._raw(ORACLE.lower()))
+        assert market.loan_token == LOAN_TOKEN
+        assert market.oracle == ORACLE
+        assert market.irm == IRM
+
+    def test_a_malformed_address_is_an_api_error(self):
+        with pytest.raises(MorphoApiError):
+            _parse_market(self._raw("invalid oracle"))

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev43}/tests/test_crosschain_lane.py

@@ -803,3 +803,17 @@ class TestDeploymentDiscovery:
         ccip = next(lane for lane in lanes if isinstance(lane, CcipLane))
         assert ccip.route == ROUTE and ccip.fuses == CCIP_FUSES
         assert ccip.decimal_conversion_rate == DECIMAL_CONVERSION_RATE
+
+
+def test_id_getters_decode_into_the_types_their_writes_take():
+    ccip = CcipCrosschainExecutor(MagicMock(), EXECUTOR)
+    stargate = StargateCrosschainExecutor(MagicMock(), EXECUTOR)
+    word = encode(["bytes32"], [b"\x01" * 32])
+    number = encode(["uint256"], [7])
+    chain = ChainId(1)
+    assert ccip.active_return(chain).decode(word) == b"\x01" * 32
+    assert ccip.asset_id().decode(word) == b"\x01" * 32
+    assert ccip.active_proposal_id(chain).decode(number) == 7
+    assert stargate.active_proposal_id(chain).decode(number) == 7
+    assert stargate.pending_request_by_chain(chain).decode(number) == 7
+    assert type(ccip.asset_id().decode(word)) is bytes

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev43}/tests/test_mcp_server.py

@@ -89,12 +89,15 @@ def _config_with_keyed_provider():
     return FusionConfig(providers={"1": "https://rpc.example.com/v2/SECRETKEY"})
 
 
-def _config_with_vault():
+_SAVED_VAULT = "0x43ee0243ea8cf02f7087d8b16c8d2007cc9c7ca2"
+
+
+def _config_with_vault(address: str = _SAVED_VAULT):
     from ipor_fusion.cli.config_store import FusionConfig, VaultEntry
 
     return FusionConfig(
         providers={"1": "https://rpc.example.com"},
-        vaults=[VaultEntry(address="0xABC", label="Test", chain_id=1)],
+        vaults=[VaultEntry(address=address, label="Test", chain_id=1)],
     )
 
 
@@ -264,7 +267,7 @@ class TestConfigShow:
     def test_config_with_vault(self, _):
         result = config_show()
         assert len(result.vaults) == 1
-        assert result.vaults[0].address == "0xABC"
+        assert result.vaults[0].address == Web3.to_checksum_address(_SAVED_VAULT)
 
     @patch(
         "ipor_fusion.mcp.server.load_config",
@@ -319,7 +322,7 @@ class TestVaultList:
     def test_with_vault(self, _):
         result = vault_list()
         assert len(result) == 1
-        assert result[0].address == "0xABC"
+        assert result[0].address == Web3.to_checksum_address(_SAVED_VAULT)
         assert result[0].label == "Test"
         assert result[0].chain_id == 1
 
@@ -348,13 +351,23 @@ class TestVaultAdd:
         with pytest.raises(ValueError):
             vault_add(address="0xDEF", label="New Vault", chain_id=1)
 
+    @patch("ipor_fusion.mcp.server.save_config")
+    @patch(
+        "ipor_fusion.mcp.server.load_config",
+        return_value=_config_with_vault("0xABC"),
+    )
+    def test_a_malformed_saved_entry_is_not_updated(self, mock_load, mock_save):
+        with pytest.raises(ValueError):
+            vault_add(address="0xABC", label="Updated", chain_id=1)
+        mock_save.assert_not_called()
+
     @patch("ipor_fusion.mcp.server.save_config")
     @patch(
         "ipor_fusion.mcp.server.load_config",
         return_value=_config_with_vault(),
     )
     def test_update_existing(self, mock_load, mock_save):
-        result = vault_add(address="0xABC", label="Updated", chain_id=1)
+        result = vault_add(address=_SAVED_VAULT, label="Updated", chain_id=1)
         assert "updated" in result.message.lower()
         saved_cfg = mock_save.call_args[0][0]
         assert len(saved_cfg.vaults) == 1
@@ -368,7 +381,7 @@ class TestVaultRemove:
         return_value=_config_with_vault(),
     )
     def test_remove_existing(self, mock_load, mock_save):
-        result = vault_remove(address="0xABC")
+        result = vault_remove(address=_SAVED_VAULT)
         assert "removed" in result.message.lower()
         saved_cfg = mock_save.call_args[0][0]
         assert len(saved_cfg.vaults) == 0

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev43}/tests/typed_client/consumer.py

@@ -26,11 +26,20 @@ from ipor_fusion.chains import ensure_supported_chain
 from ipor_fusion.core.access import AccessManager
 from ipor_fusion.core.context import Web3Context
 from ipor_fusion.core.plasma_vault import PlasmaVault
+from ipor_fusion.crosschain.ccip.contracts import (
+    CcipCrosschainDispatcher,
+    CcipCrosschainExecutor,
+    CcipCrosschainFactory,
+)
 from ipor_fusion.crosschain.contracts import (
     CrosschainDispatcher,
     CrosschainExecutor,
     CrosschainFactory,
 )
+from ipor_fusion.crosschain.stargate.contracts import (
+    StargateCrosschainExecutor,
+    StargateCrosschainFactory,
+)
 from ipor_fusion.explorer import get_contract_name
 from ipor_fusion.morpho_api import fetch_market, fetch_vault
 from ipor_fusion.readers.morpho import morpho_blue_address
@@ -86,3 +95,23 @@ def crosschain(
     executor.approve_balance(ProposalId(1))
     dispatcher.command_status(CommandId(bytes(32)))
     factory.asset_frozen(AssetId(bytes(32)))
+
+
+def crosschain_reads_feed_writes(
+    ccip: CcipCrosschainExecutor,
+    ccip_dispatcher: CcipCrosschainDispatcher,
+    ccip_factory: CcipCrosschainFactory,
+    stargate: StargateCrosschainExecutor,
+    stargate_factory: StargateCrosschainFactory,
+) -> None:
+    # Ids read through the SDK go back in without re-wrapping.
+    ccip.approve_balance(ccip.active_proposal_id(ETHEREUM).call())
+    stargate.approve_balance(stargate.active_proposal_id(ETHEREUM).call())
+    ccip_factory.asset_frozen(ccip.asset_id().call())
+    ccip_factory.asset_config(ccip_dispatcher.asset_id().call())
+    stargate_factory.asset_config(stargate.asset_id().call())
+    ccip_dispatcher.processed_operation(ccip.active_return(ETHEREUM).call())
+    stargate.deployment_status(stargate.pending_request_by_chain(ETHEREUM).call())
+    stargate_factory.cancel_pending_deployment(
+        stargate.pending_request_by_chain(ETHEREUM).call()
+    )