charli3_dendrite 1.5.14.dev2__tar.gz → 1.5.14.dev3__tar.gz

{charli3_dendrite-1.5.14.dev2 → charli3_dendrite-1.5.14.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: charli3_dendrite
-Version: 1.5.14.dev2
+Version: 1.5.14.dev3
 Summary: 
 License-File: LICENSE
 Author: Elder Millenial

{charli3_dendrite-1.5.14.dev2 → charli3_dendrite-1.5.14.dev3}/pyproject.toml

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

{charli3_dendrite-1.5.14.dev2 → charli3_dendrite-1.5.14.dev3}/src/charli3_dendrite/dexs/amm/wingriders.py

@@ -308,6 +308,10 @@ class WithdrawProtocolAction(PlutusData):
     CONSTR_ID = 4
 
 
+# Every WingRiders V2 order attaches this agent fee (the pools' ``agent_fee_ada``).
+_V2_AGENT_FEE_LOVELACE = 2_000_000
+
+
 @dataclass
 class WingRidersV2OrderDatum(OrderDatum):
     """WingRiders order datum."""
@@ -388,11 +392,18 @@ class WingRidersV2OrderDatum(OrderDatum):
             compensation_datum = b""
             compensation_datum_type = NoDatum()
 
-        # ``oil`` declares the lovelace the batcher passes through to the beneficiary
-        # (it swaps the rest). A forwarded order must ride the full deposit through to
-        # fund the next hop, so oil follows ``deposit``; a plain owner-paid swap keeps
-        # the standard 2-ADA buffer.
-        oil = deposit.quantity() if address_target is not None else 2000000
+        # ``oil`` declares the lovelace the batcher passes through to the beneficiary.
+        # The batcher swaps the order's ADA less ``oil`` and the flat agent fee, keeps
+        # its tiered fee out of the agent fee and returns the rest of it with the
+        # swap output. So a forwarded order's oil is what it attaches above the agent
+        # fee: 2 ADA when ADA is swapped (oil above that would come out of the swap),
+        # the whole cascaded deposit on a token-to-token order. A plain owner-paid
+        # swap keeps the standard 2-ADA buffer.
+        oil = (
+            batcher_fee.quantity() + deposit.quantity() - _V2_AGENT_FEE_LOVELACE
+            if address_target is not None
+            else 2000000
+        )
 
         return WingRidersV2OrderDatum(
             oil=oil,