ipor-fusion 4.0.0.dev146__tar.gz → 4.0.0.dev149__tar.gz

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/MIGRATION_4.md

@@ -543,7 +543,8 @@ converted amounts `Amount`. A custom `VaultState` annotates the same.
 `erc20_direct_total`, `sum`, `on_chain_total_assets`, `delta`,
 `pending_withdrawals`, `implied_market_total`, `market_storage_divergence`) are
 `Amount`. `FusionInstance.asset_decimals` / `underlying_token_decimals` are
-`Decimals`. `VaultSimulator.current_time` is a `Timestamp`.
+`Decimals`, and `CloneArgs.redemption_delay_seconds` is a `Period`.
+`VaultSimulator.current_time` is a `Timestamp`.
 
 **Vault data and helpers.** `ensure_supported_chain` takes `ChainId`.
 `fetch_unpriceable_priced_tokens` takes the oracle and underlying as
@@ -577,6 +578,10 @@ Decimals`, and `PriceOracleMiddleware.base_currency_decimals()` returns
 `Call[Decimals]`. `get_logs_adaptive(chain_id=)` takes `ChainId | None` and
 `LogSource.get_logs` a `ChainId`; `quote_ccip_native_fee(block=)` and
 `OracleMappingReader.asset_source_events` take a `BlockIdentifier`.
+`OracleMappingReader.token_decimals`, `feed_decimals` and `vault_decimals` return
+`Decimals | None` and `vault_convert_to_assets` an `Amount | None`;
+`AaveV4OracleReader.decimals()` returns `Call[Decimals]`; and `OraclePrice.decimals`, `OracleNode.decimals` and
+`OracleAsset.decimals` are `Decimals` (`| None` on the nodes).
 
 **Address roles.** `PlasmaVault(address)`,
 `validate_vault`, `fetch_deployment_info`, the HyperCore, lending-health and
@@ -628,6 +633,12 @@ takes a `ChecksumAddress`, and `build_morpho_blue_market_json` takes
 records is `ChecksumAddress`; optional ones (`curator`, `guardian`, `fee_recipient`,
 `performance_fee_recipient`, `management_fee_recipient`, `inner_vault`,
 `VaultFlowCap.admin`, the `VaultV2Cap` market params) are `ChecksumAddress | None`.
+Token amounts on those records are `Amount` (`VaultFlowCap.max_in` / `max_out`, the
+`VaultAllocation`, `VaultV1Info`, `VaultV1MarketAllocation`, `VaultV2Info` and
+`MorphoApiMarket` asset amounts and caps, `VaultV2Cap.absolute_cap` / `allocation`
+/ `room`, `VaultV2Adapter.assets`, `cap_room`), token decimals are `Decimals` and
+`MorphoApiMarket.timestamp` is a `Timestamp`. `lltv`, `fee_wad`,
+`relative_cap_wad` and `fee_wei` stay `int`.
 
 **Crosschain.** The executor, dispatcher and factory wrappers, the lanes and
 `StargateCrosschainCommandFuse.enter(request_id=)` take the crosschain ids above, and
@@ -644,7 +655,20 @@ on CCIP, `active_return` → `OperationId`, `asset_id`, `tracked_position_set_ha
 `STALENESS_MAX` / `BALANCE_STALENESS_MAX` on the executors) a `Period`, and so do
 the `LaneHubState` fields; `attestation(remote_timestamp=, expiry=)` and
 `BalanceObservation` take `Timestamp`, `needs_attestation(now=, margin=)` a
