charli3_dendrite 1.4.9.dev0__tar.gz → 1.4.10.dev0__tar.gz

{charli3_dendrite-1.4.9.dev0 → charli3_dendrite-1.4.10.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: charli3_dendrite
-Version: 1.4.9.dev0
+Version: 1.4.10.dev0
 Summary: 
 License-File: LICENSE
 Author: Elder Millenial

{charli3_dendrite-1.4.9.dev0 → charli3_dendrite-1.4.10.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "charli3_dendrite"
-version = "1.4.9-dev0"
+version = "1.4.10-dev0"
 description = ""
 authors = ["Elder Millenial <eldermillenial@protonmail.com>"]
 readme = "README.md"
@@ -49,7 +49,7 @@ module = ["pycardano", "pycardano.*", "dotenv", "nox"]
 ignore_missing_imports = true
 
 [tool.bumpversion]
-current_version = "1.4.9-dev0"
+current_version = "1.4.10-dev0"
 parse = """(?x)
     (?P<major>\\d+)\\.
     (?P<minor>\\d+)\\.

{charli3_dendrite-1.4.9.dev0 → charli3_dendrite-1.4.10.dev0}/src/charli3_dendrite/dataclasses/datums.py

@@ -64,8 +64,13 @@ class PlutusFullAddress(PlutusData):
     @classmethod
     def from_address(cls, address: Address) -> "PlutusFullAddress":
         """Parse an Address object to a PlutusFullAddress."""
-        error_msg = "Only addresses with staking and payment parts are accepted."
-        if None in [address.staking_part, address.payment_part]:
+        # Enterprise (no-stake) addresses are valid — the staking part is
+        # encoded as PlutusNone below (Plutus `Nothing`). Swap-forwarding
+        # targets are sometimes enterprise script addresses (e.g. an order
+        # forwarding to a bare order script address), so only a payment part
+        # is required.
+        error_msg = "Only addresses with a payment part are accepted."
+        if address.payment_part is None:
             raise ValueError(error_msg)
         stake: _PlutusConstrWrapper | PlutusNone = PlutusNone()
         if address.staking_part is not None:

{charli3_dendrite-1.4.9.dev0 → charli3_dendrite-1.4.10.dev0}/src/charli3_dendrite/dexs/amm/amm_base.py

@@ -99,7 +99,7 @@ class AbstractPoolState(AbstractPairState):
         Raises:
             ValueError: If more than one asset is supplied as input or output.
         """
-        if self.swap_forward and address_target is not None:
+        if not self.swap_forward and address_target is not None:
             print(  # noqa: T201
                 f"{self.__class__.__name__} does not support swap forwarding.",
             )

{charli3_dendrite-1.4.9.dev0 → charli3_dendrite-1.4.10.dev0}/src/charli3_dendrite/dexs/amm/minswap.py

@@ -546,11 +546,16 @@ class MinswapV2OrderDatum(OrderDatum):
         full_address_source = PlutusFullAddress.from_address(address_source)
         step = SwapExactInV2.from_assets(in_asset=in_assets, out_asset=out_assets)
 
+        # `datum_target` is the INNER next-hop order datum (consistent with
+        # Sundae / WingRiders); wrap it as the receiver's inline datum. No
+        # target (or no datum) -> no receiver datum.
         if address_target is None:
             address_target = address_source
-            datum_target = SundaeV3PlutusNone()
+            receiver_datum = SundaeV3PlutusNone()
         elif datum_target is None:
-            datum_target = SundaeV3PlutusNone()
+            receiver_datum = SundaeV3PlutusNone()
+        else:
+            receiver_datum = SundaeV3ReceiverInlineDatum(datum=datum_target)
 
         full_address_target = PlutusFullAddress.from_address(address_target)
 
@@ -574,9 +579,12 @@ class MinswapV2OrderDatum(OrderDatum):
         return cls(
             owner=OAMSignature(address_source.payment_part.payload),
             refund_address=full_address_source,
-            refund_datum_hash=datum_target,
+            # The refund goes back to the source wallet and carries NO datum —
+            # only the receiver (next hop) gets the forward datum, so
+            # refund_datum_hash is always PlutusNone.
+            refund_datum_hash=SundaeV3PlutusNone(),
             receiver_address=full_address_target,
-            receiver_datum_hash=datum_target,
+            receiver_datum_hash=receiver_datum,
             lp_asset=lp_asset,
             step=step,
             max_batcher_fee=batcher_fee.quantity(),

{charli3_dendrite-1.4.9.dev0 → charli3_dendrite-1.4.10.dev0}/src/charli3_dendrite/dexs/amm/sundae.py

@@ -307,8 +307,25 @@ class SundaeV3OrderDatum(OrderDatum):
         in_assets: Assets,
         out_assets: Assets,
         fee: int,
+        address_target: Address | None = None,
+        datum_target: PlutusData | None = None,
     ):
-        full_address = SundaeV3AddressWithDatum.from_address(address_source)
+        # Swap forwarding: when a target address is supplied the filled output
+        # is sent there with an optional inline receiver datum (so it can fund
+        # the next order in a cross-protocol chain) instead of returning to the
+        # source wallet. No target -> source, no inline datum.
+        if address_target is None:
+            full_address = SundaeV3AddressWithDatum.from_address(address_source)
+        else:
+            receiver_datum = (
+                SundaeV3ReceiverInlineDatum(datum=datum_target)
+                if datum_target is not None
+                else SundaeV3PlutusNone()
+            )
+            full_address = SundaeV3AddressWithDatum(
+                address=PlutusFullAddress.from_address(address_target),
+                datum=receiver_datum,
+            )
         merged = in_assets + out_assets
         if in_assets.unit() == merged.unit():
             direction = AtoB()
@@ -642,7 +659,7 @@ class SundaeSwapV3CPPState(AbstractConstantProductPoolState):
 
     @property
     def swap_forward(self) -> bool:
-        return False
+        return True
 
     @property
     def stake_address(self) -> Address:
@@ -738,9 +755,6 @@ class SundaeSwapV3CPPState(AbstractConstantProductPoolState):
         address_target: Address | None = None,
         datum_target: PlutusData | None = None,
     ) -> PlutusData:
-        if self.swap_forward and address_target is not None:
-            print(f"{self.__class__.__name__} does not support swap forwarding.")
-
         ident = bytes.fromhex(self.pool_nft.unit()[64:])
 
         datum = SundaeV3OrderDatum.create_datum(
@@ -749,6 +763,8 @@ class SundaeSwapV3CPPState(AbstractConstantProductPoolState):
             in_assets=in_assets,
             out_assets=out_assets,
             fee=self.batcher_fee(in_assets=in_assets, out_assets=out_assets).quantity(),
+            address_target=address_target,
+            datum_target=datum_target,
         )
 
         return datum
@@ -801,7 +817,7 @@ class SundaeSwapV3StableSwap(AbstractStableSwapPoolState):
 
     @property
     def swap_forward(self) -> bool:
-        return False
+        return True
 
     @property
     def stake_address(self) -> Address:
@@ -917,9 +933,6 @@ class SundaeSwapV3StableSwap(AbstractStableSwapPoolState):
         address_target: Address | None = None,
         datum_target: PlutusData | None = None,
     ) -> PlutusData:
