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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ipor-fusion
-Version: 4.0.0.dev32
+Version: 4.0.0.dev35
 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.dev32 → ipor_fusion-4.0.0.dev35}/examples/composed_hypercore_flow_arbitrum_hyperevm.py

@@ -100,12 +100,21 @@ from ipor_fusion.fuses import (
 from ipor_fusion.fuses.hypercore import (
     SPOT_DEX,
     USDC_SYSTEM_ADDRESS,
+    USDC_TOKEN_INDEX,
     TimeInForce,
     read_index_of,
 )
 from ipor_fusion.market_ids import IporFusionMarkets
 from ipor_fusion.readers.hypercore import HyperCoreReader
-from ipor_fusion.types import Amount, ChainId, MarketId, Period, Shares
+from ipor_fusion.types import (
+    Amount,
+    ChainId,
+    HyperCoreAsset,
+    HyperCoreClientOrderId,
+    MarketId,
+    Period,
+    Shares,
+)
 
 log = logging.getLogger("composed_hypercore_flow_arbitrum_hyperevm")
 
@@ -181,7 +190,7 @@ BRIDGE_LATENCY = Period(2 * 60)
 # ── The trade the live cycle ran ─────────────────────────────────────────────
 # xyz is HIP-3 perp dex 1; xyz:NVDA is action asset 100_000 + 1 * 10_000 + 2.
 XYZ_DEX = 1
-XYZ_NVDA_ASSET = 110_002
+XYZ_NVDA_ASSET = HyperCoreAsset(110_002)
 # Core amounts are Core wei: 8 decimals for USDC; sizes carry 8 implied
 # decimals too (0.05 NVDA = 5_000_000), prices 8 implied decimals.
 CORE_WEI = 10**8
@@ -410,9 +419,9 @@ def core_leg_previews(web3_hype: Web3) -> list[Preview]:
     state = read_hypercore_vault_state(ctx, HYPERCORE_VAULT, HYPERCORE_BALANCE_FUSE)
     reader = HyperCoreReader(ctx)
     pending = bool(state.pending and state.pending.pending)
-    spot = reader.spot_balance(HYPERCORE_VAULT, 0).call()
+    spot = reader.spot_balance(HYPERCORE_VAULT, USDC_TOKEN_INDEX).call()
     spot_available = _available_spot_wei(spot.total, spot.hold)
-    usdc_info = reader.token_info(0).call()
+    usdc_info = reader.token_info(USDC_TOKEN_INDEX).call()
     evm_step = 10 ** max(int(usdc_info.wei_decimals) - 6, 0)
     xyz_equity_usd6 = int(
         reader.account_margin_summary(XYZ_DEX, HYPERCORE_VAULT).call().account_value
@@ -454,7 +463,7 @@ def core_leg_previews(web3_hype: Web3) -> list[Preview]:
             web3_hype,
             vault,
             "bridge_to_core",
-            deposit_fuse.enter(token_index=0, amount=BRIDGE_AMOUNT_USDC),
+            deposit_fuse.enter(token_index=USDC_TOKEN_INDEX, amount=BRIDGE_AMOUNT_USDC),
             override=override,
             note="14 USDC EVM -> Core spot through the CoreDepositWallet; vault USDC balance overridden for the preview",
         )
@@ -472,7 +481,7 @@ def core_leg_previews(web3_hype: Web3) -> list[Preview]:
                     destination=HYPERCORE_VAULT,
                     source_dex=SPOT_DEX,
                     destination_dex=XYZ_DEX,
-                    token_index=0,
+                    token_index=USDC_TOKEN_INDEX,
                     amount_wei=to_dex,
                 ),
                 override=None,
@@ -511,7 +520,7 @@ def core_leg_previews(web3_hype: Web3) -> list[Preview]:
                 limit_px=limit_buy,
                 sz=ORDER_SIZE,
                 tif=TimeInForce.IOC,
