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

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

@@ -119,6 +119,15 @@ from_=...)` needs neither, so drop a zero-address placeholder. `execute()` witho
 `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.dev68 → ipor_fusion-4.0.0.dev71}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [project]
 name = "ipor-fusion"
-version = "4.0.0.dev68"
+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.dev68 → 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.dev68 → 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.dev68 → 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.dev68 → 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.dev68 → 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.dev68 → 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.dev68 → 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.dev68 → 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.dev68 → 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.dev68 → 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(

{ipor_fusion-4.0.0.dev68 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/errors.py

@@ -9,7 +9,7 @@ from eth_abi.exceptions import InsufficientDataBytes
 from eth_typing import ChecksumAddress
 from eth_utils import function_signature_to_4byte_selector
 from web3 import Web3
-from web3.types import TxReceipt
+from web3.types import TxParams, TxReceipt
 
 from ipor_fusion.types import TxHash
 
@@ -119,7 +119,7 @@ def get_revert_reason(web3: Web3, tx_hash: TxHash, receipt: TxReceipt) -> str |
     """Replay a failed tx as eth_call to capture revert data."""
     try:
         tx = web3.eth.get_transaction(tx_hash)
-        call_params = {
+        call_params: TxParams = {
             "from": tx["from"],
             "to": tx["to"],
             "data": tx["input"],
@@ -129,7 +129,7 @@ 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)  # type: ignore[arg-type]
+        web3.eth.call(call_params, block_identifier=block_number)
         return None  # replay succeeded — can't determine reason
     except Exception as exc:
         exc_data = getattr(exc, "data", None)

{ipor_fusion-4.0.0.dev68 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/explorer.py

@@ -141,7 +141,7 @@ def _fetch_getsourcecode(
             with urlopen(url, timeout=10) as resp:  # noqa: S310
                 data = json.loads(resp.read().decode())
             if data.get("status") == "1" and data.get("result"):
-                return data["result"][0]  # type: ignore[no-any-return]
+                return data["result"][0]
             if "rate limit" in str(data.get("result", "")).lower():
                 time.sleep(_RETRY_DELAY * (attempt + 1))
                 continue

{ipor_fusion-4.0.0.dev68 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/fuses/base.py

@@ -42,7 +42,11 @@ class Fuse(ABC):  # noqa: B024  # ABC marks intent; no shared abstract method
             raise ValueError(f"{name} must not be negative, got {value}")
 
     def __eq__(self, other: object) -> bool:
-        return type(self) is type(other) and self._address == other._address  # type: ignore[attr-defined]
+        return (
+            isinstance(other, Fuse)
+            and type(self) is type(other)
+            and self._address == other._address
+        )
 
     def __hash__(self) -> int:
         return hash((type(self), self._address))

{ipor_fusion-4.0.0.dev68 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/fuses/crosschain/ccip.py

@@ -42,7 +42,7 @@ class CcipSendParams(SendParams):
 
     max_fee: int
     gas_limit: int
-    fee_token: ChecksumAddress = ZERO_ADDRESS  # type: ignore[assignment]
+    fee_token: ChecksumAddress = ZERO_ADDRESS
 
     @classmethod
     def from_route(cls, route: CcipRouteConfig, *, token: bool) -> CcipSendParams:
@@ -148,8 +148,8 @@ class CcipCommandType(IntEnum):
 
 _EMPTY_ROUTE = CcipRouteConfig(
     chain_selector=0,
-    peer=ZERO_ADDRESS,  # type: ignore[arg-type]
-    fee_token=ZERO_ADDRESS,  # type: ignore[arg-type]
+    peer=ZERO_ADDRESS,
+    fee_token=ZERO_ADDRESS,
     message_gas_limit=0,
     token_gas_limit=0,
     max_fee=0,
@@ -255,7 +255,7 @@ class CcipCrosschainCommandFuse(CrosschainCommandFuse):
         command: Command = EMPTY_COMMAND,
         max_fee: int = 0,
         gas_limit: int = 0,
-        fee_token: ChecksumAddress = ZERO_ADDRESS,  # type: ignore[assignment]
+        fee_token: ChecksumAddress = ZERO_ADDRESS,
     ) -> FuseAction:
         """Forward one operation to the executor (or its factory):
 

{ipor_fusion-4.0.0.dev68 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/fuses/crosschain/stargate.py

@@ -33,9 +33,10 @@ from ipor_fusion.fuses.crosschain.base import (
     CrosschainSupplyFuse,
     SendParams,
 )
-from ipor_fusion.types import Amount, ChainId, DeploymentRequestId
+from ipor_fusion.types import Amount, ChainId, DeploymentRequestId, LayerZeroEid
 
 _NO_CHAIN = ChainId(0)
+_NO_EID = LayerZeroEid(0)
 _NO_REQUEST = DeploymentRequestId(0)
 _ZERO_AMOUNT = Amount(0)
 
@@ -172,7 +173,7 @@ class StargateCrosschainCommandFuse(CrosschainCommandFuse):
         *,
         executor: ChecksumAddress,
         chain_id: ChainId = _NO_CHAIN,
-        eid: int = 0,
+        eid: LayerZeroEid = _NO_EID,
         enforced_options: bytes = b"",
         plasma_vaults: Sequence[ChecksumAddress] = (),
         request_id: DeploymentRequestId = _NO_REQUEST,
@@ -264,7 +265,7 @@ class StargateCrosschainCommandFuse(CrosschainCommandFuse):
         self,
         command_type: StargateCrosschainCommandType,
         chain_id: ChainId,
-        eid: int,
+        eid: LayerZeroEid,
         request_id: DeploymentRequestId,
         command: Command,
     ) -> None:

{ipor_fusion-4.0.0.dev68 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/fuses/universal.py

@@ -65,7 +65,11 @@ class UniversalTokenSwapperFuse(Fuse):
         self._abi = abi
 
     def __eq__(self, other: object) -> bool:
-        return super().__eq__(other) and self._abi is other._abi  # type: ignore[attr-defined]
+        return (
+            isinstance(other, UniversalTokenSwapperFuse)
+            and super().__eq__(other)
+            and self._abi is other._abi
+        )
 
     def __hash__(self) -> int:
         return hash((type(self), self._address, self._abi))

{ipor_fusion-4.0.0.dev68 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/readers/aave_v3.py

@@ -6,9 +6,7 @@ from web3 import Web3
 from ipor_fusion.core.contract import Call, ContractWrapper
 from ipor_fusion.core.erc20 import ERC20
 from ipor_fusion.core.multicall import Multicall3
-from ipor_fusion.types import Amount
-
-_ZERO_ADDRESS = "0x0000000000000000000000000000000000000000"
+from ipor_fusion.types import ZERO_ADDRESS, Amount
 
 # DataTypes.ReserveDataLegacy returned by Pool.getReserveData(address).
 # All fields are static, so the struct is encoded inline as a flat sequence.
@@ -163,7 +161,7 @@ class AaveV3Reader(ContractWrapper):
             tokens.variable_debt_token,
             tokens.stable_debt_token,
         )
-        listed = [token for token in reserve_tokens if token.lower() != _ZERO_ADDRESS]
+        listed = [token for token in reserve_tokens if token.lower() != ZERO_ADDRESS]
         balances = iter(
             Multicall3(self._ctx).aggregate(
                 [ERC20(self._ctx, token).balance_of(user) for token in listed]

{ipor_fusion-4.0.0.dev68 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/readers/morpho.py

@@ -13,12 +13,18 @@ from ipor_fusion.core.context import Web3Context
 from ipor_fusion.core.contract import Call, ContractWrapper
 from ipor_fusion.core.multicall import Multicall3
 from ipor_fusion.errors import MorphoMarketNotFoundError, UnsupportedChainError
-from ipor_fusion.types import Amount, ChainId, Fee, MorphoBlueMarketId, Shares
+from ipor_fusion.types import (
+    ZERO_ADDRESS,
+    Amount,
+    ChainId,
+    Fee,
+    MorphoBlueMarketId,
+    Shares,
+)
 
 WAD = 10**18
 SECONDS_PER_YEAR = 365 * 24 * 60 * 60  # matches Morpho IRM YEAR constant
 
-_ZERO_ADDRESS = Web3.to_checksum_address("0x" + "00" * 20)
 _addr = Web3.to_checksum_address
 
 # Morpho Blue sits at its CREATE2 address (0xBBBB…EEFFCb) on Ethereum and Base
@@ -257,7 +263,7 @@ class MorphoReader(ContractWrapper):
         Use this when the caller has already read `market()` and `market_params()`
         to avoid two redundant RPC roundtrips.
         """
-        if params.irm == _ZERO_ADDRESS:
+        if params.irm == ZERO_ADDRESS:
             # Morpho skips the IRM when irm == address(0) (MetaMorpho "idle"
             # markets): no interest accrues, so every rate is zero.
             rate_wad = 0

{ipor_fusion-4.0.0.dev68 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/readers/oracle_mapping_nodes.py

@@ -14,6 +14,7 @@ from eth_typing import ChecksumAddress
 
 from ipor_fusion.readers.oracle_mapping_reader import OracleMappingReader
 from ipor_fusion.types import (
+    ZERO_ADDRESS,
     AssetSource,
     MappingStatus,
     NodeStatus,
@@ -21,9 +22,6 @@ from ipor_fusion.types import (
     Price,
 )
 
-ZERO_ADDRESS = "0x0000000000000000000000000000000000000000"
-
-
 # source_type values (also the human label in the path / output). Adding a
 # type? Follow the "Adding a feed type" checklist in readers/oracle_mapping.py.
 TYPE_CHAINLINK = "ChainlinkAggregator"

{ipor_fusion-4.0.0.dev68 → ipor_fusion-4.0.0.dev71}/src/ipor_fusion/readers/oracle_mapping_reader.py

@@ -33,8 +33,8 @@ ASSET_PRICE_SOURCE_UPDATED_TOPIC = (
 )
 
 
-def _addr(value: object) -> ChecksumAddress:
-    return Web3.to_checksum_address(value)  # type: ignore[arg-type]
+def _addr(value: str) -> ChecksumAddress:
+    return Web3.to_checksum_address(value)
 
 
 class _Erc4626Feed(ContractWrapper):