-        if self.swap_forward and address_target is not None:
-            print(f"{self.__class__.__name__} does not support swap forwarding.")
-
         ident = bytes.fromhex(self.pool_nft.unit()[64:])
 
         datum = SundaeV3OrderDatum.create_datum(
@@ -928,6 +941,8 @@ class SundaeSwapV3StableSwap(AbstractStableSwapPoolState):
             in_assets=in_assets,
             out_assets=out_assets,
             fee=self.batcher_fee(in_assets=in_assets, out_assets=out_assets).quantity(),
+            address_target=address_target,
+            datum_target=datum_target,
         )
 
         return datum

{charli3_dendrite-1.4.9.dev0 → charli3_dendrite-1.4.10.dev0}/src/charli3_dendrite/dexs/amm/wingriders.py

@@ -11,6 +11,7 @@ from pycardano import PlutusData
 from pycardano import PlutusV1Script
 from pycardano import PlutusV2Script
 from pycardano.plutus import RawDatum
+from pycardano.plutus import RawPlutusData
 
 from charli3_dendrite.dataclasses.datums import AssetClass
 from charli3_dendrite.dataclasses.datums import OrderDatum
@@ -354,13 +355,45 @@ class WingRidersV2OrderDatum(OrderDatum):
             direction = BtoA()
 
         plutus_address = PlutusFullAddress.from_address(address_source)
+        # Swap forwarding: send the fill to the target (next order) address with
+        # an optional inline compensation datum so it can fund the next order in
+        # a cross-protocol chain; no target -> back to the owner.
+        if address_target is None:
+            beneficiary = plutus_address
+            compensation_datum = b""
+            compensation_datum_type = NoDatum()
+        elif datum_target is not None:
+            beneficiary = PlutusFullAddress.from_address(address_target)
+            # WR-V2 stores the inline compensation datum as the RAW datum
+            # structure (a CBORTag/PlutusData), not its CBOR bytes — storing
+            # datum_target directly serializes to the matching structure.
+            #
+            # The next-hop datum may be a typed OrderDatum (a PlutusData
+            # subclass) or a RawPlutusData wrapper (e.g. a multi-leg inner datum
+            # parsed from CBOR). WR's compensation_datum Union accepts PlutusData
+            # + raw CBOR primitives but NOT the RawPlutusData *class*, so it
+            # rejects RawPlutusData at serialization — unlike Sundae / Minswap,
+            # whose receiver field is a plain PlutusData and accepts either. To
+            # keep forwarding uniform across the three DEXes, unwrap RawPlutusData
+            # to its raw ``.data`` (a CBORTag for any order datum): byte-identical
+            # and Union-valid.
+            compensation_datum = (
+                datum_target.data
+                if isinstance(datum_target, RawPlutusData)
+                else datum_target
+            )
+            compensation_datum_type = InlineDatum()
+        else:
+            beneficiary = PlutusFullAddress.from_address(address_target)
+            compensation_datum = b""
+            compensation_datum_type = NoDatum()
 
         return WingRidersV2OrderDatum(
             oil=2000000,
-            beneficiary=plutus_address,
+            beneficiary=beneficiary,
             owner_address=plutus_address,
-            compensation_datum=b"",
-            compensation_datum_type=NoDatum(),
+            compensation_datum=compensation_datum,
+            compensation_datum_type=compensation_datum_type,
             deadline=timeout,
             asset_a_symbol=(
                 bytes.fromhex(merged.unit()[:56])
@@ -685,7 +718,7 @@ class WingRidersV2CPPState(AbstractConstantProductPoolState):
 
     @property
     def swap_forward(self) -> bool:
-        return False
+        return True
 
     @property
     def pool_id(self) -> str: