ipor-fusion 4.0.0.dev103__tar.gz → 4.0.0.dev106__tar.gz

{ipor_fusion-4.0.0.dev103 → ipor_fusion-4.0.0.dev106}/AGENTS.md

@@ -155,8 +155,8 @@ the lifecycle matrix follows that.
   cases and non-obvious logic.
 - The public API is `ipor_fusion.__all__` (README, "Public API and stability").
   Every public symbol is imported and listed there; a symbol of a public
-  subpackage (`core`, `config`, `fuses`, `fuses.crosschain`, `readers`,
-  `crosschain`, `crosschain.ccip`, `crosschain.stargate`) also goes in that
+  subpackage (`core`, `config`, `fuses`, `readers`, `crosschain`,
+  `crosschain.fuses`, `crosschain.ccip`, `crosschain.stargate`) also goes in that
   subpackage's `__all__`. `ipor_fusion.guide` keeps its own namespace. The
   public modules (`about`, `chains`, `dependency_graph`, `errors`, `explorer`,
   `field_docs`, `market_ids`, `market_info`, `morpho_api`, `substrates`, `types`,
@@ -224,7 +224,7 @@ the lifecycle matrix follows that.
   (`FuseAction`), `fuse` (the `Fuse` base, `StakeFuse`, the shared validators and
   substrate packers), `address` (`_validate_not_zero_address`). `core` imports neither
   `fuses` nor `crosschain` (`tests/test_sdk_layering.py`)
-- `fuses/` — per-protocol fuse encoders (aave_v3, async_action, compound_v3, crosschain/,
+- `fuses/` — per-protocol fuse encoders (aave_v3, async_action, compound_v3,
   erc4626, euler_v2, external_state, fluid_instadapp, gearbox_v3, merkl, morpho, ramses_v2,
   uniswap_v3, universal, `events.py`); `base.py` re-exports the `core/fuse.py` base and validators,
   `FuseAction` and `ZERO_ADDRESS` (from `types`). A fuse is a value: equality and
@@ -251,15 +251,20 @@ the lifecycle matrix follows that.
   (`CcipOffRamp.execute` is the permissionless delivery) and `ccip/indexer` fetches a
   message's verifier result from Chainlink's public indexers and builds that
   `manual_execution` call.
-  `fuses/crosschain/` mirrors it (`base`, `stargate`, `ccip`). Names mirror
-  the Solidity contracts and libraries. Adding a transport: a new subpackage plus one
-  `LANES` entry. Layering: the fuse encoders import the wire codecs and wrappers; lanes,
-  discovery, transports and the simulator import the encoders. A package `__init__`
-  runs before its modules, so `ipor_fusion.crosschain`, `.stargate` and `.ccip`
-  export only the fuse-free half; the rest is exported from `ipor_fusion` and
-  imported by module path. `tests/test_crosschain_layering.py` pins this (no
-  function-level or `TYPE_CHECKING` imports in either package); never work around
-  a cycle with a lazy import, move the module instead.
+  The market fuse encoders live in `crosschain/fuses/` (`base`, `stargate`, `ccip`),
+  mirroring `contracts/fuses/crosschain/`; they build on `core/fuse.py`, so the
+  dependency direction is `core` <- `crosschain` and `fuses/` holds no crosschain code
+  (neither package imports the other). Names mirror the Solidity contracts and
+  libraries. Adding a transport: a new subpackage, its encoders in `crosschain/fuses/`
+  and one `LANES` entry. Layering: the encoders import the wire codecs and wrappers;
+  lanes, discovery, transports and the simulator import the encoders.
+  `ipor_fusion.crosschain` exports the whole surface (encoders, lanes, discovery,
+  transports, simulator). A package `__init__` runs before its modules and the
+  encoders import `ccip.contracts` / `stargate.layerzero`, so `.ccip` and `.stargate`
+  export only their codecs and wrappers. `tests/test_crosschain_layering.py` pins this:
+  the SDK's module-level import graph, with the implicit package-`__init__` edges, is
+  acyclic, and the crosschain package has no function-level or `TYPE_CHECKING`
+  imports; never work around a cycle with a lazy import, move the module instead.
 - `readers/` — read side: lending_health, oracle_mapping, position_manager, aave_v3,
   compound_v3, morpho, ramses_v2, uniswap_v3, unpriceable (middleware-priced tokens of
   granted substrates the oracle cannot price)

{ipor_fusion-4.0.0.dev103 → ipor_fusion-4.0.0.dev106}/MIGRATION_4.md

@@ -220,6 +220,27 @@ live in `ipor_fusion.core.fuse`; `ipor_fusion.fuses.base`, `ipor_fusion.fuses` a
 hash now cover every attribute a fuse stores, not only its class and address (see
 [Behavior changes](#behavior-changes)).
 
+**Crosschain fuse encoders moved.** The crosschain market encoders moved from
+`ipor_fusion.fuses.crosschain` into the crosschain package, and
+`ipor_fusion.fuses` no longer re-exports them. There is no shim: the old paths
+raise `ImportError`. The top-level names (`from ipor_fusion import ...`) are
+unchanged.
+
+| 3.x import | 4.0 import |
+|---|---|
+| `ipor_fusion.fuses.crosschain` | `ipor_fusion.crosschain.fuses` (or `ipor_fusion.crosschain`) |
+| `ipor_fusion.fuses.crosschain.base` | `ipor_fusion.crosschain.fuses.base` |
+| `ipor_fusion.fuses.crosschain.ccip` | `ipor_fusion.crosschain.fuses.ccip` |
+| `ipor_fusion.fuses.crosschain.stargate` | `ipor_fusion.crosschain.fuses.stargate` |
+| `from ipor_fusion.fuses import CcipCrosschainSupplyFuse` (and the other crosschain encoders, `SendParams`, `CrosschainSubstrate*`, `crosschain_market_id`) | `from ipor_fusion.crosschain import ...` or `from ipor_fusion import ...` |
+
+`ipor_fusion.crosschain` now exports the whole crosschain surface: besides the
+codecs and wrappers, the encoders, `CrosschainLane`, `CcipLane`, `StargateLane`,
+the transports and chains, `discover_deployment`, `open_lane(s)`, `LANES` and
+`CrosschainSimulator`, which 3.x exported only from `ipor_fusion`.
+`ipor_fusion.crosschain.ccip` and `.stargate` keep exporting only their codecs
+and wrappers.
+
 **Moved, still importable.** `FuseAction` lives in `ipor_fusion.core.fuse_action` and
 `ZERO_ADDRESS` in `ipor_fusion.types`; both are re-exported from
 `ipor_fusion.fuses.base` and `FuseAction` from `ipor_fusion`. The CLI's internal

{ipor_fusion-4.0.0.dev103 → ipor_fusion-4.0.0.dev106}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ipor-fusion
-Version: 4.0.0.dev103
+Version: 4.0.0.dev106
 Summary: The IPOR Fusion SDK for Python
 Project-URL: homepage, https://ipor.io
 Project-URL: repository, https://github.com/IPOR-Labs/ipor-fusion.py
@@ -377,8 +377,8 @@ renaming a name in it, or changing a signature incompatibly, waits for a major
 release; adding one does not.
 
 - **Public subpackages** declare their own `__all__`, each a subset of the top
-  level: `ipor_fusion.core`, `config`, `fuses`, `fuses.crosschain`, `readers`,
-  `crosschain`, `crosschain.ccip` and `crosschain.stargate`. `ipor_fusion.guide`
+  level: `ipor_fusion.core`, `config`, `fuses`, `readers`, `crosschain`,
+  `crosschain.fuses`, `crosschain.ccip` and `crosschain.stargate`. `ipor_fusion.guide`
   (the packaged docs) keeps its names in its own namespace.
 - **Public modules** stay importable for the top-level names they define:
   `about`, `chains`, `dependency_graph`, `errors`, `explorer`, `field_docs`,

{ipor_fusion-4.0.0.dev103 → ipor_fusion-4.0.0.dev106}/README.md

@@ -329,8 +329,8 @@ renaming a name in it, or changing a signature incompatibly, waits for a major
 release; adding one does not.
 
 - **Public subpackages** declare their own `__all__`, each a subset of the top
-  level: `ipor_fusion.core`, `config`, `fuses`, `fuses.crosschain`, `readers`,
-  `crosschain`, `crosschain.ccip` and `crosschain.stargate`. `ipor_fusion.guide`
+  level: `ipor_fusion.core`, `config`, `fuses`, `readers`, `crosschain`,
+  `crosschain.fuses`, `crosschain.ccip` and `crosschain.stargate`. `ipor_fusion.guide`
   (the packaged docs) keeps its names in its own namespace.
 - **Public modules** stay importable for the top-level names they define:
   `about`, `chains`, `dependency_graph`, `errors`, `explorer`, `field_docs`,

{ipor_fusion-4.0.0.dev103 → ipor_fusion-4.0.0.dev106}/pyproject.toml

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

{ipor_fusion-4.0.0.dev103 → ipor_fusion-4.0.0.dev106}/src/ipor_fusion/__init__.py

@@ -79,17 +79,24 @@ from ipor_fusion.crosschain import (
     EMPTY_COMMAND,
     INDEXER_URLS,
     INSUFFICIENT_NATIVE_FEE_SELECTOR,
+    LANES,
     PACKET_SENT_TOPIC,
+    SYNTHETIC_TOKEN_SOURCE,
     ActiveCommand,
     Any2EVMMessage,
     BalanceObservation,
     BusinessAction,
+    CcipChain,
+    CcipCommandType,
     CcipCommitteeVerifier,
+    CcipCrosschainCommandFuse,
     CcipCrosschainDispatcher,
     CcipCrosschainExecutor,
     CcipCrosschainFactory,
+    CcipCrosschainSupplyFuse,
     CcipEvent,
     CcipEventSpec,
+    CcipLane,
     CcipMessageSent,
     CcipMsgType,
     CcipObservation,
@@ -97,32 +104,57 @@ from ipor_fusion.crosschain import (
     CcipOnRamp,
     CcipRouteConfig,
     CcipRouter,
+    CcipSendParams,
     CcipTokenAdminRegistry,
     CcipTokenLane,
     CcipTokenPool,
+    CcipTransport,
     CcipVerifierResolver,
     CcvRequirements,
     Command,
     CommandStatus,
+    CrosschainClaimFuse,
+    CrosschainCommandFuse,
+    CrosschainDeployment,
     CrosschainDispatcher,
     CrosschainExecutor,
+    CrosschainExecutorInfo,
     CrosschainFactory,
+    CrosschainLane,
+    CrosschainSimulator,
+    CrosschainSubstrate,
+    CrosschainSubstrateLib,
+    CrosschainSubstrateType,
+    CrosschainSupplyFuse,
+    CrosschainTransport,
     CrosschainTransportKind,
+    DeliveryCall,
     DeploymentStatus,
     EnforcedOptionParam,
     EVMTokenAmount,
     ExecutorInitParams,
+    LaneFuses,
+    LaneObservation,
     MessageExecutionState,
     MessageV1,
     MsgType,
     Observation,
     OptionsBuilder,
+    OutboundMessage,
     Packet,
     SafetyConfig,
+    SendParams,
+    StargateChain,
+    StargateCrosschainCommandFuse,
+    StargateCrosschainCommandType,
     StargateCrosschainDispatcher,
     StargateCrosschainExecutor,
     StargateCrosschainFactory,
+    StargateCrosschainSupplyFuse,
+    StargateLane,
+    StargateSendParams,
     StargateTokenMessaging,
+    StargateTransport,
     TaxiMessage,
     TokenTransferV1,
     VerifierResult,
@@ -130,10 +162,14 @@ from ipor_fusion.crosschain import (
     ccip_events,
     ccip_receive_calldata,
     ccip_token_lane,
+    crosschain_market_id,
     decode_ccip_envelope,
     decode_ccip_event,
     decode_command,
     decode_envelope,
+    detect_transport,
+    discover_deployment,
+    discover_lane_fuses,
     encode_enforced_options,
     encode_oft_compose_msg,
     fetch_verifier_result,
@@ -141,29 +177,9 @@ from ipor_fusion.crosschain import (
     lz_compose_calldata,
     lz_receive_calldata,
     manual_execution,
-    quote_ccip_native_fee,
-)
-from ipor_fusion.crosschain.ccip.lane import CcipLane
-from ipor_fusion.crosschain.ccip.transport import CcipChain, CcipTransport
-from ipor_fusion.crosschain.discovery import (
-    LANES,
-    CrosschainDeployment,
-    CrosschainExecutorInfo,
-    detect_transport,
-    discover_deployment,
-    discover_lane_fuses,
     open_lane,
     open_lanes,
-)
-from ipor_fusion.crosschain.lane import CrosschainLane, LaneFuses, LaneObservation
-from ipor_fusion.crosschain.simulation import CrosschainSimulator
-from ipor_fusion.crosschain.stargate.lane import StargateLane
-from ipor_fusion.crosschain.stargate.transport import StargateChain, StargateTransport
-from ipor_fusion.crosschain.transport import (
-    SYNTHETIC_TOKEN_SOURCE,
-    CrosschainTransport,
-    DeliveryCall,
-    OutboundMessage,
+    quote_ccip_native_fee,
 )
 from ipor_fusion.dependency_graph import (
     compute_update_groups,
@@ -206,17 +222,7 @@ from ipor_fusion.fuses import (
     AaveV3SupplyFuse,
     AsyncActionFuse,
     AsyncActionSubstrates,
-    CcipCommandType,
-    CcipCrosschainCommandFuse,
-    CcipCrosschainSupplyFuse,
-    CcipSendParams,
     CompoundV3SupplyFuse,
-    CrosschainClaimFuse,
-    CrosschainCommandFuse,
-    CrosschainSubstrate,
-    CrosschainSubstrateLib,
-    CrosschainSubstrateType,
-    CrosschainSupplyFuse,
     ERC4626SupplyFuse,
     EulerSwapDynamicParams,
     EulerSwapInitialState,
@@ -261,13 +267,8 @@ from ipor_fusion.fuses import (
     RamsesV2CollectFuse,
     RamsesV2ModifyPositionFuse,
     RamsesV2NewPositionFuse,
-    SendParams,
     SettlementMode,
     StakeFuse,
-    StargateCrosschainCommandFuse,
-    StargateCrosschainCommandType,
-    StargateCrosschainSupplyFuse,
-    StargateSendParams,
     TimeInForce,
     UniswapV3ClosePositionEvent,
     UniswapV3CollectFuse,
@@ -279,7 +280,6 @@ from ipor_fusion.fuses import (
     UniversalTokenSwapperAbi,
     UniversalTokenSwapperFuse,
     UniversalTokenSwapperSubstrates,
-    crosschain_market_id,
     decode_hypercore_event,
     euler_substrate,
     find_hypercore_events,

{ipor_fusion-4.0.0.dev103 → ipor_fusion-4.0.0.dev106}/src/ipor_fusion/crosschain/__init__.py

@@ -1,14 +1,11 @@
 """Crosschain Plasma Vault support, split like the contracts: shared
-``messages`` and ``contracts`` (wrapper bases), plus one subpackage per
-transport (``stargate``, ``ccip``) with its wire codecs and wrappers.
-
-This namespace exports only the fuse-free half of the package. The fuse
-encoders in :mod:`ipor_fusion.fuses.crosschain` import it, and Python runs a
-package's ``__init__`` before any of its modules, so anything here that
-imported the encoders back would re-enter a half-initialized module. The
-modules that need the encoders, ``lane``, ``discovery``, ``transport``,
-``simulation`` and the per-transport ``lane``/``transport``, are exported from
-:mod:`ipor_fusion` and importable by module path.
+``messages`` and ``contracts`` (wrapper bases), the market fuse encoders in
+``fuses`` (mirroring ``contracts/fuses/crosschain``), the transport-agnostic
+``transport``, ``lane``, ``discovery`` and ``simulation``, and one subpackage
+per transport (``stargate``, ``ccip``) with its wire codecs, wrappers,
+transport and lane. This namespace exports all of it; the transport
+subpackages export only their codecs and wrappers, because the encoders import
+those and a package's ``__init__`` runs before any of its modules.
 
 Status: preview, not production. The contracts behind it are under active development, the mainnet deployments are a proof of concept and IPOR Labs canaries, and interfaces may change between minor versions; see ``ipor_fusion.about.PREVIEW_FEATURES``.
 """
@@ -59,16 +56,51 @@ from ipor_fusion.crosschain.ccip.indexer import (
     fetch_verifier_result,
     manual_execution,
 )
+from ipor_fusion.crosschain.ccip.lane import CcipLane
 from ipor_fusion.crosschain.ccip.quote import (
     INSUFFICIENT_NATIVE_FEE_SELECTOR,
     quote_ccip_native_fee,
 )
+from ipor_fusion.crosschain.ccip.transport import CcipChain, CcipTransport
 from ipor_fusion.crosschain.contracts import (
     CrosschainDispatcher,
     CrosschainExecutor,
     CrosschainFactory,
 )
+from ipor_fusion.crosschain.discovery import (
+    LANES,
+    CrosschainDeployment,
+    CrosschainExecutorInfo,
+    detect_transport,
+    discover_deployment,
+    discover_lane_fuses,
+    open_lane,
+    open_lanes,
+)
 from ipor_fusion.crosschain.errors import CROSSCHAIN_ERROR_SIGNATURES
+from ipor_fusion.crosschain.fuses.base import (
+    CrosschainClaimFuse,
+    CrosschainCommandFuse,
+    CrosschainSubstrate,
+    CrosschainSubstrateLib,
+    CrosschainSubstrateType,
+    CrosschainSupplyFuse,
+    SendParams,
+    crosschain_market_id,
+)
+from ipor_fusion.crosschain.fuses.ccip import (
+    CcipCommandType,
+    CcipCrosschainCommandFuse,
+    CcipCrosschainSupplyFuse,
+    CcipSendParams,
+)
+from ipor_fusion.crosschain.fuses.stargate import (
+    StargateCrosschainCommandFuse,
+    StargateCrosschainCommandType,
+    StargateCrosschainSupplyFuse,
+    StargateSendParams,
+)
+from ipor_fusion.crosschain.lane import CrosschainLane, LaneFuses, LaneObservation
 from ipor_fusion.crosschain.messages import (
     CCIP_VERSION,
     CODEC_VERSION,
@@ -84,6 +116,7 @@ from ipor_fusion.crosschain.messages import (
     decode_command,
     decode_envelope,
 )
+from ipor_fusion.crosschain.simulation import CrosschainSimulator
 from ipor_fusion.crosschain.stargate.contracts import (
     ActiveCommand,
     BalanceObservation,
@@ -94,6 +127,7 @@ from ipor_fusion.crosschain.stargate.contracts import (
     StargateCrosschainFactory,
     StargateTokenMessaging,
 )
+from ipor_fusion.crosschain.stargate.lane import StargateLane
 from ipor_fusion.crosschain.stargate.layerzero import (
     PACKET_SENT_TOPIC,
     EnforcedOptionParam,
@@ -105,8 +139,53 @@ from ipor_fusion.crosschain.stargate.layerzero import (
     lz_compose_calldata,
     lz_receive_calldata,
 )
+from ipor_fusion.crosschain.stargate.transport import StargateChain, StargateTransport
+from ipor_fusion.crosschain.transport import (
+    SYNTHETIC_TOKEN_SOURCE,
+    CrosschainTransport,
+    DeliveryCall,
+    OutboundMessage,
+)
 
 __all__ = [
+    "CrosschainClaimFuse",
+    "CrosschainCommandFuse",
+    "CrosschainSubstrate",
+    "CrosschainSubstrateLib",
+    "CrosschainSubstrateType",
+    "CrosschainSupplyFuse",
+    "SendParams",
+    "crosschain_market_id",
+    "CcipCommandType",
+    "CcipCrosschainCommandFuse",
+    "CcipCrosschainSupplyFuse",
+    "CcipSendParams",
+    "StargateCrosschainCommandFuse",
+    "StargateCrosschainCommandType",
+    "StargateCrosschainSupplyFuse",
+    "StargateSendParams",
+    "LANES",
+    "CrosschainDeployment",
+    "CrosschainExecutorInfo",
+    "detect_transport",
+    "discover_deployment",
+    "discover_lane_fuses",
+    "open_lane",
+    "open_lanes",
+    "CrosschainLane",
+    "LaneFuses",
+    "LaneObservation",
+    "CrosschainSimulator",
+    "SYNTHETIC_TOKEN_SOURCE",
+    "CrosschainTransport",
+    "DeliveryCall",
+    "OutboundMessage",
+    "CcipLane",
+    "CcipChain",
+    "CcipTransport",
+    "StargateLane",
+    "StargateChain",
+    "StargateTransport",
     "ActiveCommand",
     "Any2EVMMessage",
     "BalanceObservation",

{ipor_fusion-4.0.0.dev103 → ipor_fusion-4.0.0.dev106}/src/ipor_fusion/crosschain/ccip/__init__.py

@@ -1,6 +1,7 @@
-"""Chainlink CCIP: wire codecs and contract wrappers. The transport and lane
-(``ccip.transport``, ``ccip.lane``) import the fuse encoders and are exported
-from :mod:`ipor_fusion` instead, see :mod:`ipor_fusion.crosschain`.
+"""Chainlink CCIP: wire codecs and contract wrappers. The CCIP fuse encoders
+(:mod:`ipor_fusion.crosschain.fuses.ccip`) import them, so this namespace must
+not import the encoders back: the transport and lane (``ccip.transport``,
+``ccip.lane``) are exported from :mod:`ipor_fusion.crosschain` instead.
 
 Status: preview, not production. The contracts behind it are under active development, the mainnet deployments are a proof of concept and IPOR Labs canaries, and interfaces may change between minor versions; see ``ipor_fusion.about.PREVIEW_FEATURES``.
 """

{ipor_fusion-4.0.0.dev103 → ipor_fusion-4.0.0.dev106}/src/ipor_fusion/crosschain/ccip/lane.py

@@ -14,14 +14,14 @@ from ipor_fusion.crosschain.ccip.contracts import (
     CcipRouteConfig,
 )
 from ipor_fusion.crosschain.contracts import BalanceObservation
-from ipor_fusion.crosschain.lane import CrosschainLane, LaneFuses, LaneObservation
-from ipor_fusion.crosschain.messages import CommandStatus, CrosschainTransportKind
-from ipor_fusion.fuses.crosschain.base import SendParams
-from ipor_fusion.fuses.crosschain.ccip import (
+from ipor_fusion.crosschain.fuses.base import SendParams
+from ipor_fusion.crosschain.fuses.ccip import (
     CcipCrosschainCommandFuse,
     CcipCrosschainSupplyFuse,
     CcipSendParams,
 )
+from ipor_fusion.crosschain.lane import CrosschainLane, LaneFuses, LaneObservation
+from ipor_fusion.crosschain.messages import CommandStatus, CrosschainTransportKind
 from ipor_fusion.types import Amount, ProposalId
 
 

{ipor_fusion-4.0.0.dev103 → ipor_fusion-4.0.0.dev106}/src/ipor_fusion/crosschain/contracts.py

@@ -7,7 +7,7 @@ here hold the surface both transports share; ``stargate.contracts`` and
 executor functions (``sendAssetToDispatcher``, ``sendCommandToDispatcher``,
 ``registerChain``, ...) are deliberately absent: the executor's ``MANAGER`` is
 the PlasmaVault, so those are reachable only through the fuses in
-``ipor_fusion.fuses.crosschain``.
+``ipor_fusion.crosschain.fuses``.
 """
 
 from __future__ import annotations

{ipor_fusion-4.0.0.dev103 → ipor_fusion-4.0.0.dev106}/src/ipor_fusion/crosschain/discovery.py

@@ -30,15 +30,15 @@ from ipor_fusion.core.plasma_vault import PlasmaVault
 from ipor_fusion.crosschain.ccip.contracts import CcipCrosschainExecutor
 from ipor_fusion.crosschain.ccip.lane import CcipLane
 from ipor_fusion.crosschain.contracts import CrosschainExecutor
+from ipor_fusion.crosschain.fuses.base import (
+    CrosschainSubstrateLib,
+    CrosschainSubstrateType,
+)
 from ipor_fusion.crosschain.lane import CrosschainLane, LaneFuses
 from ipor_fusion.crosschain.messages import CrosschainTransportKind
 from ipor_fusion.crosschain.stargate.contracts import StargateCrosschainExecutor
 from ipor_fusion.crosschain.stargate.lane import StargateLane
 from ipor_fusion.errors import CrosschainDiscoveryError, EmptyCallResultError
-from ipor_fusion.fuses.crosschain.base import (
-    CrosschainSubstrateLib,
-    CrosschainSubstrateType,
-)
 from ipor_fusion.types import (
     ZERO_ADDRESS,
     ChainId,

{ipor_fusion-4.0.0.dev103/src/ipor_fusion/fuses/crosschain → ipor_fusion-4.0.0.dev106/src/ipor_fusion/crosschain/fuses}/__init__.py

@@ -1,11 +1,12 @@
-"""Crosschain market fuses, split by transport like the contracts:
+"""Crosschain market fuses (``contracts/fuses/crosschain``), split by transport
+like the contracts:
 ``base`` (substrates, the transport-agnostic bases, the claim fuse),
 ``stargate`` and ``ccip``.
 
 Status: preview, not production. The contracts behind it are under active development, the mainnet deployments are a proof of concept and IPOR Labs canaries, and interfaces may change between minor versions; see ``ipor_fusion.about.PREVIEW_FEATURES``.
 """
 
-from ipor_fusion.fuses.crosschain.base import (
+from ipor_fusion.crosschain.fuses.base import (
     CrosschainClaimFuse,
     CrosschainCommandFuse,
     CrosschainSubstrate,
@@ -15,13 +16,13 @@ from ipor_fusion.fuses.crosschain.base import (
     SendParams,
     crosschain_market_id,
 )
-from ipor_fusion.fuses.crosschain.ccip import (
+from ipor_fusion.crosschain.fuses.ccip import (
     CcipCommandType,
     CcipCrosschainCommandFuse,
     CcipCrosschainSupplyFuse,
     CcipSendParams,
 )
-from ipor_fusion.fuses.crosschain.stargate import (
+from ipor_fusion.crosschain.fuses.stargate import (
     StargateCrosschainCommandFuse,
     StargateCrosschainCommandType,
     StargateCrosschainSupplyFuse,

{ipor_fusion-4.0.0.dev103/src/ipor_fusion/fuses/crosschain → ipor_fusion-4.0.0.dev106/src/ipor_fusion/crosschain/fuses}/ccip.py

@@ -25,12 +25,12 @@ from eth_typing import ChecksumAddress
 from ipor_fusion.core.fuse import Fuse
 from ipor_fusion.core.fuse_action import FuseAction
 from ipor_fusion.crosschain.ccip.contracts import CcipRouteConfig
-from ipor_fusion.crosschain.messages import COMMAND_TUPLE_TYPE, EMPTY_COMMAND, Command
-from ipor_fusion.fuses.crosschain.base import (
+from ipor_fusion.crosschain.fuses.base import (
     CrosschainCommandFuse,
     CrosschainSupplyFuse,
     SendParams,
 )
+from ipor_fusion.crosschain.messages import COMMAND_TUPLE_TYPE, EMPTY_COMMAND, Command
 from ipor_fusion.types import ZERO_ADDRESS, Amount, ChainId
 
 

{ipor_fusion-4.0.0.dev103/src/ipor_fusion/fuses/crosschain → ipor_fusion-4.0.0.dev106/src/ipor_fusion/crosschain/fuses}/stargate.py

@@ -22,6 +22,11 @@ from eth_typing import ChecksumAddress
 
 from ipor_fusion.core.fuse import Fuse
 from ipor_fusion.core.fuse_action import FuseAction
+from ipor_fusion.crosschain.fuses.base import (
+    CrosschainCommandFuse,
+    CrosschainSupplyFuse,
+    SendParams,
+)
 from ipor_fusion.crosschain.messages import (
     COMMAND_TUPLE_TYPE,
     EMPTY_COMMAND,
@@ -29,11 +34,6 @@ from ipor_fusion.crosschain.messages import (
     Command,
 )
 from ipor_fusion.crosschain.stargate.layerzero import OptionsBuilder
-from ipor_fusion.fuses.crosschain.base import (
-    CrosschainCommandFuse,
-    CrosschainSupplyFuse,
-    SendParams,
-)
 from ipor_fusion.types import Amount, ChainId, DeploymentRequestId, LayerZeroEid
 
 _NO_CHAIN = ChainId(0)

{ipor_fusion-4.0.0.dev103 → ipor_fusion-4.0.0.dev106}/src/ipor_fusion/crosschain/lane.py

@@ -40,14 +40,14 @@ from ipor_fusion.crosschain.contracts import (
     CrosschainDispatcher,
     CrosschainExecutor,
 )
-from ipor_fusion.crosschain.logs import log_address, log_bytes, log_topic0
-from ipor_fusion.crosschain.messages import Command, CrosschainTransportKind
-from ipor_fusion.fuses.crosschain.base import (
+from ipor_fusion.crosschain.fuses.base import (
     CrosschainClaimFuse,
     CrosschainCommandFuse,
     CrosschainSupplyFuse,
     SendParams,
 )
+from ipor_fusion.crosschain.logs import log_address, log_bytes, log_topic0
+from ipor_fusion.crosschain.messages import Command, CrosschainTransportKind
 from ipor_fusion.types import Amount, ChainId, FuseAddress, PositionSetHash, ProposalId
 
 

{ipor_fusion-4.0.0.dev103 → ipor_fusion-4.0.0.dev106}/src/ipor_fusion/crosschain/stargate/__init__.py

@@ -1,7 +1,8 @@
-"""Stargate V2 / LayerZero V2: wire codecs and contract wrappers. The
-transport and lane (``stargate.transport``, ``stargate.lane``) import the fuse
-encoders and are exported from :mod:`ipor_fusion` instead, see
-:mod:`ipor_fusion.crosschain`.
+"""Stargate V2 / LayerZero V2: wire codecs and contract wrappers. The Stargate
+fuse encoders (:mod:`ipor_fusion.crosschain.fuses.stargate`) import them, so
+this namespace must not import the encoders back: the transport and lane
+(``stargate.transport``, ``stargate.lane``) are exported from
+:mod:`ipor_fusion.crosschain` instead.
 
 Status: preview, not production. The contracts behind it are under active development, the mainnet deployments are a proof of concept and IPOR Labs canaries, and interfaces may change between minor versions; see ``ipor_fusion.about.PREVIEW_FEATURES``.
 """

{ipor_fusion-4.0.0.dev103 → ipor_fusion-4.0.0.dev106}/src/ipor_fusion/crosschain/stargate/lane.py

@@ -11,6 +11,12 @@ from eth_utils import keccak
 from ipor_fusion.core.context import Web3Context
 from ipor_fusion.core.contract import Call
 from ipor_fusion.crosschain.contracts import BalanceObservation
+from ipor_fusion.crosschain.fuses.base import SendParams
+from ipor_fusion.crosschain.fuses.stargate import (
+    StargateCrosschainCommandFuse,
+    StargateCrosschainSupplyFuse,
+    StargateSendParams,
+)
 from ipor_fusion.crosschain.lane import CrosschainLane, LaneFuses, LaneObservation
 from ipor_fusion.crosschain.messages import CommandStatus, CrosschainTransportKind
 from ipor_fusion.crosschain.stargate.contracts import (
@@ -19,12 +25,6 @@ from ipor_fusion.crosschain.stargate.contracts import (
     StargateCrosschainExecutor,
 )
 from ipor_fusion.crosschain.stargate.layerzero import OptionsBuilder
-from ipor_fusion.fuses.crosschain.base import SendParams
-from ipor_fusion.fuses.crosschain.stargate import (
-    StargateCrosschainCommandFuse,
-    StargateCrosschainSupplyFuse,
-    StargateSendParams,
-)
 from ipor_fusion.types import Amount