ipor-fusion 4.0.0.dev66__tar.gz → 4.0.0.dev71__tar.gz

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/MIGRATION_4.md

@@ -110,6 +110,24 @@ Every fuse constructor, `FuseAction.fuse`, `BalanceFuse.fuse`,
 `FusionInstance.access_manager` return one. `resolve_access_manager` still takes any
 `ChecksumAddress`: it is what checks that the address is a vault.
 
+**Simulation and factory records.** `VaultSimulator(web3, *, vault=None, alpha=None,
+block=...)` takes every argument after `web3` by keyword, and `vault` and `alpha` are
+optional: a simulator that only observes, deploys or sends `execute_call(call,
+from_=...)` needs neither, so drop a zero-address placeholder. `execute()` without
+`vault` and `alpha` raises `ValueError`, as does `execute_call` without `from_` or
+`alpha`. `FusionInstance.from_dict(data)` rebuilds a stored instance (the
+`dataclasses.asdict` form) with every field parsed; use it instead of
+`FusionInstance(**data)`, which passes raw strings into the role-typed fields.
+
+**Transactions, LayerZero and constants.** `Web3Context.build_transaction` and
+`Call.build_transaction` return web3's `TxParams` (the same keys; `data` is `0x` hex,
+the fee fields are `Wei`). LayerZero endpoint ids are `LayerZeroEid`:
+`StargateChain.eid`, `Packet.src_eid` / `dst_eid`, `EnforcedOptionParam.eid`,
+`executor_eid()` and `eid_of()` return it and `chain_id_of`, `peers`, `lz_receive_calldata(src_eid=)`
+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).
+
 **Markets and substrates.** Every `IporFusionMarkets` member is a `MarketId`.
 `decode_substrate`, `market_name`, `format_market_label` take `MarketId`.
 

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/PKG-INFO

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

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

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/__init__.py

