ipor-fusion 4.0.0.dev39__tar.gz → 4.0.0.dev41__tar.gz

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev41}/PKG-INFO

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

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

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev41}/src/ipor_fusion/crosschain/ccip/contracts.py

@@ -165,9 +165,12 @@ class CcipCrosschainExecutor(CrosschainExecutor):
             "lastRemoteStateVersion(uint256)", chain_id, output_types=["uint64"]
         )
 
-    def active_return(self, chain_id: ChainId) -> Call[bytes]:
+    def active_return(self, chain_id: ChainId) -> Call[OperationId]:
         return self._view(
-            "activeReturn(uint256)", chain_id, output_types=["bytes32"], decoder=bytes
+            "activeReturn(uint256)",
+            chain_id,
+            output_types=["bytes32"],
+            decoder=lambda v: OperationId(bytes(v)),
         )
 
     def active_command(self, chain_id: ChainId) -> Call[CommandId]:
@@ -194,11 +197,14 @@ class CcipCrosschainExecutor(CrosschainExecutor):
         every value-moving operation bumps to invalidate the active proposal."""
         return self._view("accountingEpoch(uint256)", chain_id, output_types=["uint64"])
 
-    def active_proposal_id(self, chain_id: ChainId) -> Call[int]:
+    def active_proposal_id(self, chain_id: ChainId) -> Call[ProposalId]:
         """``activeProposalId(uint256)``: the active balance proposal id for
         the chain, 0 when there is none."""
         return self._view(
-            "activeProposalId(uint256)", chain_id, output_types=["uint256"]
+            "activeProposalId(uint256)",
+            chain_id,
+            output_types=["uint256"],
+            decoder=ProposalId,
         )
 
     def attestation_anchor_principal(self, chain_id: ChainId) -> Call[Amount]:
@@ -233,7 +239,7 @@ class CcipCrosschainExecutor(CrosschainExecutor):
             "processedCcipMessage(bytes32)", message_id, output_types=["bool"]
         )
 
-    def propose_balance(self, observation: BalanceObservation) -> Call[int]:
+    def propose_balance(self, observation: BalanceObservation) -> Call[ProposalId]:
         """``BALANCE_PROPOSER`` only; ``settled_balance`` in local decimals.
 
         A write: ``.send()`` it, or ``.call()`` inside a simulation to preview
@@ -243,6 +249,7 @@ class CcipCrosschainExecutor(CrosschainExecutor):
             "proposeBalance(uint256,uint256,uint64,uint64,uint64,uint64,bytes32)",
             *observation.as_tuple(),
             output_types=["uint256"],
+            decoder=ProposalId,
         )
 
     def reject_balance_and_block(self, proposal_id: ProposalId) -> Call[None]:
@@ -285,9 +292,11 @@ class CcipCrosschainDispatcher(CrosschainDispatcher):
     def tracked_vaults_length(self) -> Call[int]:
         return self._view("trackedVaultsLength()", output_types=["uint256"])
 
-    def tracked_position_set_hash(self) -> Call[bytes]:
+    def tracked_position_set_hash(self) -> Call[PositionSetHash]:
         return self._view(
-            "trackedPositionSetHash()", output_types=["bytes32"], decoder=bytes
+            "trackedPositionSetHash()",
+            output_types=["bytes32"],
+            decoder=lambda v: PositionSetHash(bytes(v)),
         )
 
     def response_queue_head(self) -> Call[int]:

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev41}/src/ipor_fusion/crosschain/ccip/lane.py

@@ -22,7 +22,7 @@ from ipor_fusion.fuses.crosschain.ccip import (
     CcipCrosschainSupplyFuse,
     CcipSendParams,
 )
-from ipor_fusion.types import Amount, ChainId
+from ipor_fusion.types import Amount, ChainId, ProposalId
 
 
 class CcipLane(CrosschainLane):
@@ -134,7 +134,7 @@ class CcipLane(CrosschainLane):
             lambda observation: _to_lane(observation, rate)
         )
 
-    def propose_balance(self, observation: BalanceObservation) -> Call[int]:
+    def propose_balance(self, observation: BalanceObservation) -> Call[ProposalId]:
         """Returns the proposal id (the function's return value)."""
         self._require_spoke(observation)
         return self.executor.propose_balance(observation)

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev41}/src/ipor_fusion/crosschain/contracts.py

@@ -76,8 +76,10 @@ class CrosschainExecutor(ContractWrapper):
     def asset(self) -> Call[ChecksumAddress]:
         return self._view("ASSET()", output_types=["address"], decoder=_address)
 
-    def asset_id(self) -> Call[bytes]:
-        return self._view("ASSET_ID()", output_types=["bytes32"], decoder=bytes)
+    def asset_id(self) -> Call[AssetId]:
+        return self._view(
+            "ASSET_ID()", output_types=["bytes32"], decoder=lambda v: AssetId(bytes(v))
+        )
 
     def factory(self) -> Call[ChecksumAddress]:
         return self._view("FACTORY()", output_types=["address"], decoder=_address)
@@ -172,8 +174,10 @@ class CrosschainDispatcher(ContractWrapper):
     def asset(self) -> Call[ChecksumAddress]:
         return self._view("ASSET()", output_types=["address"], decoder=_address)
 
