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

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev32}/AGENTS.md

@@ -285,7 +285,9 @@ or examples.
   `MarketId`, ...) name the unit, and nothing scales by decimals.
 - Ids and addresses are nominal in every signature: `ChainId`, `MarketId` (each
   `IporFusionMarkets` member is one), `RoleId | Roles`, `ChecksumAddress`;
-  `HexAddress` only for the lowercase addresses decoded from substrates. Raw input
+  `HexAddress` only for the lowercase addresses decoded from substrates;
+  `MorphoBlueMarketId` is always `0x` + 64 lowercase hex, built by
+  `parse_morpho_market_id`. Raw input
   is parsed once at the boundary (click param types, MCP tools, the user config).
   `src/`, `examples/` and `tests/typed_client/` are checked with
   `reportArgumentType` on, so a bare `int`/`str` passed for one fails pyright; the

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "ipor-fusion"
-version = "4.0.0.dev28"
+version = "4.0.0.dev32"
 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.dev32}/src/ipor_fusion/__init__.py

@@ -311,21 +311,32 @@ 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,
+    parse_morpho_market_id,
 )
 from ipor_fusion.validation import (
     Erc20Holding,
@@ -595,6 +606,17 @@ __all__ = [
     "RoleId",
     "ChainId",
     "MorphoBlueMarketId",
+    "parse_morpho_market_id",
+    "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.dev32}/src/ipor_fusion/cli/market_cmd.py

@@ -42,7 +42,7 @@ from ipor_fusion.readers.morpho import (
     MorphoReader,
     morpho_blue_address,
 )
-from ipor_fusion.types import ChainId, MorphoBlueMarketId
+from ipor_fusion.types import ChainId, MorphoBlueMarketId, parse_morpho_market_id
 from ipor_fusion.vault_info import BLOCK_EXPLORER_URLS
 
 
@@ -54,12 +54,10 @@ class MarketIdType(click.ParamType):
     def convert(self, value, param, ctx):  # type: ignore[override]
         if not isinstance(value, str):
             self.fail(f"expected string, got {type(value).__name__}", param, ctx)
-        raw = value.strip().removeprefix("0x").removeprefix("0X")
-        if len(raw) != 64 or not all(c in "0123456789abcdefABCDEF" for c in raw):
-            self.fail(
-                f"invalid Morpho market ID (expected 32-byte hex): {value}", param, ctx
-            )
-        return raw.lower()
+        try:
+            return parse_morpho_market_id(value)
+        except ValueError as exc:
+            self.fail(str(exc), param, ctx)
 
 
 MARKET_ID = MarketIdType()
@@ -106,7 +104,7 @@ def market() -> None:
     help="Emit machine-readable JSON instead of a table.",
 )
 def morpho_blue(
-    market_id: str,
+    market_id: MorphoBlueMarketId,
     chain_id: ChainId,
     block: int | None,
     no_api: bool,
@@ -127,7 +125,7 @@ def morpho_blue(
     if block is not None:
         ctx.default_block = block
     reader = MorphoReader(ctx, morpho_blue_address(chain_id))
-    mid = MorphoBlueMarketId(market_id)
+    mid = market_id
     params, state = reader.require_market(mid)
     rates = reader.rates_from(state, params)
 
@@ -171,7 +169,7 @@ def morpho_blue(
 
 
 def _print_market(
-    market_id: str,
+    market_id: MorphoBlueMarketId,
     chain_id: ChainId,
     params: MorphoMarketParams,
     state: MorphoMarket,
@@ -181,11 +179,11 @@ def _print_market(
     chain_name = CHAIN_NAMES.get(chain_id, str(chain_id))
     explorer = BLOCK_EXPLORER_URLS.get(chain_id, "")
     liquidity = state.total_supply_assets - state.total_borrow_assets
-    click.secho(f"Morpho Blue market 0x{market_id}", bold=True)
+    click.secho(f"Morpho Blue market {market_id}", bold=True)
     click.echo(f"  Chain:           {chain_name} (id {chain_id})")
     if explorer:
         click.echo(
-            f"  App:             https://app.morpho.org/{chain_name}/market/0x{market_id}"
+            f"  App:             https://app.morpho.org/{chain_name}/market/{market_id}"
         )
     click.echo(f"  Loan token:      {params.loan_token}")
     click.echo(f"  Collateral:      {params.collateral_token}")
@@ -332,7 +330,7 @@ def _print_reallocate_hint(params: MorphoMarketParams) -> None:
 @click.option(
     "--market",
     "market_filter",
-    type=str,
+    type=MARKET_ID,
     default=None,
     help="Filter caps/allocations to a single Morpho Blue market ID.",
 )
@@ -346,7 +344,7 @@ def _print_reallocate_hint(params: MorphoMarketParams) -> None:
 def meta_morpho(
     vault_address: ChecksumAddress,
     chain_id: ChainId,
-    market_filter: str | None,
+    market_filter: MorphoBlueMarketId | None,
     json_output: bool,
 ) -> None:
     """Inspect a MetaMorpho V1 or Morpho Vault V2 by address.
@@ -361,22 +359,18 @@ def meta_morpho(
     except MorphoApiError as exc:
         raise click.UsageError(str(exc)) from exc
 
-    market_filter_norm = (
-        ("0x" + market_filter.removeprefix("0x").lower()) if market_filter else None
-    )
-
     if json_output:
         click.echo(json_lib.dumps(build_meta_morpho_json(info, chain_id), indent=2))
         return
 
     if isinstance(info, VaultV2Info):
-        _print_vault_v2(info, chain_id, market_filter_norm)
+        _print_vault_v2(info, chain_id, market_filter)
     else:
-        _print_vault_v1(info, chain_id, market_filter_norm)
+        _print_vault_v1(info, chain_id, market_filter)
 
 
 def _print_vault_v2(
-    vault: VaultV2Info, chain_id: ChainId, market_filter: str | None
+    vault: VaultV2Info, chain_id: ChainId, market_filter: MorphoBlueMarketId | None
 ) -> None:
     chain_name = CHAIN_NAMES.get(chain_id, str(chain_id))
     click.secho(f"Morpho Vault V2 — {vault.name} ({vault.symbol})", bold=True)
@@ -433,9 +427,7 @@ def _print_vault_v2(
     market_caps = [c for c in vault.caps if c.cap_type == "MarketV1"]
     other_caps = [c for c in vault.caps if c.cap_type != "MarketV1"]
     if market_filter:
-        market_caps = [
-            c for c in market_caps if (c.market_id or "").lower() == market_filter
-        ]
+        market_caps = [c for c in market_caps if c.market_id == market_filter]
 
     click.secho(f"Morpho Blue market caps ({len(market_caps)}):", bold=True)
     _print_market_caps(market_caps, vault.asset_symbol, vault.asset_decimals)
@@ -508,7 +500,7 @@ def _print_other_caps(
 
 
 def _print_vault_v1(
-    vault: VaultV1Info, chain_id: ChainId, market_filter: str | None
+    vault: VaultV1Info, chain_id: ChainId, market_filter: MorphoBlueMarketId | None
 ) -> None:
     chain_name = CHAIN_NAMES.get(chain_id, str(chain_id))
     public_allocator = PUBLIC_ALLOCATOR_ADDRESSES.get(chain_id)
@@ -552,7 +544,7 @@ def _print_vault_v1(
 
     allocations = vault.allocations
     if market_filter:
-        allocations = [a for a in allocations if a.market_id.lower() == market_filter]
+        allocations = [a for a in allocations if a.market_id == market_filter]
     click.secho(f"Allocations ({len(allocations)}):", bold=True)
     if not allocations:
         click.echo("  (none)")

{ipor_fusion-4.0.0.dev28 → ipor_fusion-4.0.0.dev32}/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.dev32}/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.dev32}/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.dev32}/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.dev32}/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.dev32}/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.dev32}/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),
         )