@@ -325,6 +325,7 @@ from ipor_fusion.types import (
     HyperCoreClientOrderId,
     HyperCoreOrderId,
     HyperCoreTokenIndex,
+    LayerZeroEid,
     Liquidity,
     MappingStatus,
     MarginTableId,
@@ -650,6 +651,7 @@ __all__ = [
     "ProposalId",
     "ReturnRequestId",
     "StargateAssetId",
+    "LayerZeroEid",
     "TransferId",
     "Price",
     "Period",

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/cli/market_cmd.py

@@ -51,7 +51,7 @@ class MarketIdType(click.ParamType):
 
     name = "marketId"
 
-    def convert(self, value, param, ctx):  # type: ignore[override]
+    def convert(self, value, param, ctx):
         if not isinstance(value, str):
             self.fail(f"expected string, got {type(value).__name__}", param, ctx)
         try:

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/cli/options.py

@@ -51,7 +51,7 @@ class VaultAddressType(AddressType):
     """An address the command treats as a Plasma Vault; the command's probe
     (`resolve_access_manager`) is what checks it on chain."""
 
-    def convert(self, value, param, ctx) -> PlasmaVaultAddress:  # type: ignore[override]
+    def convert(self, value, param, ctx) -> PlasmaVaultAddress:
         return PlasmaVaultAddress(super().convert(value, param, ctx))
 
 
@@ -63,7 +63,7 @@ class ChainType(click.ParamType):
 
     name = "chain"
 
-    def convert(self, value, param, ctx) -> ChainId:  # type: ignore[override]
+    def convert(self, value, param, ctx) -> ChainId:
         if isinstance(value, int):
             return ChainId(value)
         try:

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/cli/vault_info_view.py

@@ -32,7 +32,7 @@ from ipor_fusion.readers.hypercore import HyperCorePendingState
 from ipor_fusion.substrates import (
     format_market_label,
 )
-from ipor_fusion.types import ZERO_ADDRESS, ChainId, PlasmaVaultAddress
+from ipor_fusion.types import ZERO_ADDRESS, ChainId, PlasmaVaultAddress, Shares
 from ipor_fusion.validation import (
     validate_vault_state,
 )
@@ -388,16 +388,16 @@ def _print_pending_requests(data: VaultData, plasma_vault: PlasmaVault) -> None:
         click.echo("  Pending requests: (none)")
         return
 
-    total_shares = sum((r.shares for r in requests), 0)
+    total_shares = Shares(sum(r.shares for r in requests))
     total_assets: int | None = _safe_call(
-        lambda ts=total_shares: plasma_vault.convert_to_assets(ts).call()  # type: ignore[misc]
+        lambda ts=total_shares: plasma_vault.convert_to_assets(ts).call()
     )
 
     click.echo(f"  Pending requests ({len(requests)}):")
     rows: list[tuple[str, ...]] = []
     for req in requests:
         assets: int | None = _safe_call(
-            lambda s=req.shares: plasma_vault.convert_to_assets(s).call()  # type: ignore[misc]
+            lambda s=req.shares: plasma_vault.convert_to_assets(s).call()
         )
         assets_str = (
             f"{_format_amount(assets, data.asset_decimals)} {data.asset_symbol}"

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/core/context.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 import logging
 
 from eth_account import Account
-from eth_typing import ChecksumAddress
+from eth_typing import ChecksumAddress, HexStr
+from eth_utils import encode_hex
 from hexbytes import HexBytes
 from requests import ConnectionError as RequestsConnectionError
 from requests import HTTPError, Timeout
@@ -14,7 +15,7 @@ from web3.providers.rpc.utils import (
     REQUEST_RETRY_ALLOWLIST,
     ExceptionRetryConfiguration,
 )
-from web3.types import BlockIdentifier, LogReceipt, TxReceipt
+from web3.types import BlockIdentifier, LogReceipt, TxParams, TxReceipt, Wei
 
 from ipor_fusion.chains import GET_LOGS_RANGE_HINTS
 from ipor_fusion.core.logs import (
@@ -182,7 +183,7 @@ class Web3Context:
         data: bytes,
         *,
         block: BlockIdentifier = "latest",
-    ) -> dict:
+    ) -> TxParams:
         """Build the transaction dict for ``data`` against ``to`` without signing
         or broadcasting — the same dict `send` would submit, ready to hand to an
         external signer or to inspect for a gas/cost preview (`gas` and
@@ -211,7 +212,7 @@ class Web3Context:
         max_fee_per_gas = self._calculate_max_fee_per_gas(
             gas_price, base_fee, max_priority_fee_per_gas
         )
-        data_hex = self._data_hex(data)
+        data_hex = encode_hex(data)
         estimated_gas = self._estimate_gas(to, data_hex, signer, block)
         return {
             "chainId": self.chain_id,
@@ -262,7 +263,7 @@ class Web3Context:
         `build_transaction`.
         """
         signer = self._require_signer("estimate gas")
-        return self._estimate_gas(to, self._data_hex(data), signer, block)
+        return self._estimate_gas(to, encode_hex(data), signer, block)
 
     def get_logs(
         self,
@@ -323,12 +324,12 @@ class Web3Context:
     def _estimate_gas(
         self,
         to: ChecksumAddress,
-        data: str,
-        from_address: str,
+        data: HexStr,
+        from_address: ChecksumAddress,
         block: BlockIdentifier = "latest",
     ) -> int:
         estimated = self.web3.eth.estimate_gas(
-            {"to": to, "from": from_address, "data": data},  # type: ignore[typeddict-item]
+            {"to": to, "from": from_address, "data": data},
             block_identifier=block,
         )
         # State can shift between estimate and execution, so pad the limit; it is
@@ -337,25 +338,23 @@ class Web3Context:
 
     def _calculate_max_fee_per_gas(
         self, gas_price: int, base_fee: int | None, max_priority_fee_per_gas: int
-    ) -> int:
+    ) -> Wei:
         # Prefer a base-fee-relative ceiling on EIP-1559 chains; fall back to a
         # gas-price margin where the block carries no base fee.
         if base_fee is None:
-            return gas_price + self._percent_of(gas_price, self.GAS_PRICE_MARGIN)
-        return base_fee * self.BASE_FEE_HEADROOM_MULTIPLIER + max_priority_fee_per_gas
+            return Wei(gas_price + self._percent_of(gas_price, self.GAS_PRICE_MARGIN))
+        return Wei(
+            base_fee * self.BASE_FEE_HEADROOM_MULTIPLIER + max_priority_fee_per_gas
+        )
 
-    def _get_max_priority_fee(self, gas_price: int) -> int:
-        return min(self.DEFAULT_TRANSACTION_MAX_PRIORITY_FEE, gas_price // 10)
+    def _get_max_priority_fee(self, gas_price: int) -> Wei:
+        return Wei(min(self.DEFAULT_TRANSACTION_MAX_PRIORITY_FEE, gas_price // 10))
 
     def _require_signer(self, action: str) -> ChecksumAddress:
         if self.signer is None:
             raise ValueError(f"Signer required to {action}")
         return self.signer
 
-    @staticmethod
-    def _data_hex(data: bytes) -> str:
-        return f"0x{data.hex()}"
-
     @staticmethod
     def _percent_of(value: int, percentage: int) -> int:
         return value * percentage // 100

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/core/contract.py

@@ -8,7 +8,7 @@ from eth_abi import decode, encode
 from eth_typing import ChecksumAddress
 from eth_utils import function_signature_to_4byte_selector
 from web3 import Web3
-from web3.types import BlockIdentifier, TxReceipt
+from web3.types import BlockIdentifier, TxParams, TxReceipt
 
 from ipor_fusion.core.context import Web3Context
 from ipor_fusion.errors import EmptyCallResultError
@@ -105,7 +105,7 @@ class Call(Generic[T]):
 
     def build_transaction(
         self, ctx: Web3Context | None = None, *, block: BlockIdentifier = "latest"
-    ) -> dict:
+    ) -> TxParams:
         """Build the transaction dict for this Call without signing or sending —
         mirrors `.send()`, delegating to `Web3Context.build_transaction`. Returns
         the dict a signer would submit; needs a signer address, no key."""
@@ -165,7 +165,7 @@ class ContractWrapper:
         and so rejects input that is genuinely the caller's.
         """
         instance = cls.__new__(cls)
-        instance._ctx = None  # type: ignore[assignment]
+        instance._ctx = None
         instance._address = (
             Web3.to_checksum_address(address)
             if address is not None

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/core/fusion_factory.py

@@ -22,7 +22,9 @@ For external-signer flows, grab the bytes directly:
 
 from __future__ import annotations
 
+from collections.abc import Callable, Mapping
 from dataclasses import dataclass
+from typing import Any
 
 from eth_abi import decode as abi_decode
 from eth_typing import ChecksumAddress
@@ -31,7 +33,13 @@ from web3 import Web3
 from web3.types import TxReceipt
 
 from ipor_fusion.core.contract import Call, ContractWrapper
-from ipor_fusion.types import AccessManagerAddress, Period, PlasmaVaultAddress
+from ipor_fusion.types import (
+    AccessManagerAddress,
+    Period,
+    PlasmaVaultAddress,
+    parse_access_manager_address,
+    parse_plasma_vault_address,
+)
 
 
 @dataclass(slots=True, frozen=True)
@@ -70,6 +78,61 @@ class FusionInstance:
     context_manager: ChecksumAddress
     price_manager: ChecksumAddress
 
+    @classmethod
+    def from_dict(
+        cls, data: Mapping[str, Any]
+    ) -> FusionInstance:  # proctor: ignore[primitives-untyped-dict]
+        """Rebuild an instance from its JSON form (``dataclasses.asdict``),
+        parsing every field: role addresses through their parsers, the rest
+        checksummed, integers and strings type-checked. Raises ``ValueError``
+        on a missing, extra or malformed field."""
+        missing = _INSTANCE_FIELDS.keys() - data.keys()
+        extra = data.keys() - _INSTANCE_FIELDS.keys()
+        if missing or extra:
+            raise ValueError(
+                f"FusionInstance fields: missing {sorted(missing)}, extra {sorted(extra)}"
+            )
+        return cls(
+            **{name: parse(data[name]) for name, parse in _INSTANCE_FIELDS.items()}
+        )
+
+
+def _integer(value: Any) -> int:
+    if type(value) is not int:
+        raise ValueError(f"expected an integer: {value!r}")
+    return value
+
+
+def _text(value: Any) -> str:
+    if not isinstance(value, str):
+        raise ValueError(f"expected a string: {value!r}")
+    return value
+
+
+def _address(value: Any) -> ChecksumAddress:
+    return Web3.to_checksum_address(_text(value))
+
+
+_INSTANCE_FIELDS: dict[str, Callable[[Any], Any]] = {
+    "index": _integer,
+    "version": _integer,
+    "asset_name": _text,
+    "asset_symbol": _text,
+    "asset_decimals": _integer,
+    "underlying_token": _address,
+    "underlying_token_symbol": _text,
+    "underlying_token_decimals": _integer,
+    "initial_owner": _address,
+    "plasma_vault": lambda value: parse_plasma_vault_address(_text(value)),
+    "plasma_vault_base": _address,
+    "access_manager": lambda value: parse_access_manager_address(_text(value)),
+    "fee_manager": _address,
+    "rewards_manager": _address,
+    "withdraw_manager": _address,
+    "context_manager": _address,
+    "price_manager": _address,
+}
+
 
 _FUSION_INSTANCE_OUTPUT_TYPES: list[str] = [
     "uint256",  # index

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/core/logs.py

@@ -19,7 +19,9 @@ from concurrent.futures import ThreadPoolExecutor
 from typing import Protocol
 
 import requests
-from eth_typing import ChecksumAddress
+from eth_typing import ChecksumAddress, HexStr
+from eth_utils import encode_hex
+from hexbytes import HexBytes
 from web3 import Web3
 from web3.exceptions import Web3Exception
 from web3.types import BlockIdentifier, FilterParams, LogReceipt
@@ -158,6 +160,14 @@ class _Rejected(Exception):
         self.size = size
 
 
+def _topic_filter(topic: str | list[str]) -> HexStr | list[HexStr]:
+    """A topic (or an OR-list of them) as the canonical hex `eth_getLogs`
+    filters by; raises on text that is not hex."""
+    if isinstance(topic, str):
+        return encode_hex(HexBytes(topic))
+    return [encode_hex(HexBytes(alternative)) for alternative in topic]
+
+
 class _Scan:
     def __init__(
         self,
@@ -169,7 +179,7 @@ class _Scan:
     ):
         self._web3 = web3
         self._address = address
-        self._topics = topics
+        self._topics = [_topic_filter(topic) for topic in topics]
         self._timeout_s = timeout_s
         self._deadline = time.monotonic() + timeout_s
         self._stopped = threading.Event()
@@ -219,7 +229,7 @@ class _Scan:
             self._check(low, high)
             params: FilterParams = {
                 "address": self._address,
-                "topics": self._topics,  # type: ignore[typeddict-item]
+                "topics": self._topics,
                 "fromBlock": low,
                 "toBlock": high,
             }

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/core/simulation.py

@@ -16,7 +16,7 @@ from web3.utils.address import get_create_address
 from ipor_fusion.core.contract import Call, _encode_calldata
 from ipor_fusion.core.fuse_action import FuseAction
 from ipor_fusion.errors import SimulationError, decode_custom_error
-from ipor_fusion.types import ZERO_ADDRESS, PlasmaVaultAddress
+from ipor_fusion.types import PlasmaVaultAddress
 
 #: ``n`` (the sent block's index in the run) -> account overrides for it.
 StateOverrideProvider = Callable[[int], Mapping[str, Mapping[str, Any]]]
@@ -190,15 +190,16 @@ class VaultSimulator:
     def __init__(
         self,
         web3: Web3,
-        vault: PlasmaVaultAddress,
-        alpha: ChecksumAddress,
+        *,
+        vault: PlasmaVaultAddress | None = None,
+        alpha: ChecksumAddress | None = None,
         block: BlockIdentifier = "latest",
         validation: bool = False,
         trace_transfers: bool = False,
     ):
         self._web3 = web3
-        self._vault = Web3.to_checksum_address(vault)
-        self._alpha = Web3.to_checksum_address(alpha)
+        self._vault = vault
+        self._alpha = alpha
         self._block: BlockIdentifier = block
         self._validation = validation
         self._trace_transfers = trace_transfers
@@ -341,6 +342,8 @@ class VaultSimulator:
 
     def execute(self, actions: list[FuseAction]) -> VaultSimulator:
         """Queue a default `execute((address,bytes)[])` batch on the vault, from alpha."""
+        if self._vault is None or self._alpha is None:
+            raise ValueError("execute needs a simulator built with vault= and alpha=")
         data = FuseAction.encode_execute_payload(actions, "execute((address,bytes)[])")
         return self._queue_execute(self._vault, data, self._alpha)
 
@@ -351,11 +354,12 @@ class VaultSimulator:
         e.g. `RewardsManager.claim_rewards(...)` where the wrapper differs from
         `PlasmaVault.execute`. `from_` defaults to alpha.
         """
-        return self._queue_execute(
-            call.to,
-            call.data,
-            Web3.to_checksum_address(from_) if from_ else self._alpha,
-        )
+        sender = from_ or self._alpha
+        if sender is None:
+            raise ValueError(
+                "execute_call needs from_ or a simulator built with alpha="
+            )
+        return self._queue_execute(call.to, call.data, sender)
 
     def _queue_execute(
         self, to: ChecksumAddress, data: bytes, from_: ChecksumAddress
@@ -751,8 +755,7 @@ def erc20_balance_slot(
     if max_slot < 0:
         raise ValueError(no_slot)
 
-    zero: Any = ZERO_ADDRESS
-    sim = VaultSimulator(web3, vault=zero, alpha=zero, block=block)
+    sim = VaultSimulator(web3, block=block)
     for slot in range(max_slot + 1):
         holder = Web3.to_checksum_address(
             "0x" + keccak(encode(["uint256"], [slot]))[-20:].hex()

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/crosschain/ccip/quote.py

@@ -18,13 +18,11 @@ from web3.types import BlockIdentifier
 
 from ipor_fusion.core.contract import Call
 from ipor_fusion.core.simulation import VaultSimulator
-from ipor_fusion.types import parse_plasma_vault_address
 
 #: Selector of ``CcipInsufficientNativeFeeBalance(uint256 balance, uint256 required)``.
 INSUFFICIENT_NATIVE_FEE_SELECTOR: bytes = keccak(
     text="CcipInsufficientNativeFeeBalance(uint256,uint256)"
 )[:4]
-_NO_VAULT = parse_plasma_vault_address(bytes(20))
 
 
 def quote_ccip_native_fee(
@@ -45,7 +43,7 @@ def quote_ccip_native_fee(
     valid at ``block`` up to the fee check; a revert before it, or a call that
     sends no message, raises ``ValueError``.
     """
-    simulator = VaultSimulator(web3, vault=_NO_VAULT, alpha=from_, block=block)
+    simulator = VaultSimulator(web3, alpha=from_, block=block)
     simulator.with_state_override(payer, balance=hex(0))
     simulator.add_call(call, from_=from_, label="quote", gas=gas)
     (result,) = simulator.run().calls

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/crosschain/simulation.py

@@ -25,7 +25,6 @@ Example -- bridge from a source vault and let the dispatcher settle::
 from __future__ import annotations
 
 from collections.abc import Mapping
-from typing import Any
 
 from eth_typing import ChecksumAddress
 from web3 import Web3
@@ -41,7 +40,7 @@ from ipor_fusion.crosschain.transport import (
     CrosschainTransport,
     OutboundMessage,
 )
-from ipor_fusion.types import ZERO_ADDRESS, ChainId, PlasmaVaultAddress
+from ipor_fusion.types import ChainId, PlasmaVaultAddress
 
 #: What the synthetic token source holds: enough for any test amount.
 SYNTHETIC_BALANCE = 2**96
@@ -89,10 +88,7 @@ class CrosschainSimulator:
             raise ValueError(f"chain {chain_id} is not configured on the transport")
         if chain_id in self._chains:
             raise ValueError(f"chain {chain_id} already added")
-        zero: Any = ZERO_ADDRESS
-        sim = VaultSimulator(
-            web3, vault=vault or zero, alpha=alpha or zero, block=block
-        )
+        sim = VaultSimulator(web3, vault=vault, alpha=alpha, block=block)
         # A chain without a real token holder to impersonate gets a synthetic
         # one, funded once by a storage override; deliveries transfer from it.
         for token in self._transport.synthetic_credit_tokens(chain_id):

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/crosschain/stargate/contracts.py

@@ -23,6 +23,7 @@ from ipor_fusion.types import (
     ChainId,
     CommandId,
     DeploymentRequestId,
+    LayerZeroEid,
     PlasmaVaultAddress,
     PositionSetHash,
     ProposalId,
@@ -122,10 +123,12 @@ class StargateCrosschainExecutor(CrosschainExecutor):
     def proposal_count(self) -> Call[int]:
         return self._view("proposalCount()", output_types=["uint256"])
 
-    def eid_of(self, chain_id: ChainId) -> Call[int]:
-        return self._view("eidOf(uint256)", chain_id, output_types=["uint32"])
+    def eid_of(self, chain_id: ChainId) -> Call[LayerZeroEid]:
+        return self._view(
+            "eidOf(uint256)", chain_id, output_types=["uint32"], decoder=LayerZeroEid
+        )
 
-    def chain_id_of(self, eid: int) -> Call[ChainId]:
+    def chain_id_of(self, eid: LayerZeroEid) -> Call[ChainId]:
         return self._view(
             "chainIdOf(uint32)", eid, output_types=["uint256"], decoder=ChainId
         )
@@ -252,8 +255,10 @@ class StargateCrosschainDispatcher(CrosschainDispatcher):
     def stargate_pool(self) -> Call[ChecksumAddress]:
         return self._view("STARGATE_POOL()", output_types=["address"], decoder=_address)
 
-    def executor_eid(self) -> Call[int]:
-        return self._view("EXECUTOR_EID()", output_types=["uint32"])
+    def executor_eid(self) -> Call[LayerZeroEid]:
+        return self._view(
+            "EXECUTOR_EID()", output_types=["uint32"], decoder=LayerZeroEid
+        )
 
     def observation(self) -> Call[Observation]:
         """``trackedIdle`` in local decimals plus ``convertToAssets`` of every
@@ -299,7 +304,7 @@ class StargateTokenMessaging(ContractWrapper):
     """Stargate V2 ``TokenMessaging``, the OApp that carries taxi packets:
     ``peers`` tells whether a route to an endpoint id exists."""
 
-    def peers(self, eid: int) -> Call[bytes]:
+    def peers(self, eid: LayerZeroEid) -> Call[bytes]:
         """The peer OApp on ``eid`` as bytes32; zero when no route exists."""
         return self._view("peers(uint32)", eid, output_types=["bytes32"])
 
@@ -332,10 +337,12 @@ class StargateCrosschainFactory(CrosschainFactory):
             decoder=_address,
         )
 
-    def eid_of(self, chain_id: ChainId) -> Call[int]:
-        return self._view("eidOf(uint256)", chain_id, output_types=["uint32"])
+    def eid_of(self, chain_id: ChainId) -> Call[LayerZeroEid]:
+        return self._view(
+            "eidOf(uint256)", chain_id, output_types=["uint32"], decoder=LayerZeroEid
+        )
 
-    def chain_id_of(self, eid: int) -> Call[ChainId]:
+    def chain_id_of(self, eid: LayerZeroEid) -> Call[ChainId]:
         return self._view(
             "chainIdOf(uint32)", eid, output_types=["uint256"], decoder=ChainId
         )

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/crosschain/stargate/layerzero.py

@@ -30,7 +30,7 @@ from web3 import Web3
 from ipor_fusion.core.address import _validate_not_zero_address
 from ipor_fusion.core.contract import _encode_calldata
 from ipor_fusion.crosschain.logs import log_bytes
-from ipor_fusion.types import ZERO_ADDRESS, MessageId, StargateAssetId
+from ipor_fusion.types import ZERO_ADDRESS, LayerZeroEid, MessageId, StargateAssetId
 
 _TYPE_3 = b"\x00\x03"
 _EXECUTOR_WORKER_ID = 1
@@ -129,7 +129,7 @@ class EnforcedOptionParam:
     ``msg_type`` 1 and must carry a non-zero ``lzReceive`` gas; the compose
     (asset) lane is 2."""
 
-    eid: int
+    eid: LayerZeroEid
     msg_type: int
     options: bytes | OptionsBuilder
 
@@ -149,9 +149,9 @@ class Packet:
     """One ``PacketV1Codec`` packet: the payload of a ``PacketSent`` event."""
 
     nonce: int
-    src_eid: int
+    src_eid: LayerZeroEid
     sender: ChecksumAddress
-    dst_eid: int
+    dst_eid: LayerZeroEid
     receiver: ChecksumAddress
     guid: MessageId
     message: bytes
@@ -162,9 +162,9 @@ class Packet:
             raise ValueError("not a version-1 LayerZero packet")
         return cls(
             nonce=int.from_bytes(encoded[1:9], "big"),
-            src_eid=int.from_bytes(encoded[9:13], "big"),
+            src_eid=LayerZeroEid(int.from_bytes(encoded[9:13], "big")),
             sender=bytes32_to_address(encoded[13:45]),
-            dst_eid=int.from_bytes(encoded[45:49], "big"),
+            dst_eid=LayerZeroEid(int.from_bytes(encoded[45:49], "big")),
             receiver=bytes32_to_address(encoded[49:81]),
             guid=MessageId(encoded[81:113]),
             message=encoded[113:],
@@ -213,7 +213,7 @@ class TaxiMessage:
 
 
 def encode_oft_compose_msg(
-    nonce: int, src_eid: int, amount_ld: int, compose_msg: bytes
+    *, nonce: int, src_eid: LayerZeroEid, amount_ld: int, compose_msg: bytes
 ) -> bytes:
     """``OFTComposeMsgCodec.encode(nonce, srcEid, amountLD, composeMsg)``: the
     message the endpoint passes to ``lzCompose`` after a Stargate delivery.
@@ -228,12 +228,12 @@ def encode_oft_compose_msg(
 
 def lz_receive_calldata(
     *,
-    src_eid: int,
+    src_eid: LayerZeroEid,
     sender: ChecksumAddress,
     nonce: int,
     guid: MessageId,
     message: bytes,
-    executor: ChecksumAddress = ZERO_ADDRESS,  # type: ignore[assignment]
+    executor: ChecksumAddress = ZERO_ADDRESS,
     extra_data: bytes = b"",
 ) -> bytes:
     """``lzReceive(Origin, guid, message, executor, extraData)`` as the endpoint calls it."""
@@ -252,7 +252,7 @@ def lz_compose_calldata(
     from_: ChecksumAddress,
     guid: MessageId,
     message: bytes,
-    executor: ChecksumAddress = ZERO_ADDRESS,  # type: ignore[assignment]
+    executor: ChecksumAddress = ZERO_ADDRESS,
     extra_data: bytes = b"",
 ) -> bytes:
     """``lzCompose(from, guid, message, executor, extraData)`` as the endpoint calls it."""

{ipor_fusion-4.0.0.dev66 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/crosschain/stargate/transport.py

@@ -29,7 +29,7 @@ from ipor_fusion.crosschain.transport import (
     OutboundMessage,
     transfer_call,
 )
-from ipor_fusion.types import ChainId, StargateAssetId
+from ipor_fusion.types import ChainId, LayerZeroEid, StargateAssetId
 
 
 @dataclass(frozen=True, slots=True)
@@ -45,7 +45,7 @@ class StargateChain:
     """
 
     chain_id: ChainId
-    eid: int
+    eid: LayerZeroEid
     endpoint: ChecksumAddress
     token_messaging: ChecksumAddress
     stargate_pool: ChecksumAddress
@@ -87,7 +87,7 @@ class StargateTransport(CrosschainTransport):
 
     def __init__(self, chains: Iterable[StargateChain]) -> None:
         self._chains: dict[ChainId, StargateChain] = {}
-        self._by_eid: dict[int, StargateChain] = {}
+        self._by_eid: dict[LayerZeroEid, StargateChain] = {}
         for chain in chains:
             if chain.chain_id in self._chains:
                 raise ValueError(f"duplicate Stargate chain_id {chain.chain_id}")
@@ -194,7 +194,10 @@ class StargateTransport(CrosschainTransport):
             ]
         taxi: TaxiMessage = message.raw[1]
         compose = encode_oft_compose_msg(
-            packet.nonce, packet.src_eid, message.token_amount, taxi.compose_msg
+            nonce=packet.nonce,
+            src_eid=packet.src_eid,
+            amount_ld=message.token_amount,
+            compose_msg=taxi.compose_msg,
         )
         return [
             transfer_call(