-                cloid=1,
+                cloid=HyperCoreClientOrderId(1),
             ),
             override=None,
             note=f"buy 0.05 xyz:NVDA, limit {limit_buy} (mark +1 %), notional {notional_usd6} USD6 under the cap {max_notional_usd6}",
@@ -528,7 +537,7 @@ def core_leg_previews(web3_hype: Web3) -> list[Preview]:
                 limit_px=limit_sell,
                 sz=ORDER_SIZE,
                 tif=TimeInForce.IOC,
-                cloid=2,
+                cloid=HyperCoreClientOrderId(2),
                 reduce_only=True,
             ),
             override=None,
@@ -551,7 +560,7 @@ def core_leg_previews(web3_hype: Web3) -> list[Preview]:
                     destination=HYPERCORE_VAULT,
                     source_dex=XYZ_DEX,
                     destination_dex=SPOT_DEX,
-                    token_index=0,
+                    token_index=USDC_TOKEN_INDEX,
                     amount_wei=from_dex,
                 ),
                 override=None,
@@ -586,7 +595,7 @@ def core_leg_previews(web3_hype: Web3) -> list[Preview]:
                     destination=Web3.to_checksum_address(USDC_SYSTEM_ADDRESS),
                     source_dex=SPOT_DEX,
                     destination_dex=SPOT_DEX,
-                    token_index=0,
+                    token_index=USDC_TOKEN_INDEX,
                     amount_wei=to_evm,
                 ),
                 override=None,

{ipor_fusion-4.0.0.dev32 → ipor_fusion-4.0.0.dev35}/examples/external_state_margin_leg_base.py

@@ -95,7 +95,7 @@ from ipor_fusion.core import FusionFactory
 from ipor_fusion.core.fusion_factory import FusionInstance
 from ipor_fusion.fuses import ExternalStateOperationFuse
 from ipor_fusion.market_ids import IporFusionMarkets
-from ipor_fusion.types import Amount, ChainId, MarketId, Period, Shares
+from ipor_fusion.types import Amount, ChainId, MarketId, Period, ProposalHash, Shares
 
 log = logging.getLogger("external_state_margin_leg_base")
 
@@ -288,7 +288,7 @@ RELEASE_OFFSET = REQUEST_OFFSET + RELEASE_DELAY
 DEMO_OFFSET = RELEASE_OFFSET + DEMO_DELAY
 
 # A hash that is deliberately not the pending proposal's, for the rejection demo.
-WRONG_PROPOSAL_HASH = b"\xde\xad" + b"\x00" * 30
+WRONG_PROPOSAL_HASH = ProposalHash(b"\xde\xad" + b"\x00" * 30)
 
 # ── Derived from deployed signatures (NOT tunable) ───────────────────────────
 # Each of these is keccak over a signature the deployed contracts declare.

{ipor_fusion-4.0.0.dev32 → ipor_fusion-4.0.0.dev35}/pyproject.toml

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

{ipor_fusion-4.0.0.dev32 → ipor_fusion-4.0.0.dev35}/src/ipor_fusion/__init__.py