-`Timestamp` and a `Period`. Decoded event values
+`Timestamp` and a `Period`. The other durations are `Period` too: the executors'
+`min_update_interval()`, `transfer_staleness_max()` and `deployment_ttl()`, both
+factories' `config_delay()`, and the time fields of `ExecutorInitParams` and
+`SafetyConfig` (`rescue_delay`, the staleness fields, `min_update_interval`,
+`deployment_ttl`); `in_flight_since()`, `last_approval_at()`, `oldest_pending_at()`
+and `pending_deployment_created_at()` return a `Timestamp`. Decimals are
+`Decimals`: `local_decimals()` / `shared_decimals()` on the executor and dispatcher,
+`CcipChain.local_decimals`, `StargateChain.local_decimals` / `shared_decimals`, the
+`shared_decimals` of `CcipCrosschainFactory.asset_config()`, `schedule_asset` and
+`execute_asset`. Token amounts are `Amount` (`EVMTokenAmount.amount`,
+`TokenTransferV1.amount`, `TaxiMessage.amount_sd`, `OutboundMessage.token_amount`,
+`StargateChain.to_local_decimals`), and `pending_request_shares()` returns
+`Shares`. Counters, sequences, epochs, versions, bps and gas limits stay `int`.
+Decoded event values
 (`ccip_events` → `CcipEvent.values`) stay a generic mapping: convert a value
 before passing it on.
 
@@ -667,7 +691,11 @@ fuse's `eid=` take it (`LayerZeroEid(30101)`). CCIP chain selectors are
 `read_hypercore_transfer_snapshot` and the helpers `system_address`,
 `precompile_index_of`, `perp_dex_of`, `is_native_perp_asset`, `is_hip3_asset` take the
 HyperCore ids; `HyperCorePerpAssetInfo`, `HyperCorePerpMarket`, `HyperCoreSpotLeg`,
-`HyperCorePendingState` and `HyperCoreTransferSnapshot` carry them.
+`HyperCorePendingState` and `HyperCoreTransferSnapshot` carry them. Token decimals
+(`HyperCoreTokenInfo.sz_decimals` / `wei_decimals` / `evm_extra_wei_decimals`,
+`HyperCorePerpAssetInfo.sz_decimals`, `HyperCoreSpotLeg.wei_decimals`) are
+`Decimals`, and `HyperCorePendingState.pending_until` / `current_timestamp` are
+`Timestamp`; Core amounts, positions, WAD values and L1 block numbers stay `int`.
 
 **External state.** `ExternalStateExecutor.proposal_hash` returns and `confirm_balance`
 takes a `ProposalHash`; `BalanceProposal.proposal_hash` is a `ProposalHash`;
@@ -676,6 +704,9 @@ takes a `ProposalHash`; `BalanceProposal.proposal_hash` is a `ProposalHash`;
 `BalanceFuseSnapshot.last_custodian_update_timestamp`, `BalanceProposal.proposed_at`,
 `last_updated()` and `get_oldest_update_timestamp()` are web3's `Timestamp`, and
 `ExternalStateExecutor.proposal_hash(proposed_at=)` takes one.
+`ExternalStateExecutor.staleness_max()` / `min_update_interval()` return a `Period`,
+and `ExternalStateSubstrates.staleness_max` / `min_update_interval` take one
+(`Period.DAY`).
 
 **Errors and explorer.** `TransactionError(tx_hash=)` takes a `TxHash | None`,
 `LogScanError(address=)` a `ChecksumAddress`; `get_revert_reason` takes a `TxHash`;
@@ -687,7 +718,8 @@ except as listed under [Behavior changes](#behavior-changes)): `chain_id` fields
 `ChainId`, `role_id` `RoleId`, `market_id` `MarketId` (except
 `LendingMarketHealth.market_id`, which stays `str | int`: a Morpho market id is a
 string). Calling an MCP tool function
-directly from Python takes `ChainId`.
+directly from Python takes `ChainId`. Their amount, decimals and time fields stay
+`int`: they are JSON output models, and the SDK values above fit them unchanged.
 
 ## Behavior changes
 

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/PKG-INFO

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

@@ -110,6 +110,7 @@ from ipor_fusion.market_ids import IporFusionMarkets
 from ipor_fusion.types import (
     Amount,
     ChainId,
+    Decimals,
     HyperCoreAsset,
     HyperCoreClientOrderId,
     MarketId,
@@ -649,14 +650,14 @@ def _transport() -> CcipTransport:
                 ARBITRUM_CCIP_SELECTOR,
                 ARBITRUM_CCIP_ROUTER,
                 ARBITRUM_USDC,
-                6,
+                Decimals(6),
             ),
             CcipChain(
                 HYPEREVM_CHAIN_ID,
                 HYPEREVM_CCIP_SELECTOR,
                 HYPEREVM_CCIP_ROUTER,
                 HYPEREVM_USDC,
-                6,
+                Decimals(6),
             ),
         )
     )

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/examples/crosschain_ccip_usdc_arbitrum_hyperevm.py