-    def asset_id(self) -> Call[bytes]:
-        return self._view("ASSET_ID()", output_types=["bytes32"], decoder=bytes)
+    def asset_id(self) -> Call[AssetId]:
+        return self._view(
+            "ASSET_ID()", output_types=["bytes32"], decoder=lambda v: AssetId(bytes(v))
+        )
 
     def factory(self) -> Call[ChecksumAddress]:
         return self._view("FACTORY()", output_types=["address"], decoder=_address)

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev41}/src/ipor_fusion/crosschain/stargate/contracts.py

@@ -170,9 +170,12 @@ class StargateCrosschainExecutor(CrosschainExecutor):
             "pendingTransferCount(uint256)", chain_id, output_types=["uint256"]
         )
 
-    def pending_request_by_chain(self, chain_id: ChainId) -> Call[int]:
+    def pending_request_by_chain(self, chain_id: ChainId) -> Call[DeploymentRequestId]:
         return self._view(
-            "pendingRequestByChain(uint256)", chain_id, output_types=["uint256"]
+            "pendingRequestByChain(uint256)",
+            chain_id,
+            output_types=["uint256"],
+            decoder=DeploymentRequestId,
         )
 
     def active_command(self, chain_id: ChainId) -> Call[ActiveCommand]:
@@ -191,9 +194,12 @@ class StargateCrosschainExecutor(CrosschainExecutor):
             decoder=_active_command_decoder,
         )
 
-    def active_proposal_id(self, chain_id: ChainId) -> Call[int]:
+    def active_proposal_id(self, chain_id: ChainId) -> Call[ProposalId]:
         return self._view(
-            "activeProposalId(uint256)", chain_id, output_types=["uint256"]
+            "activeProposalId(uint256)",
+            chain_id,
+            output_types=["uint256"],
+            decoder=ProposalId,
         )
 
     def last_approval_at(self, chain_id: ChainId) -> Call[int]:

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev41}/tests/test_crosschain_lane.py

@@ -803,3 +803,17 @@ class TestDeploymentDiscovery:
         ccip = next(lane for lane in lanes if isinstance(lane, CcipLane))
         assert ccip.route == ROUTE and ccip.fuses == CCIP_FUSES
         assert ccip.decimal_conversion_rate == DECIMAL_CONVERSION_RATE
+
+
+def test_id_getters_decode_into_the_types_their_writes_take():
+    ccip = CcipCrosschainExecutor(MagicMock(), EXECUTOR)
+    stargate = StargateCrosschainExecutor(MagicMock(), EXECUTOR)
+    word = encode(["bytes32"], [b"\x01" * 32])
+    number = encode(["uint256"], [7])
+    chain = ChainId(1)
+    assert ccip.active_return(chain).decode(word) == b"\x01" * 32
+    assert ccip.asset_id().decode(word) == b"\x01" * 32
+    assert ccip.active_proposal_id(chain).decode(number) == 7
+    assert stargate.active_proposal_id(chain).decode(number) == 7
+    assert stargate.pending_request_by_chain(chain).decode(number) == 7
+    assert type(ccip.asset_id().decode(word)) is bytes

{ipor_fusion-4.0.0.dev39 → ipor_fusion-4.0.0.dev41}/tests/typed_client/consumer.py

@@ -26,11 +26,20 @@ from ipor_fusion.chains import ensure_supported_chain
 from ipor_fusion.core.access import AccessManager
 from ipor_fusion.core.context import Web3Context
 from ipor_fusion.core.plasma_vault import PlasmaVault
+from ipor_fusion.crosschain.ccip.contracts import (
+    CcipCrosschainDispatcher,
+    CcipCrosschainExecutor,
+    CcipCrosschainFactory,
+)
 from ipor_fusion.crosschain.contracts import (
     CrosschainDispatcher,
     CrosschainExecutor,
     CrosschainFactory,
 )
+from ipor_fusion.crosschain.stargate.contracts import (
+    StargateCrosschainExecutor,
+    StargateCrosschainFactory,
+)
 from ipor_fusion.explorer import get_contract_name
 from ipor_fusion.morpho_api import fetch_market, fetch_vault
 from ipor_fusion.readers.morpho import morpho_blue_address
@@ -86,3 +95,23 @@ def crosschain(
     executor.approve_balance(ProposalId(1))
     dispatcher.command_status(CommandId(bytes(32)))
     factory.asset_frozen(AssetId(bytes(32)))
+
+
+def crosschain_reads_feed_writes(
+    ccip: CcipCrosschainExecutor,
+    ccip_dispatcher: CcipCrosschainDispatcher,
+    ccip_factory: CcipCrosschainFactory,
+    stargate: StargateCrosschainExecutor,
+    stargate_factory: StargateCrosschainFactory,
+) -> None:
+    # Ids read through the SDK go back in without re-wrapping.
+    ccip.approve_balance(ccip.active_proposal_id(ETHEREUM).call())
+    stargate.approve_balance(stargate.active_proposal_id(ETHEREUM).call())
+    ccip_factory.asset_frozen(ccip.asset_id().call())
+    ccip_factory.asset_config(ccip_dispatcher.asset_id().call())
+    stargate_factory.asset_config(stargate.asset_id().call())
+    ccip_dispatcher.processed_operation(ccip.active_return(ETHEREUM).call())
+    stargate.deployment_status(stargate.pending_request_by_chain(ETHEREUM).call())
+    stargate_factory.cancel_pending_deployment(
+        stargate.pending_request_by_chain(ETHEREUM).call()
+    )