@@ -318,16 +318,24 @@ from ipor_fusion.types import (
     Decimals,
     DeploymentRequestId,
     Fee,
+    HyperCoreActionId,
+    HyperCoreAsset,
+    HyperCoreClientOrderId,
+    HyperCoreOrderId,
+    HyperCoreTokenIndex,
     Liquidity,
     MappingStatus,
+    MarginTableId,
     MarketId,
     MessageId,
     MorphoBlueMarketId,
     NodeStatus,
     OperationId,
+    PayloadHash,
     Period,
     PositionSetHash,
     Price,
+    ProposalHash,
     ProposalId,
     ReturnRequestId,
     RoleId,
@@ -336,6 +344,7 @@ from ipor_fusion.types import (
     Tick,
     TokenId,
     TransferId,
+    TxHash,
     parse_morpho_market_id,
 )
 from ipor_fusion.validation import (
@@ -606,6 +615,15 @@ __all__ = [
     "RoleId",
     "ChainId",
     "MorphoBlueMarketId",
+    "HyperCoreActionId",
+    "HyperCoreAsset",
+    "HyperCoreClientOrderId",
+    "HyperCoreOrderId",
+    "HyperCoreTokenIndex",
+    "MarginTableId",
+    "PayloadHash",
+    "ProposalHash",
+    "TxHash",
     "parse_morpho_market_id",
     "AssetId",
     "CommandId",

{ipor_fusion-4.0.0.dev32 → ipor_fusion-4.0.0.dev35}/src/ipor_fusion/core/context.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import logging
 
 from eth_account import Account
-from eth_typing import ChecksumAddress
+from eth_typing import ChecksumAddress, HexStr
 from hexbytes import HexBytes
 from requests import ConnectionError as RequestsConnectionError
 from requests import HTTPError, Timeout
@@ -25,7 +25,7 @@ from ipor_fusion.core.logs import (
     get_logs_adaptive,
 )
 from ipor_fusion.errors import LogSourceUnavailable, TransactionError, get_revert_reason
-from ipor_fusion.types import ChainId
+from ipor_fusion.types import ChainId, TxHash
 
 # web3 retries every allowlisted method on any HTTP error, a 400 included;
 # a too-wide eth_getLogs answered with HTTP 400/413 or a query timeout would be
@@ -229,7 +229,7 @@ class Web3Context:
             reason = get_revert_reason(self.web3, tx_hash, receipt)
             raise TransactionError(
                 "Transaction failed",
-                tx_hash=tx_hash.hex(),
+                tx_hash=TxHash(HexStr(tx_hash.to_0x_hex())),
                 revert_reason=reason,
             )
         return receipt

{ipor_fusion-4.0.0.dev32 → ipor_fusion-4.0.0.dev35}/src/ipor_fusion/core/external_state_executor.py

@@ -32,7 +32,7 @@ from web3.types import BlockIdentifier, TxReceipt
 from ipor_fusion.core.context import Web3Context
 from ipor_fusion.core.contract import Call, ContractWrapper
 from ipor_fusion.market_ids import IporFusionMarkets
-from ipor_fusion.types import ZERO_ADDRESS, Amount, ChainId, MarketId
+from ipor_fusion.types import ZERO_ADDRESS, Amount, ChainId, MarketId, ProposalHash
 
 if TYPE_CHECKING:
     from ipor_fusion.core.plasma_vault import PlasmaVault
@@ -79,12 +79,12 @@ class BalanceProposal:
     value: Amount
     nonce: int
     proposed_at: int
-    proposal_hash: bytes
+    proposal_hash: ProposalHash
 
 
 def _hash_of(
     proposal: BalanceProposal, *, executor: ChecksumAddress, chain_id: ChainId
-) -> bytes:
+) -> ProposalHash:
     """`proposal`'s canonical hash, as `confirmBalance` recomputes it.
 
     The sole mapping from a proposal's fields onto `proposal_hash` arguments,
@@ -132,7 +132,7 @@ class NavMark:
 
     proposed_at: int
     nonce: int
-    proposal_hash: bytes
+    proposal_hash: ProposalHash
     propose_receipt: TxReceipt
     confirm_receipt: TxReceipt
     refresh_receipt: TxReceipt | None
@@ -463,7 +463,7 @@ class ExternalStateExecutor(ContractWrapper):
                 value=Amount(value),
                 nonce=nonce,
                 proposed_at=proposed_at,
-                proposal_hash=b"",
+                proposal_hash=ProposalHash(b""),
             )
             return replace(
                 unstamped,
@@ -516,7 +516,7 @@ class ExternalStateExecutor(ContractWrapper):
         return self._write("proposeBalance(address,uint256)", balance_account, value)
 
     def confirm_balance(
-        self, balance_account: ChecksumAddress, proposal_hash: bytes
+        self, balance_account: ChecksumAddress, proposal_hash: ProposalHash
     ) -> Call[None]:
         """CUSTODIAN-only: confirm the pending proposal for `balance_account`.
         Must be sent by a custodian other than the proposer, and `proposal_hash`
@@ -561,7 +561,7 @@ class ExternalStateExecutor(ContractWrapper):
         proposer: ChecksumAddress,
         proposed_at: int,
         nonce: int,
-    ) -> bytes:
+    ) -> ProposalHash:
         """The confirm hash that `confirmBalance` verifies against:
         ``keccak(abi.encode(executor, chainId, balanceAccount, value, proposer,
         proposedAt, nonce))``.
@@ -571,26 +571,28 @@ class ExternalStateExecutor(ContractWrapper):
         event, never a fresh `nonce()` read -- see `nonce`. Pure -- no chain
         access -- so callers can pre-compute or verify a hash offline.
         """