@@ -86,7 +86,7 @@ from ipor_fusion import (
     parse_plasma_vault_address,
 )
 from ipor_fusion.market_ids import IporFusionMarkets
-from ipor_fusion.types import Amount, ChainId, MarketId, Period, Shares
+from ipor_fusion.types import Amount, ChainId, Decimals, MarketId, Period, Shares
 
 log = logging.getLogger("crosschain_ccip_usdc_arbitrum_hyperevm")
 
@@ -223,14 +223,14 @@ def transport() -> CcipTransport:
                 ARBITRUM_CCIP_SELECTOR,
                 ARBITRUM_CCIP_ROUTER,
                 ARBITRUM_USDC,
-                6,
+                Decimals(6),
             ),
             CcipChain(
                 HYPEREVM_CHAIN_ID,
                 HYPEREVM_CCIP_SELECTOR,
                 HYPEREVM_CCIP_ROUTER,
                 HYPEREVM_USDC,
-                6,
+                Decimals(6),
             ),
         )
     )

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/pyproject.toml

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

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/src/ipor_fusion/core/external_state_executor.py

@@ -35,6 +35,7 @@ from ipor_fusion.types import (
     ZERO_ADDRESS,
     Amount,
     ChainId,
+    Period,
     PlasmaVaultAddress,
     ProposalHash,
 )
@@ -371,10 +372,10 @@ class ExternalStateExecutor(ContractWrapper):
             "getOldestUpdateTimestamp()", output_types=["uint256"], decoder=Timestamp
         )
 
-    def staleness_max(self) -> Call[int]:
+    def staleness_max(self) -> Call[Period]:
         """Seconds after which a custodian report counts as stale: the pre-hook
         blocks the vault's gated user operations past it."""
-        return self._view("stalenessMax()", output_types=["uint256"])
+        return self._view("stalenessMax()", output_types=["uint256"], decoder=Period)
 
     def big_change_bps(self) -> Call[int]:
         """Basis points of total-balance change between two custodian updates
@@ -382,13 +383,16 @@ class ExternalStateExecutor(ContractWrapper):
         return self._view("bigChangeBps()", output_types=["uint256"])
 
     def dust_threshold(self) -> Call[int]:
-        """Underlying units below which a leftover is dust, not a balance."""
+        """Dust threshold as a percent of one underlying token (100 = one whole
+        token); a leftover below it is dust, not a balance."""
         return self._view("dustThreshold()", output_types=["uint256"])
 
-    def min_update_interval(self) -> Call[int]:
+    def min_update_interval(self) -> Call[Period]:
         """Seconds a balance account must wait between two custodian
         updates."""
-        return self._view("minUpdateInterval()", output_types=["uint256"])
+        return self._view(
+            "minUpdateInterval()", output_types=["uint256"], decoder=Period
+        )
 
     def nonce(self) -> Call[int]:
         """Monotonic proposal nonce, incremented on every `proposeBalance`.

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/src/ipor_fusion/core/fusion_factory.py

@@ -52,7 +52,7 @@ class CloneArgs:
     asset_name: str
     asset_symbol: str
     underlying_token: ChecksumAddress
-    redemption_delay_seconds: int
+    redemption_delay_seconds: Period
     owner: ChecksumAddress
     dao_fee_package_index: int
 
@@ -391,7 +391,7 @@ class FusionFactory(ContractWrapper):
             asset_name=asset_name,
             asset_symbol=asset_symbol,
             underlying_token=Web3.to_checksum_address(underlying_token),
-            redemption_delay_seconds=int(redemption_delay_seconds),
+            redemption_delay_seconds=Period(redemption_delay_seconds),
             owner=Web3.to_checksum_address(owner),
             dao_fee_package_index=int(dao_fee_package_index),
         )

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/src/ipor_fusion/crosschain/ccip/codec.py

@@ -21,7 +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 CcipChainSelector, MessageId
+from ipor_fusion.types import Amount, CcipChainSelector, MessageId
 
 #: topic0 of ``OnRamp 2.0.0``'s ``CCIPMessageSent``; ``destChainSelector``,
 #: ``sender`` and ``messageId`` are indexed.
@@ -72,7 +72,7 @@ class TokenTransferV1:
     """``MessageV1Codec.TokenTransferV1``. Address fields are raw bytes as
     encoded for the destination chain (20 bytes on EVM)."""
 
-    amount: int
+    amount: Amount
     source_pool_address: bytes
     source_token_address: bytes
     dest_token_address: bytes
@@ -84,7 +84,7 @@ class TokenTransferV1:
         if reader.uint(1) != _MESSAGE_VERSION:
             raise ValueError("unsupported CCIP token transfer version")
         return cls(
-            amount=reader.uint(32),
+            amount=Amount(reader.uint(32)),
             source_pool_address=reader.prefixed(1),
             source_token_address=reader.prefixed(1),
             dest_token_address=reader.prefixed(1),
@@ -207,7 +207,7 @@ class EVMTokenAmount:
     """``CcipClient.EVMTokenAmount``."""
 
     token: ChecksumAddress
-    amount: int
+    amount: Amount
 
 
 @dataclass(frozen=True, slots=True)

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/src/ipor_fusion/crosschain/ccip/contracts.py

@@ -8,6 +8,7 @@ from dataclasses import dataclass
 from eth_abi import encode
 from eth_typing import ChecksumAddress
 from eth_utils import keccak
+from web3.types import Timestamp
 
 from ipor_fusion.core.contract import Call
 from ipor_fusion.crosschain.contracts import (
@@ -24,6 +25,7 @@ from ipor_fusion.types import (
     CcipChainSelector,
     ChainId,
     CommandId,
+    Decimals,
     MessageId,
     OperationId,
     Period,
@@ -93,11 +95,11 @@ class SafetyConfig:
     rescue_guardian: ChecksumAddress
     balance_proposer: ChecksumAddress
     balance_approver: ChecksumAddress
-    rescue_delay: int
-    balance_staleness_max: int
+    rescue_delay: Period
+    balance_staleness_max: Period
     big_change_bps: int
-    min_update_interval: int
-    transfer_staleness_max: int
+    min_update_interval: Period
+    transfer_staleness_max: Period
 
     def as_tuple(self) -> tuple:
         return (
@@ -231,8 +233,13 @@ class CcipCrosschainExecutor(CrosschainExecutor):
             decoder=CommandStatus,
         )
 
-    def oldest_pending_at(self, chain_id: ChainId) -> Call[int]:
-        return self._view("oldestPendingAt(uint256)", chain_id, output_types=["uint64"])
+    def oldest_pending_at(self, chain_id: ChainId) -> Call[Timestamp]:
+        return self._view(
+            "oldestPendingAt(uint256)",
+            chain_id,
+            output_types=["uint64"],
+            decoder=Timestamp,
+        )
 
     def pending_transfer_count(self, chain_id: ChainId) -> Call[int]:
         return self._view(
@@ -390,13 +397,13 @@ class CcipCrosschainFactory(CrosschainFactory):
 
     def asset_config(
         self, asset_id: AssetId
-    ) -> Call[tuple[ChecksumAddress, int, bool]]:
+    ) -> Call[tuple[ChecksumAddress, Decimals, bool]]:
         """``(token, sharedDecimals, enabled)`` for an asset id."""
         return self._view(
             "assetConfig(bytes32)",
             asset_id,
             output_types=["address", "uint8", "bool"],
-            decoder=lambda v: (_address(v[0]), int(v[1]), bool(v[2])),
+            decoder=lambda v: (_address(v[0]), Decimals(v[1]), bool(v[2])),
         )
 
     def is_dispatcher(self, dispatcher: ChecksumAddress) -> Call[bool]:
@@ -415,22 +422,23 @@ class CcipCrosschainFactory(CrosschainFactory):
 
     def pending_deployment_created_at(
         self, executor: ChecksumAddress, dst_chain_id: ChainId
-    ) -> Call[int]:
+    ) -> Call[Timestamp]:
         return self._view(
             "pendingDeploymentCreatedAt(address,uint256)",
             executor,
             dst_chain_id,
             output_types=["uint64"],
+            decoder=Timestamp,
         )
 
     def owner(self) -> Call[ChecksumAddress]:
         return self._view("OWNER()", output_types=["address"], decoder=_address)
 
-    def config_delay(self) -> Call[int]:
+    def config_delay(self) -> Call[Period]:
         """Timelock of every scheduled asset, factory route and dispatcher
         deployment gas limit: 24 hours in source, 300 seconds on the test
         builds."""
-        return self._view("CONFIG_DELAY()", output_types=["uint256"])
+        return self._view("CONFIG_DELAY()", output_types=["uint256"], decoder=Period)
 
     def executor_creation_code_hash(self) -> Call[bytes]:
         """keccak of the executor creation code the factory stores. It tells
@@ -469,7 +477,7 @@ class CcipCrosschainFactory(CrosschainFactory):
         )
 
     def schedule_asset(
-        self, asset_id: AssetId, token: ChecksumAddress, shared_decimals: int
+        self, asset_id: AssetId, token: ChecksumAddress, shared_decimals: Decimals
     ) -> Call[None]:
         """Owner-only; executable after ``config_delay`` with the same arguments."""
         return self._write(
@@ -477,7 +485,7 @@ class CcipCrosschainFactory(CrosschainFactory):
         )
 
     def execute_asset(
-        self, asset_id: AssetId, token: ChecksumAddress, shared_decimals: int
+        self, asset_id: AssetId, token: ChecksumAddress, shared_decimals: Decimals
     ) -> Call[None]:
         return self._write(
             "executeAsset(bytes32,address,uint8)", asset_id, token, shared_decimals

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/src/ipor_fusion/crosschain/ccip/transport.py

@@ -29,7 +29,7 @@ from ipor_fusion.crosschain.transport import (
     OutboundMessage,
     transfer_call,
 )
-from ipor_fusion.types import CcipChainSelector, ChainId
+from ipor_fusion.types import Amount, CcipChainSelector, ChainId, Decimals
 
 
 @dataclass(frozen=True, slots=True)
@@ -45,7 +45,7 @@ class CcipChain:
     chain_selector: CcipChainSelector
     router: ChecksumAddress
     token: ChecksumAddress
-    local_decimals: int
+    local_decimals: Decimals
     token_source: ChecksumAddress | None = None
 
     def __post_init__(self) -> None:
@@ -119,7 +119,7 @@ class CcipTransport(CrosschainTransport):
             raise ValueError(
                 f"CCIP message to unconfigured selector {message.dest_chain_selector}"
             )
-        token_amount = 0
+        token_amount = Amount(0)
         if message.token_transfer:
             # The codec admits at most one transfer (MAX_NUMBER_OF_TOKENS = 1).
             transfer = message.token_transfer[0]

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/src/ipor_fusion/crosschain/contracts.py

@@ -25,9 +25,12 @@ from ipor_fusion.types import (
     AssetId,
     ChainId,
     CommandId,
+    Decimals,
+    Period,
     PlasmaVaultAddress,
     PositionSetHash,
     ProposalId,
+    Shares,
 )
 
 
@@ -107,17 +110,21 @@ class CrosschainExecutor(ContractWrapper):
     def big_change_bps(self) -> Call[int]:
         return self._view("BIG_CHANGE_BPS()", output_types=["uint256"])
 
-    def min_update_interval(self) -> Call[int]:
-        return self._view("MIN_UPDATE_INTERVAL()", output_types=["uint256"])
+    def min_update_interval(self) -> Call[Period]:
+        return self._view(
+            "MIN_UPDATE_INTERVAL()", output_types=["uint256"], decoder=Period
+        )
 
-    def transfer_staleness_max(self) -> Call[int]:
-        return self._view("TRANSFER_STALENESS_MAX()", output_types=["uint256"])
+    def transfer_staleness_max(self) -> Call[Period]:
+        return self._view(
+            "TRANSFER_STALENESS_MAX()", output_types=["uint256"], decoder=Period
+        )
 
-    def local_decimals(self) -> Call[int]:
-        return self._view("LOCAL_DECIMALS()", output_types=["uint8"])
+    def local_decimals(self) -> Call[Decimals]:
+        return self._view("LOCAL_DECIMALS()", output_types=["uint8"], decoder=Decimals)
 
-    def shared_decimals(self) -> Call[int]:
-        return self._view("SHARED_DECIMALS()", output_types=["uint8"])
+    def shared_decimals(self) -> Call[Decimals]:
+        return self._view("SHARED_DECIMALS()", output_types=["uint8"], decoder=Decimals)
 
     def get_balance(self) -> Call[Amount]:
         """Fail-closed aggregate NAV in local asset decimals: idle plus every
@@ -197,11 +204,11 @@ class CrosschainDispatcher(ContractWrapper):
             "EXECUTOR_CHAIN_ID()", output_types=["uint256"], decoder=ChainId
         )
 
-    def local_decimals(self) -> Call[int]:
-        return self._view("LOCAL_DECIMALS()", output_types=["uint8"])
+    def local_decimals(self) -> Call[Decimals]:
+        return self._view("LOCAL_DECIMALS()", output_types=["uint8"], decoder=Decimals)
 
-    def shared_decimals(self) -> Call[int]:
-        return self._view("SHARED_DECIMALS()", output_types=["uint8"])
+    def shared_decimals(self) -> Call[Decimals]:
+        return self._view("SHARED_DECIMALS()", output_types=["uint8"], decoder=Decimals)
 
     def state_version(self) -> Call[int]:
         return self._view("stateVersion()", output_types=["uint64"])
@@ -221,9 +228,12 @@ class CrosschainDispatcher(ContractWrapper):
     def is_tracked_vault(self, vault: ChecksumAddress) -> Call[bool]:
         return self._view("isTrackedVault(address)", vault, output_types=["bool"])
 
-    def pending_request_shares(self, vault: PlasmaVaultAddress) -> Call[int]:
+    def pending_request_shares(self, vault: PlasmaVaultAddress) -> Call[Shares]:
         return self._view(
-            "pendingRequestShares(address)", vault, output_types=["uint256"]
+            "pendingRequestShares(address)",
+            vault,
+            output_types=["uint256"],
+            decoder=Shares,
         )
 
     def command_status(self, command_id: CommandId) -> Call[CommandStatus]:

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/src/ipor_fusion/crosschain/stargate/contracts.py

@@ -6,6 +6,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 
 from eth_typing import ChecksumAddress
+from web3.types import Timestamp
 
 from ipor_fusion.core.contract import Call, ContractWrapper
 from ipor_fusion.crosschain.contracts import (
@@ -69,14 +70,14 @@ class ExecutorInitParams:
     manager: PlasmaVaultAddress
     admin: ChecksumAddress
     rescue_guardian: ChecksumAddress
-    rescue_delay: int
+    rescue_delay: Period
     balance_proposer: ChecksumAddress
     balance_approver: ChecksumAddress
-    staleness_max: int
+    staleness_max: Period
     big_change_bps: int
-    min_update_interval: int
-    deployment_ttl: int
-    transfer_staleness_max: int
+    min_update_interval: Period
+    deployment_ttl: Period
+    transfer_staleness_max: Period
 
     def as_tuple(self) -> tuple:
         return (
@@ -115,8 +116,8 @@ class StargateCrosschainExecutor(CrosschainExecutor):
     def staleness_max(self) -> Call[Period]:
         return self._view("STALENESS_MAX()", output_types=["uint256"], decoder=Period)
 
-    def deployment_ttl(self) -> Call[int]:
-        return self._view("DEPLOYMENT_TTL()", output_types=["uint256"])
+    def deployment_ttl(self) -> Call[Period]:
+        return self._view("DEPLOYMENT_TTL()", output_types=["uint256"], decoder=Period)
 
     def registered_chain_count(self) -> Call[int]:
         return self._view("registeredChainCount()", output_types=["uint256"])
@@ -147,8 +148,13 @@ class StargateCrosschainExecutor(CrosschainExecutor):
             "pendingArrivalReserve()", output_types=["uint256"], decoder=Amount
         )
 
-    def in_flight_since(self, chain_id: ChainId) -> Call[int]:
-        return self._view("inFlightSince(uint256)", chain_id, output_types=["uint64"])
+    def in_flight_since(self, chain_id: ChainId) -> Call[Timestamp]:
+        return self._view(
+            "inFlightSince(uint256)",
+            chain_id,
+            output_types=["uint64"],
+            decoder=Timestamp,
+        )
 
     def acknowledged_remote_state_version(self, chain_id: ChainId) -> Call[int]:
         return self._view(
@@ -207,8 +213,13 @@ class StargateCrosschainExecutor(CrosschainExecutor):
             decoder=ProposalId,
         )
 
-    def last_approval_at(self, chain_id: ChainId) -> Call[int]:
-        return self._view("lastApprovalAt(uint256)", chain_id, output_types=["uint64"])
+    def last_approval_at(self, chain_id: ChainId) -> Call[Timestamp]:
+        return self._view(
+            "lastApprovalAt(uint256)",
+            chain_id,
+            output_types=["uint64"],
+            decoder=Timestamp,
+        )
 
     def deployment_status(
         self, request_id: DeploymentRequestId
@@ -365,8 +376,8 @@ class StargateCrosschainFactory(CrosschainFactory):
     def max_native_fee(self, chain_id: ChainId) -> Call[int]:
         return self._view("maxNativeFee(uint256)", chain_id, output_types=["uint256"])
 
-    def config_delay(self) -> Call[int]:
-        return self._view("CONFIG_DELAY()", output_types=["uint256"])
+    def config_delay(self) -> Call[Period]:
+        return self._view("CONFIG_DELAY()", output_types=["uint256"], decoder=Period)
 
     def request_count(self) -> Call[int]:
         return self._view("requestCount()", output_types=["uint256"])

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/src/ipor_fusion/crosschain/stargate/layerzero.py

@@ -30,7 +30,13 @@ 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, LayerZeroEid, MessageId, StargateAssetId
+from ipor_fusion.types import (
+    ZERO_ADDRESS,
+    Amount,
+    LayerZeroEid,
+    MessageId,
+    StargateAssetId,
+)
 
 _TYPE_3 = b"\x00\x03"
 _EXECUTOR_WORKER_ID = 1
@@ -187,7 +193,7 @@ class TaxiMessage:
 
     asset_id: StargateAssetId
     receiver: ChecksumAddress
-    amount_sd: int
+    amount_sd: Amount
     compose_msg: bytes
 
     @classmethod
@@ -197,7 +203,7 @@ class TaxiMessage:
         return cls(
             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"),
+            amount_sd=Amount(int.from_bytes(message[35:43], "big")),
             compose_msg=message[43:],
         )
 

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/src/ipor_fusion/crosschain/stargate/transport.py

@@ -28,7 +28,7 @@ from ipor_fusion.crosschain.transport import (
     OutboundMessage,
     transfer_call,
 )
-from ipor_fusion.types import ChainId, LayerZeroEid, StargateAssetId
+from ipor_fusion.types import Amount, ChainId, Decimals, LayerZeroEid, StargateAssetId
 
 
 @dataclass(frozen=True, slots=True)
@@ -50,8 +50,8 @@ class StargateChain:
     stargate_pool: ChecksumAddress
     token: ChecksumAddress
     asset_id: StargateAssetId
-    local_decimals: int
-    shared_decimals: int
+    local_decimals: Decimals
+    shared_decimals: Decimals
     token_source: ChecksumAddress | None = None
 
     def __post_init__(self) -> None:
@@ -75,8 +75,8 @@ class StargateChain:
     def credit_source(self) -> ChecksumAddress:
         return self.token_source or self.stargate_pool
 
-    def to_local_decimals(self, amount_sd: int) -> int:
-        return amount_sd * 10 ** (self.local_decimals - self.shared_decimals)
+    def to_local_decimals(self, amount_sd: Amount) -> Amount:
+        return Amount(amount_sd * 10 ** (self.local_decimals - self.shared_decimals))
 
 
 class StargateTransport(CrosschainTransport):

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/src/ipor_fusion/crosschain/transport.py

@@ -29,7 +29,7 @@ from web3 import Web3
 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, MessageId
+from ipor_fusion.types import Amount, ChainId, MessageId
 
 
 @dataclass(frozen=True, slots=True)
@@ -49,7 +49,7 @@ class OutboundMessage:
     sender: ChecksumAddress
     receiver: ChecksumAddress
     payload: bytes
-    token_amount: int = 0
+    token_amount: Amount = Amount(0)
     raw: Any = None
 
 
@@ -106,7 +106,7 @@ SYNTHETIC_TOKEN_SOURCE: ChecksumAddress = Web3.to_checksum_address(
 
 
 def transfer_call(
-    token: ChecksumAddress, source: ChecksumAddress, to: ChecksumAddress, amount: int
+    token: ChecksumAddress, source: ChecksumAddress, to: ChecksumAddress, amount: Amount
 ) -> DeliveryCall:
     return DeliveryCall(
         to=token,

{ipor_fusion-4.0.0.dev146 → ipor_fusion-4.0.0.dev149}/src/ipor_fusion/fuses/external_state.py

@@ -30,7 +30,7 @@ from ipor_fusion.fuses.base import (
     _validate_not_zero_address,
     _validate_selector,
 )
-from ipor_fusion.types import Amount
+from ipor_fusion.types import Amount, Period
 
 #: One external call run from the executor context: (target, calldata).
 ExternalStateAction = tuple[ChecksumAddress, bytes]
@@ -203,7 +203,7 @@ class ExternalStateSubstrates:
             raise ValueError(f"{name} must not be zero")
 
     @classmethod
-    def staleness_max(cls, seconds: int) -> bytes:
+    def staleness_max(cls, seconds: Period) -> bytes:
         """Maximum age of the confirmed balance, in seconds, before user
         operations are blocked. Must be non-zero -- the executor treats a zero
         as a missing grant and refuses to sync its substrate cache."""
@@ -225,7 +225,7 @@ class ExternalStateSubstrates:
         return _encode_uint248_substrate(cls._DUST_THRESHOLD, percent, "dust threshold")
 
     @classmethod
-    def min_update_interval(cls, seconds: int) -> bytes:
+    def min_update_interval(cls, seconds: Period) -> bytes:
         """Minimum delay, in seconds, between two confirmed balance updates."""
         return _encode_uint248_substrate(
             cls._MIN_UPDATE_INTERVAL, seconds, "min update interval"