ipor-fusion 4.0.0.dev28__tar.gz → 4.0.0.dev30__tar.gz

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev30}/PKG-INFO

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

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

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev30}/src/ipor_fusion/__init__.py

@@ -311,21 +311,31 @@ from ipor_fusion.substrates import (
 from ipor_fusion.types import (
     MAX_UINT256,
     Amount,
+    AssetId,
     AssetSource,
     ChainId,
+    CommandId,
     Decimals,
+    DeploymentRequestId,
     Fee,
     Liquidity,
     MappingStatus,
     MarketId,
+    MessageId,
     MorphoBlueMarketId,
     NodeStatus,
+    OperationId,
     Period,
+    PositionSetHash,
     Price,
+    ProposalId,
+    ReturnRequestId,
     RoleId,
     Shares,
+    StargateAssetId,
     Tick,
     TokenId,
+    TransferId,
 )
 from ipor_fusion.validation import (
     Erc20Holding,
@@ -595,6 +605,16 @@ __all__ = [
     "RoleId",
     "ChainId",
     "MorphoBlueMarketId",
+    "AssetId",
+    "CommandId",
+    "DeploymentRequestId",
+    "MessageId",
+    "OperationId",
+    "PositionSetHash",
+    "ProposalId",
+    "ReturnRequestId",
+    "StargateAssetId",
+    "TransferId",
     "Price",
     "Period",
     "MAX_UINT256",

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev30}/src/ipor_fusion/crosschain/ccip/chainlink.py

@@ -16,7 +16,7 @@ from eth_typing import ChecksumAddress
 from ipor_fusion.core.context import Web3Context
 from ipor_fusion.core.contract import Call, ContractWrapper
 from ipor_fusion.crosschain.contracts import _address
-from ipor_fusion.types import ZERO_ADDRESS
+from ipor_fusion.types import ZERO_ADDRESS, MessageId
 
 
 class CcipRouter(ContractWrapper):
@@ -191,7 +191,7 @@ class CcipOffRamp(ContractWrapper):
     def type_and_version(self) -> Call[str]:
         return self._view("typeAndVersion()", output_types=["string"])
 
-    def execution_state(self, message_id: bytes) -> Call[MessageExecutionState]:
+    def execution_state(self, message_id: MessageId) -> Call[MessageExecutionState]:
         return self._view(
             "getExecutionState(bytes32)",
             message_id,

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev30}/src/ipor_fusion/crosschain/ccip/codec.py

@@ -21,6 +21,7 @@ from web3 import Web3
 
 from ipor_fusion.core.contract import _encode_calldata
 from ipor_fusion.crosschain.logs import log_bytes
+from ipor_fusion.types import MessageId
 
 #: topic0 of ``OnRamp 2.0.0``'s ``CCIPMessageSent``; ``destChainSelector``,
 #: ``sender`` and ``messageId`` are indexed.
@@ -176,7 +177,7 @@ def evm_address(raw: bytes) -> ChecksumAddress:
 class CcipMessageSent:
     """One ``CCIPMessageSent`` log: the Router-assigned id plus the decoded message."""
 
-    message_id: bytes
+    message_id: MessageId
     dest_chain_selector: int
     sender: ChecksumAddress
     message: MessageV1
@@ -193,7 +194,7 @@ class CcipMessageSent:
             _EVENT_DATA_TYPES, log_bytes(log["data"])
         )
         return cls(
-            message_id=topics[3],
+            message_id=MessageId(bytes(topics[3])),
             dest_chain_selector=int.from_bytes(topics[1], "big"),
             sender=Web3.to_checksum_address(topics[2][12:]),
             message=MessageV1.decode(bytes(encoded)),
@@ -215,7 +216,7 @@ class Any2EVMMessage:
     ``sender`` is the source address; it is ABI-encoded into the wire field,
     which is how the receivers decode it."""
 
-    message_id: bytes
+    message_id: MessageId
     source_chain_selector: int
     sender: ChecksumAddress
     data: bytes

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev30}/src/ipor_fusion/crosschain/ccip/contracts.py

@@ -18,7 +18,16 @@ from ipor_fusion.crosschain.contracts import (
     _address,
 )
 from ipor_fusion.crosschain.messages import CommandStatus, CrosschainTransportKind
-from ipor_fusion.types import Amount, ChainId
+from ipor_fusion.types import (
+    Amount,
+    AssetId,
+    ChainId,
+    CommandId,
+    MessageId,
+    OperationId,
+    PositionSetHash,
+    ProposalId,
+)
 
 
 @dataclass(frozen=True, slots=True)
@@ -30,7 +39,7 @@ class CcipObservation:
     queued_token_amount: Amount
     state_version: int
     command_config_epoch: int
-    tracked_position_set_hash: bytes
+    tracked_position_set_hash: PositionSetHash
 
 
 @dataclass(frozen=True, slots=True)
@@ -161,13 +170,13 @@ class CcipCrosschainExecutor(CrosschainExecutor):
             "activeReturn(uint256)", chain_id, output_types=["bytes32"], decoder=bytes
         )
 
-    def active_command(self, chain_id: ChainId) -> Call[bytes]:
+    def active_command(self, chain_id: ChainId) -> Call[CommandId]:
         """The active command id for the chain, or 32 zero bytes."""
         return self._view(
             "activeCommand(uint256)",
             chain_id,
             output_types=["bytes32"],
-            decoder=bytes,
+            decoder=lambda value: CommandId(bytes(value)),
         )
 
     def next_command_sequence(self, chain_id: ChainId) -> Call[int]:
@@ -203,7 +212,7 @@ class CcipCrosschainExecutor(CrosschainExecutor):
             decoder=Amount,
         )
 
-    def command_status(self, command_id: bytes) -> Call[CommandStatus]:
+    def command_status(self, command_id: CommandId) -> Call[CommandStatus]:
         return self._view(
             "commandStatus(bytes32)",
             command_id,
@@ -219,7 +228,7 @@ class CcipCrosschainExecutor(CrosschainExecutor):
             "pendingTransferCount(uint256)", chain_id, output_types=["uint8"]
         )
 
-    def processed_ccip_message(self, message_id: bytes) -> Call[bool]:
+    def processed_ccip_message(self, message_id: MessageId) -> Call[bool]:
         return self._view(
             "processedCcipMessage(bytes32)", message_id, output_types=["bool"]
         )
@@ -236,7 +245,7 @@ class CcipCrosschainExecutor(CrosschainExecutor):
             output_types=["uint256"],
         )
 
-    def reject_balance_and_block(self, proposal_id: int) -> Call[None]:
+    def reject_balance_and_block(self, proposal_id: ProposalId) -> Call[None]:
         """``BALANCE_APPROVER`` only: reject and fail the chain closed."""
         return self._write("rejectBalanceAndBlock(uint256)", proposal_id)
 
@@ -292,12 +301,12 @@ class CcipCrosschainDispatcher(CrosschainDispatcher):
             "queuedTokenAmount()", output_types=["uint256"], decoder=Amount
         )
 
-    def processed_operation(self, operation_id: bytes) -> Call[bool]:
+    def processed_operation(self, operation_id: OperationId) -> Call[bool]:
         return self._view(
             "processedOperation(bytes32)", operation_id, output_types=["bool"]
         )
 
-    def processed_ccip_message(self, message_id: bytes) -> Call[bool]:
+    def processed_ccip_message(self, message_id: MessageId) -> Call[bool]:
         return self._view(
             "processedCcipMessage(bytes32)", message_id, output_types=["bool"]
         )
@@ -316,7 +325,7 @@ def _ccip_observation_decoder(values: tuple) -> CcipObservation:
         queued_token_amount=Amount(queued),
         state_version=int(version),
         command_config_epoch=int(epoch),
-        tracked_position_set_hash=bytes(set_hash),
+        tracked_position_set_hash=PositionSetHash(bytes(set_hash)),
     )
 
 
@@ -327,7 +336,7 @@ class CcipCrosschainFactory(CrosschainFactory):
     def create_executor(
         self,
         user_salt: bytes,
-        asset_id: bytes,
+        asset_id: AssetId,
         manager: ChecksumAddress,
         safety: SafetyConfig,
     ) -> Call[ChecksumAddress]:
@@ -365,7 +374,9 @@ class CcipCrosschainFactory(CrosschainFactory):
             decoder=ChainId,
         )
 
-    def asset_config(self, asset_id: bytes) -> Call[tuple[ChecksumAddress, int, bool]]:
+    def asset_config(
+        self, asset_id: AssetId
+    ) -> Call[tuple[ChecksumAddress, int, bool]]:
         """``(token, sharedDecimals, enabled)`` for an asset id."""
         return self._view(
             "assetConfig(bytes32)",
@@ -444,7 +455,7 @@ class CcipCrosschainFactory(CrosschainFactory):
         )
 
     def schedule_asset(
-        self, asset_id: bytes, token: ChecksumAddress, shared_decimals: int
+        self, asset_id: AssetId, token: ChecksumAddress, shared_decimals: int
     ) -> Call[None]:
         """Owner-only; executable after ``config_delay`` with the same arguments."""
         return self._write(
@@ -452,7 +463,7 @@ class CcipCrosschainFactory(CrosschainFactory):
         )
 
     def execute_asset(
-        self, asset_id: bytes, token: ChecksumAddress, shared_decimals: int
+        self, asset_id: AssetId, token: ChecksumAddress, shared_decimals: int
     ) -> Call[None]:
         return self._write(
             "executeAsset(bytes32,address,uint8)", asset_id, token, shared_decimals

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev30}/src/ipor_fusion/crosschain/ccip/indexer.py

@@ -21,6 +21,7 @@ from web3 import Web3
 
 from ipor_fusion.core.contract import Call
 from ipor_fusion.crosschain.ccip.chainlink import CcipOffRamp
+from ipor_fusion.types import MessageId
 
 #: Chainlink Labs' public mainnet indexers, tried in order.
 INDEXER_URLS: tuple[str, ...] = (
@@ -40,7 +41,7 @@ class VerifierResultUnavailable(LookupError):
 class VerifierResult:
     """One message's committee result as the indexer serves it."""
 
-    message_id: bytes
+    message_id: MessageId
     #: The CCVs the message names, in the order ``execute`` expects.
     ccv_addresses: tuple[ChecksumAddress, ...]
     #: The verifier result for the committee CCV: version tag, signature
@@ -54,7 +55,7 @@ class VerifierResult:
 
 
 def fetch_verifier_result(
-    message_id: bytes,
+    message_id: MessageId,
     *,
     indexers: Sequence[str] = INDEXER_URLS,
     timeout: float = 15.0,
@@ -82,7 +83,7 @@ def fetch_verifier_result(
             continue
         result = results[0]["verifierResult"]
         return VerifierResult(
-            message_id=bytes.fromhex(result["message_id"][2:]),
+            message_id=MessageId(bytes.fromhex(result["message_id"][2:])),
             ccv_addresses=tuple(
                 Web3.to_checksum_address(a) for a in result["message_ccv_addresses"]
             ),

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev30}/src/ipor_fusion/crosschain/contracts.py

@@ -19,7 +19,14 @@ from web3 import Web3
 
 from ipor_fusion.core.contract import Call, ContractWrapper
 from ipor_fusion.crosschain.messages import CommandStatus
-from ipor_fusion.types import Amount, ChainId
+from ipor_fusion.types import (
+    Amount,
+    AssetId,
+    ChainId,
+    CommandId,
+    PositionSetHash,
+    ProposalId,
+)
 
 
 @dataclass(frozen=True, slots=True)
@@ -36,7 +43,7 @@ class BalanceObservation:
     remote_block: int
     remote_timestamp: int
     expiry: int
-    tracked_position_set_hash: bytes
+    tracked_position_set_hash: PositionSetHash
 
     def as_tuple(self) -> tuple:
         return (
@@ -150,7 +157,7 @@ class CrosschainExecutor(ContractWrapper):
             "lastApprovedObservedAt(uint256)", chain_id, output_types=["uint64"]
         )
 
-    def approve_balance(self, proposal_id: int) -> Call[None]:
+    def approve_balance(self, proposal_id: ProposalId) -> Call[None]:
         """``BALANCE_APPROVER`` only."""
         return self._write("approveBalance(uint256)", proposal_id)
 
@@ -205,7 +212,7 @@ class CrosschainDispatcher(ContractWrapper):
             "pendingRequestShares(address)", vault, output_types=["uint256"]
         )
 
-    def command_status(self, command_id: bytes) -> Call[CommandStatus]:
+    def command_status(self, command_id: CommandId) -> Call[CommandStatus]:
         return self._view(
             "commandStatus(bytes32)",
             command_id,
@@ -253,7 +260,7 @@ class CrosschainFactory(ContractWrapper):
     def is_allowed_creator(self, creator: ChecksumAddress) -> Call[bool]:
         return self._view("isAllowedCreator(address)", creator, output_types=["bool"])
 
-    def asset_frozen(self, asset_id: bytes) -> Call[bool]:
+    def asset_frozen(self, asset_id: AssetId) -> Call[bool]:
         return self._view("assetFrozen(bytes32)", asset_id, output_types=["bool"])
 
     def creation_codes_configured(self) -> Call[bool]:

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev30}/src/ipor_fusion/crosschain/lane.py

@@ -40,7 +40,7 @@ from ipor_fusion.fuses.crosschain.base import (
     CrosschainSupplyFuse,
     SendParams,
 )
-from ipor_fusion.types import Amount, ChainId
+from ipor_fusion.types import Amount, ChainId, PositionSetHash, ProposalId
 
 
 @dataclass(frozen=True, slots=True)
@@ -54,7 +54,7 @@ class LaneObservation:
     accounted_balance: Amount
     state_version: int
     command_config_epoch: int
-    tracked_position_set_hash: bytes
+    tracked_position_set_hash: PositionSetHash
 
 
 @dataclass(frozen=True, slots=True)
@@ -241,11 +241,11 @@ class CrosschainLane(ABC):
         last = self.last_approved_observed_at().call()
         return last == 0 or now - last > self.staleness_max().call() - margin
 
-    def approve_balance(self, proposal_id: int) -> Call[None]:
+    def approve_balance(self, proposal_id: ProposalId) -> Call[None]:
         """``BALANCE_APPROVER`` only."""
         return self.executor.approve_balance(proposal_id)
 
-    def proposal_id_from_logs(self, logs: Iterable[Mapping]) -> int:
+    def proposal_id_from_logs(self, logs: Iterable[Mapping]) -> ProposalId:
         """The id of the proposal this lane's executor emitted in ``logs``
         (a receipt's or a simulated call's), from its ``BalanceProposed``."""
         for log in logs:
@@ -254,10 +254,10 @@ class CrosschainLane(ABC):
                 and log_address(log) == self.executor_address
             ):
                 (proposal_id,) = decode(["uint256"], log_bytes(log["data"])[:32])
-                return int(proposal_id)
+                return ProposalId(int(proposal_id))
         raise ValueError("no BalanceProposed log from the executor")
 
-    def proposal_id_from_receipt(self, receipt: Mapping) -> int:
+    def proposal_id_from_receipt(self, receipt: Mapping) -> ProposalId:
         return self.proposal_id_from_logs(receipt["logs"])
 
     def _require_spoke(self, observation: BalanceObservation) -> None:

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev30}/src/ipor_fusion/crosschain/messages.py

@@ -18,7 +18,7 @@ from eth_typing import ChecksumAddress
 from web3 import Web3
 
 from ipor_fusion.core.address import _validate_not_zero_address
-from ipor_fusion.types import Amount, Shares
+from ipor_fusion.types import Amount, CommandId, Shares
 
 #: ``CrosschainConstants.CODEC_VERSION`` -- the Stargate/LayerZero envelope version.
 CODEC_VERSION = 3
@@ -128,6 +128,10 @@ _ZERO_SHARES = Shares(0)
 COMMAND_TUPLE_TYPE = "(bytes32,uint64,uint64,uint8,bytes)"
 
 
+# The zero command id: no command, or one not yet assigned by the executor.
+NO_COMMAND_ID = CommandId(bytes(32))
+
+
 @dataclass(frozen=True, slots=True)
 class Command:
     """``CrosschainMessages.Command``: one business command for a dispatcher.
@@ -143,7 +147,7 @@ class Command:
 
     action: BusinessAction
     action_data: bytes
-    command_id: bytes = bytes(32)
+    command_id: CommandId = NO_COMMAND_ID
     sequence: int = 0
     command_config_epoch: int = 0
 
@@ -167,7 +171,7 @@ class Command:
         return cls(
             action=BusinessAction(action),
             action_data=bytes(action_data),
-            command_id=bytes(command_id),
+            command_id=CommandId(bytes(command_id)),
             sequence=int(sequence),
             command_config_epoch=int(config_epoch),
         )

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev30}/src/ipor_fusion/crosschain/stargate/contracts.py

@@ -17,7 +17,18 @@ from ipor_fusion.crosschain.contracts import (
     _address_list,
 )
 from ipor_fusion.crosschain.messages import CommandStatus, DeploymentStatus
-from ipor_fusion.types import Amount, ChainId
+from ipor_fusion.types import (
+    Amount,
+    AssetId,
+    ChainId,
+    CommandId,
+    DeploymentRequestId,
+    PositionSetHash,
+    ProposalId,
+    ReturnRequestId,
+    StargateAssetId,
+    TransferId,
+)
 
 
 @dataclass(frozen=True, slots=True)
@@ -28,7 +39,7 @@ class ActiveCommand:
     is_config_update: bool
     awaiting_cancel: bool
     status: CommandStatus
-    command_id: bytes
+    command_id: CommandId
     sequence: int
     new_config_epoch: int
 
@@ -43,7 +54,7 @@ class Observation:
     vault_asset_values: list[Amount]
     state_version: int
     command_config_epoch: int
-    tracked_position_set_hash: bytes
+    tracked_position_set_hash: PositionSetHash
 
 
 @dataclass(frozen=True, slots=True)
@@ -51,7 +62,7 @@ class ExecutorInitParams:
     """``ICrosschainFactory.ExecutorInitParams``: the immutable configuration
     ``StargateCrosschainFactory.createExecutor`` bakes into an executor."""
 
-    asset_id: bytes
+    asset_id: AssetId
     manager: ChecksumAddress
     admin: ChecksumAddress
     rescue_guardian: ChecksumAddress
@@ -188,7 +199,9 @@ class StargateCrosschainExecutor(CrosschainExecutor):
     def last_approval_at(self, chain_id: ChainId) -> Call[int]:
         return self._view("lastApprovalAt(uint256)", chain_id, output_types=["uint64"])
 
-    def deployment_status(self, request_id: int) -> Call[DeploymentStatus]:
+    def deployment_status(
+        self, request_id: DeploymentRequestId
+    ) -> Call[DeploymentStatus]:
         return self._view(
             "deploymentStatus(uint256)",
             request_id,
@@ -202,7 +215,7 @@ class StargateCrosschainExecutor(CrosschainExecutor):
             f"proposeBalance({_BALANCE_OBSERVATION_TUPLE})", observation.as_tuple()
         )
 
-    def reject_and_block_proposal(self, proposal_id: int) -> Call[None]:
+    def reject_and_block_proposal(self, proposal_id: ProposalId) -> Call[None]:
         """``BALANCE_APPROVER`` only: reject and fail the chain closed."""
         return self._write("rejectAndBlockProposal(uint256)", proposal_id)
 
@@ -219,7 +232,7 @@ def _active_command_decoder(values: tuple) -> ActiveCommand:
         is_config_update=bool(is_config),
         awaiting_cancel=bool(awaiting_cancel),
         status=CommandStatus(status),
-        command_id=bytes(command_id),
+        command_id=CommandId(bytes(command_id)),
         sequence=int(sequence),
         new_config_epoch=int(epoch),
     )
@@ -254,10 +267,10 @@ class StargateCrosschainDispatcher(CrosschainDispatcher):
             "getTrackedVaults()", output_types=["address[]"], decoder=_address_list
         )
 
-    def recall_consumed(self, request_id: bytes) -> Call[bool]:
+    def recall_consumed(self, request_id: ReturnRequestId) -> Call[bool]:
         return self._view("recallConsumed(bytes32)", request_id, output_types=["bool"])
 
-    def transfer_settled(self, transfer_id: bytes) -> Call[bool]:
+    def transfer_settled(self, transfer_id: TransferId) -> Call[bool]:
         return self._view(
             "transferSettled(bytes32)", transfer_id, output_types=["bool"]
         )
@@ -271,7 +284,7 @@ def _observation_decoder(values: tuple) -> Observation:
         vault_asset_values=[Amount(v) for v in asset_values],
         state_version=int(version),
         command_config_epoch=int(epoch),
-        tracked_position_set_hash=bytes(set_hash),
+        tracked_position_set_hash=PositionSetHash(bytes(set_hash)),
     )
 
 
@@ -283,7 +296,7 @@ class StargateTokenMessaging(ContractWrapper):
         """The peer OApp on ``eid`` as bytes32; zero when no route exists."""
         return self._view("peers(uint32)", eid, output_types=["bytes32"])
 
-    def stargate_impls(self, asset_id: int) -> Call[ChecksumAddress]:
+    def stargate_impls(self, asset_id: StargateAssetId) -> Call[ChecksumAddress]:
         """The local pool of ``asset_id``."""
         return self._view(
             "stargateImpls(uint16)",
@@ -321,7 +334,7 @@ class StargateCrosschainFactory(CrosschainFactory):
         )
 
     def asset_config(
-        self, asset_id: bytes
+        self, asset_id: AssetId
     ) -> Call[tuple[ChecksumAddress, ChecksumAddress, bool]]:
         """``(localToken, localStargatePool, enabled)`` for an asset id."""
         return self._view(
@@ -343,6 +356,6 @@ class StargateCrosschainFactory(CrosschainFactory):
     def request_count(self) -> Call[int]:
         return self._view("requestCount()", output_types=["uint256"])
 
-    def cancel_pending_deployment(self, request_id: int) -> Call[None]:
+    def cancel_pending_deployment(self, request_id: DeploymentRequestId) -> Call[None]:
         """Permissionless after the executor's ``DEPLOYMENT_TTL``."""
         return self._write("cancelPendingDeployment(uint256)", request_id)

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev30}/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
+from ipor_fusion.types import ZERO_ADDRESS, MessageId, StargateAssetId
 
 _TYPE_3 = b"\x00\x03"
 _EXECUTOR_WORKER_ID = 1