-        return keccak(
-            encode(
-                [
-                    "address",
-                    "uint256",
-                    "address",
-                    "uint256",
-                    "address",
-                    "uint64",
-                    "uint256",
-                ],
-                [
-                    Web3.to_checksum_address(executor),
-                    int(chain_id),
-                    Web3.to_checksum_address(balance_account),
-                    int(value),
-                    Web3.to_checksum_address(proposer),
-                    int(proposed_at),
-                    int(nonce),
-                ],
+        return ProposalHash(
+            keccak(
+                encode(
+                    [
+                        "address",
+                        "uint256",
+                        "address",
+                        "uint256",
+                        "address",
+                        "uint64",
+                        "uint256",
+                    ],
+                    [
+                        Web3.to_checksum_address(executor),
+                        int(chain_id),
+                        Web3.to_checksum_address(balance_account),
+                        int(value),
+                        Web3.to_checksum_address(proposer),
+                        int(proposed_at),
+                        int(nonce),
+                    ],
+                )
             )
         )
 

{ipor_fusion-4.0.0.dev32 → ipor_fusion-4.0.0.dev35}/src/ipor_fusion/errors.py

@@ -11,6 +11,8 @@ from eth_utils import function_signature_to_4byte_selector
 from web3 import Web3
 from web3.types import TxReceipt
 
+from ipor_fusion.types import TxHash
+
 log = logging.getLogger(__name__)
 
 PANIC_CODES: dict[int, str] = {
@@ -237,7 +239,7 @@ class TransactionError(IporFusionError):
     def __init__(
         self,
         message: str,
-        tx_hash: str | None = None,
+        tx_hash: TxHash | None = None,
         revert_reason: str | None = None,
     ):
         self.tx_hash = tx_hash

{ipor_fusion-4.0.0.dev32 → ipor_fusion-4.0.0.dev35}/src/ipor_fusion/explorer.py

@@ -10,10 +10,10 @@ import time
 from urllib.parse import urlencode
 from urllib.request import urlopen
 
-from eth_typing import HexAddress
+from eth_typing import HexAddress, HexStr
 
 from ipor_fusion.cache import load_contract_cache, update_contract_cache
-from ipor_fusion.types import ChainId
+from ipor_fusion.types import ChainId, TxHash
 
 ETHERSCAN_V2_URL = "https://api.etherscan.io/v2/api"
 
@@ -57,7 +57,7 @@ def get_contract_name(
 
 def get_deployment_tx(
     chain_id: ChainId, address: HexAddress, api_key: str | None = None
-) -> tuple[str | None, str | None]:
+) -> tuple[TxHash | None, str | None]:
     """Return ``(tx_hash, error)`` for a contract deployment.
 
     ``error`` is a short machine-readable code when ``tx_hash`` is None and the
@@ -69,7 +69,7 @@ def get_deployment_tx(
 
 def _fetch_contract_creation_tx(
     chain_id: ChainId, address: HexAddress, api_key: str | None = None
-) -> tuple[str | None, str | None]:
+) -> tuple[TxHash | None, str | None]:
     if chain_id not in SUPPORTED_CHAINS:
         return None, "chain-not-supported"
     if not api_key:
@@ -91,7 +91,8 @@ def _fetch_contract_creation_tx(
             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].get("txHash"), None  # type: ignore[no-any-return]
+                tx_hash = data["result"][0].get("txHash")
+                return (TxHash(HexStr(tx_hash)) if tx_hash else None), None
             result_text = str(data.get("result", "")).lower()
             if "free api access is not supported" in result_text:
                 return None, "etherscan-paid-tier-required"

{ipor_fusion-4.0.0.dev32 → ipor_fusion-4.0.0.dev35}/src/ipor_fusion/fuses/external_state_events.py

@@ -28,10 +28,12 @@ from typing import Any
 
 from eth_abi import decode
 from eth_abi.exceptions import DecodingError
-from eth_typing import ChecksumAddress
+from eth_typing import ChecksumAddress, HexStr
 from web3 import Web3
 from web3.types import TxReceipt
 
+from ipor_fusion.types import TxHash
+
 
 @dataclass(frozen=True, slots=True)
 class ExternalStateEventSpec:
@@ -134,7 +136,7 @@ class ExternalStateEvent:
     emitter: ChecksumAddress
     args: dict[str, Any]
     block_number: int | None = None
-    transaction_hash: str | None = None
+    transaction_hash: TxHash | None = None
     log_index: int | None = None
 
 
@@ -191,10 +193,10 @@ def external_state_event_name(topic: bytes | str) -> str | None:
     return spec.name if spec else None
 
 
-def _hex(value: Any) -> str | None:
+def _hex(value: Any) -> TxHash | None:
     if value is None:
         return None
-    return "0x" + _as_bytes(value, "transactionHash").hex()
+    return TxHash(HexStr("0x" + _as_bytes(value, "transactionHash").hex()))
 
 
 def decode_external_state_event(log: Mapping[str, Any]) -> ExternalStateEvent | None:

{ipor_fusion-4.0.0.dev32 → ipor_fusion-4.0.0.dev35}/src/ipor_fusion/fuses/hypercore.py

@@ -56,14 +56,20 @@ from ipor_fusion.fuses.base import (
     _substrate_address_bytes,
     _validate_not_zero_address,
 )
-from ipor_fusion.types import Amount
+from ipor_fusion.types import (
+    Amount,
+    HyperCoreAsset,
+    HyperCoreClientOrderId,
+    HyperCoreOrderId,
+    HyperCoreTokenIndex,
+)
 
 #: ``HyperCoreLib.SPOT_DEX``: the spot account in ``sendAsset`` routes.
 SPOT_DEX = 0xFFFFFFFF
 #: ``HyperCoreLib.NATIVE_PERP_DEX``: Hyperliquid's own perp dex.
 NATIVE_PERP_DEX = 0
 #: Core token index of USDC.
-USDC_TOKEN_INDEX = 0
+USDC_TOKEN_INDEX = HyperCoreTokenIndex(0)
 #: Core -> EVM route for token 0: a spot -> spot ``sendAsset`` to this address
 #: credits the sender's EVM balance. Never the target of an ERC-20 transfer.
 USDC_SYSTEM_ADDRESS: ChecksumAddress = to_checksum_address(
@@ -107,7 +113,7 @@ class HyperCoreConfigKey(IntEnum):
     SPOT_SEND_BRIDGE_ENABLED = 6
 
 
-def hip3_action_asset(dex: int, index_in_dex: int) -> int:
+def hip3_action_asset(dex: int, index_in_dex: int) -> HyperCoreAsset:
     """The CoreWriter asset of market ``index_in_dex`` on perp dex ``dex``:
     the index itself on the native dex, ``100_000 + dex * 10_000 + index``
     on a HIP-3 dex. Rejects anything outside the two families the fuses
@@ -119,20 +125,20 @@ def hip3_action_asset(dex: int, index_in_dex: int) -> int:
             f"index_in_dex must be below {_HIP3_DEX_MULTIPLIER}, got {index_in_dex}"
         )
     if dex == NATIVE_PERP_DEX:
-        return index_in_dex
+        return HyperCoreAsset(index_in_dex)
     asset = _HIP3_ASSET_OFFSET + dex * _HIP3_DEX_MULTIPLIER + index_in_dex
     if asset >= _OUTCOME_FIRST_ASSET:
         raise ValueError(f"dex {dex} is outside the HIP-3 asset range")
-    return asset
+    return HyperCoreAsset(asset)
 
 
-def is_native_perp_asset(asset: int) -> bool:
+def is_native_perp_asset(asset: HyperCoreAsset) -> bool:
     """``HyperCoreLib.isNativePerpAsset``: an action asset below 10 000."""
     _validate_uint(asset, 32, "asset")
     return asset < _NATIVE_PERP_ASSET_LIMIT
 
 
-def is_hip3_asset(asset: int) -> bool:
+def is_hip3_asset(asset: HyperCoreAsset) -> bool:
     """``HyperCoreLib.isHip3Asset``: ``110_000 <= asset < 100_000_000``. Assets
     between the families (10 000 .. 109 999) and the outcome family above are
     neither, and the perp fuses reject them."""
@@ -147,7 +153,7 @@ def is_supported_perp_dex(dex: int) -> bool:
     return dex == NATIVE_PERP_DEX or dex in SUPPORTED_HIP3_DEXES
 
 
-def perp_dex_of(asset: int) -> int:
+def perp_dex_of(asset: HyperCoreAsset) -> int:
     """``HyperCoreLib.perpDexOf``: 0 for a native asset, the dex index for a
     HIP-3 asset; raises for any other value, as the fuses revert."""
     if is_native_perp_asset(asset):
@@ -157,7 +163,7 @@ def perp_dex_of(asset: int) -> int:
     raise ValueError(f"asset {asset} is neither a native nor a HIP-3 perp asset")
 
 
-def read_index_of(asset: int) -> int:
+def read_index_of(asset: HyperCoreAsset) -> int:
     """``HyperCoreLib.readIndexOf``: the index the read precompiles take --
     native assets unchanged, HIP-3 assets without the 100 000 offset; raises
     for any other value."""
@@ -179,7 +185,7 @@ def _validate_positive_uint(value: int, bits: int, name: str) -> None:
     _validate_uint(value, bits, name)
 
 
-def system_address(token_index: int) -> ChecksumAddress:
+def system_address(token_index: HyperCoreTokenIndex) -> ChecksumAddress:
     """``HyperCoreLib.systemAddress``: the Core -> EVM route of Core token
     ``token_index`` (``0x2000…0000 + tokenIndex``; :data:`USDC_SYSTEM_ADDRESS`
     for token 0). A spot -> spot ``sendAsset`` or ``spotSend`` to it credits the
@@ -192,7 +198,7 @@ class HyperCoreDepositFuse(Fuse):
     """EVM -> Core deposit of a granted spot token (CoreWriter-free: the
     token's verified route, the CoreDepositWallet for Circle USDC)."""
 
-    def enter(self, *, token_index: int, amount: Amount) -> FuseAction:
+    def enter(self, *, token_index: HyperCoreTokenIndex, amount: Amount) -> FuseAction:
         """Deposit up to ``amount`` (ERC-20 units) of Core token
         ``token_index``; the fuse caps it at the vault's balance. A fresh Core
         account pays an activation fee from its first deposit, so the Core
@@ -217,7 +223,11 @@ class HyperCoreSendFuse(Fuse):
     """``spotSend`` (action 6) and ``sendAsset`` (action 13)."""
 
     def spot_send(
-        self, *, destination: ChecksumAddress, token_index: int, amount_wei: int
+        self,
+        *,
+        destination: ChecksumAddress,
+        token_index: HyperCoreTokenIndex,
+        amount_wei: int,
     ) -> FuseAction:
         """Send ``amount_wei`` of ``token_index`` from spot to a granted
         destination; a token system address additionally needs
@@ -236,7 +246,7 @@ class HyperCoreSendFuse(Fuse):
         destination: ChecksumAddress,
         source_dex: int,
         destination_dex: int,
-        token_index: int,
+        token_index: HyperCoreTokenIndex,
         amount_wei: int,
     ) -> FuseAction:
         """Move ``amount_wei`` of ``token_index`` between ``source_dex`` and
@@ -264,12 +274,12 @@ class HyperCoreOrderFuse(Fuse):
     def enter(
         self,
         *,
-        asset: int,
+        asset: HyperCoreAsset,
         is_buy: bool,
         limit_px: int,
         sz: int,
         tif: TimeInForce,
-        cloid: int,
+        cloid: HyperCoreClientOrderId,
         reduce_only: bool = False,
     ) -> FuseAction:
         """Place ``sz`` (8 decimals) of ``asset`` at ``limit_px`` (8 decimals).
@@ -289,12 +299,16 @@ class HyperCoreOrderFuse(Fuse):
 class HyperCoreCancelFuse(Fuse):
     """Cancel by oid (action 10) or by cloid (action 11)."""
 
-    def cancel_by_oid(self, *, asset: int, oid: int) -> FuseAction:
+    def cancel_by_oid(
+        self, *, asset: HyperCoreAsset, oid: HyperCoreOrderId
+    ) -> FuseAction:
         _validate_uint(asset, 32, "asset")
         _validate_positive_uint(oid, 64, "oid")
         return self._action_raw("enterCancelByOid((uint32,uint64))", [[asset, oid]])
 
-    def cancel_by_cloid(self, *, asset: int, cloid: int) -> FuseAction:
+    def cancel_by_cloid(
+        self, *, asset: HyperCoreAsset, cloid: HyperCoreClientOrderId
+    ) -> FuseAction:
         _validate_uint(asset, 32, "asset")
         _validate_positive_uint(cloid, 128, "cloid")
         return self._action_raw(
@@ -342,7 +356,9 @@ class HyperCoreSubstrates:
     """
 
     @staticmethod
-    def spot_token(token_index: int, evm_asset: ChecksumAddress) -> bytes:
+    def spot_token(
+        token_index: HyperCoreTokenIndex, evm_asset: ChecksumAddress
+    ) -> bytes:
         """Core token ``token_index`` priced through its EVM ERC-20 (for
         Circle USDC the wallet's ``token()``, not the CoreDepositWallet)."""
         _validate_uint(token_index, 64, "token_index")
@@ -350,7 +366,10 @@ class HyperCoreSubstrates:
 
     @staticmethod
     def perp_market(
-        asset: int, max_notional_usd6: int, *, reduce_only_required: bool = False
+        asset: HyperCoreAsset,
+        max_notional_usd6: int,
+        *,
+        reduce_only_required: bool = False,
     ) -> bytes:
         """Action asset ``asset`` with a per-order notional cap in USD (6
         decimals); ``reduce_only_required`` admits only position-reducing orders."""
@@ -381,7 +400,7 @@ class HyperCoreSubstrates:
         return _word(5, (int(key) << 240) | value)
 
     @staticmethod
-    def send_cap(token_index: int, max_wei: int) -> bytes:
+    def send_cap(token_index: HyperCoreTokenIndex, max_wei: int) -> bytes:
         """Per-transfer cap for ``token_index`` in Core wei."""
         _validate_uint(token_index, 64, "token_index")
         _validate_uint(max_wei, 128, "max_wei")