@@ -153,7 +153,7 @@ class Packet:
     sender: ChecksumAddress
     dst_eid: int
     receiver: ChecksumAddress
-    guid: bytes
+    guid: MessageId
     message: bytes
 
     @classmethod
@@ -166,7 +166,7 @@ class Packet:
             sender=bytes32_to_address(encoded[13:45]),
             dst_eid=int.from_bytes(encoded[45:49], "big"),
             receiver=bytes32_to_address(encoded[49:81]),
-            guid=encoded[81:113],
+            guid=MessageId(encoded[81:113]),
             message=encoded[113:],
         )
 
@@ -185,7 +185,7 @@ class TaxiMessage:
     ``TokenMessaging`` packet. ``compose_msg`` is the raw compose payload
     ``composeFrom (bytes32) || message`` or empty."""
 
-    asset_id: int
+    asset_id: StargateAssetId
     receiver: ChecksumAddress
     amount_sd: int
     compose_msg: bytes
@@ -195,7 +195,7 @@ class TaxiMessage:
         if len(message) < 43 or message[0] != _MSG_TYPE_TAXI:
             raise ValueError("not a Stargate taxi message")
         return cls(
-            asset_id=int.from_bytes(message[1:3], "big"),
+            asset_id=StargateAssetId(int.from_bytes(message[1:3], "big")),
             receiver=bytes32_to_address(message[3:35]),
             amount_sd=int.from_bytes(message[35:43], "big"),
             compose_msg=message[43:],
@@ -231,7 +231,7 @@ def lz_receive_calldata(
     src_eid: int,
     sender: ChecksumAddress,
     nonce: int,
-    guid: bytes,
+    guid: MessageId,
     message: bytes,
     executor: ChecksumAddress = ZERO_ADDRESS,  # type: ignore[assignment]
     extra_data: bytes = b"",
@@ -250,7 +250,7 @@ def lz_receive_calldata(
 def lz_compose_calldata(
     *,
     from_: ChecksumAddress,
-    guid: bytes,
+    guid: MessageId,
     message: bytes,
     executor: ChecksumAddress = ZERO_ADDRESS,  # type: ignore[assignment]
     extra_data: bytes = b"",

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev30}/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
+from ipor_fusion.types import ChainId, StargateAssetId
 
 
 @dataclass(frozen=True, slots=True)
@@ -50,7 +50,7 @@ class StargateChain:
     token_messaging: ChecksumAddress
     stargate_pool: ChecksumAddress
     token: ChecksumAddress
-    asset_id: int
+    asset_id: StargateAssetId
     local_decimals: int
     shared_decimals: int
     token_source: ChecksumAddress | None = None

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev30}/src/ipor_fusion/crosschain/transport.py

@@ -30,7 +30,7 @@ from ipor_fusion.core.context import Web3Context
 from ipor_fusion.core.contract import _encode_calldata
 from ipor_fusion.crosschain.contracts import CrosschainDispatcher, CrosschainExecutor
 from ipor_fusion.crosschain.messages import CrosschainTransportKind
-from ipor_fusion.types import ChainId
+from ipor_fusion.types import ChainId, MessageId
 
 
 @dataclass(frozen=True, slots=True)
@@ -44,7 +44,7 @@ class OutboundMessage:
     """
 
     transport_kind: CrosschainTransportKind
-    message_id: bytes
+    message_id: MessageId
     src_chain_id: ChainId
     dst_chain_id: ChainId
     sender: ChecksumAddress

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev30}/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
+from ipor_fusion.types import Amount, ChainId, DeploymentRequestId
 
 _NO_CHAIN = ChainId(0)
+_NO_REQUEST = DeploymentRequestId(0)
 _ZERO_AMOUNT = Amount(0)
 
 
@@ -174,7 +175,7 @@ class StargateCrosschainCommandFuse(CrosschainCommandFuse):
         eid: int = 0,
         enforced_options: bytes = b"",
         plasma_vaults: Sequence[ChecksumAddress] = (),
-        request_id: int = 0,
+        request_id: DeploymentRequestId = _NO_REQUEST,
         command: Command = EMPTY_COMMAND,
     ) -> FuseAction:
         """Forward one operation to the executor. Only the fields the operation
@@ -264,7 +265,7 @@ class StargateCrosschainCommandFuse(CrosschainCommandFuse):
         command_type: StargateCrosschainCommandType,
         chain_id: ChainId,
         eid: int,
-        request_id: int,
+        request_id: DeploymentRequestId,
         command: Command,
     ) -> None:
         if command_type == StargateCrosschainCommandType.UNDEFINED: