Dev 254. Debug off (#59)

Author: Bromel777

cardano-dex-contracts-offchain/Contracts/deposit.uplc

@@ -118,13 +118,14 @@ swapValidatorT = plam $ \conf' redeemer' ctx' -> unTermCont $ do
                 (pIsAda # quote)
                 (pdiv # (quoteDelta * exFeePerTokenDen) # (exFeePerTokenDen - exFeePerTokenNum))
                 quoteDelta
-
+    fairExFee <-
+        tlet $ 
+            (pIsAda # quote) #|| (validExFee # rewardValue # selfValue # base # baseAmount # quoteAmount # exFeePerTokenNum # exFeePerTokenDen)
     let 
         strictInputs =
             let inputsLength = plength # inputs
              in inputsLength #== 2 -- address double satisfaction attack
         minSatisfaction = minOutput #<= quoteAmount
-        fairExFee = validExFee # rewardValue # selfValue # base # baseAmount # quote # quoteAmount # exFeePerTokenNum # exFeePerTokenDen
         fairPrice = validPrice # quoteAmount # poolValue # base # quote # baseAmount # feeNum
 
     pure $
@@ -141,28 +142,26 @@ validExFee ::
             :--> PValue _ _
             :--> PAssetClass
             :--> PInteger
-            :--> PAssetClass
             :--> PInteger
             :--> PInteger
             :--> PInteger
             :--> PBool
         )
 validExFee =
-    plam $ \rewardValue selfValue base baseAmount quote quoteAmount exFeePerTokenNum exFeePerTokenDen ->
+    plam $ \rewardValue selfValue base baseAmount quoteAmount exFeePerTokenNum exFeePerTokenDen ->
         unTermCont $ do
             zeroAsData' <- tlet zeroAsData
             bqAda <-
                 tlet $
                     pif
                         (pIsAda # base)
-                        (ptuple # pdata baseAmount # zeroAsData')
-                        (pif (pIsAda # quote) (ptuple # zeroAsData' # pdata quoteAmount) (ptuple # zeroAsData' # zeroAsData'))
-            let baseAda  = pfromData $ pfield @"_0" # bqAda
-                quoteAda = pfromData $ pfield @"_1" # bqAda
+                        (pdata baseAmount)
+                        (zeroAsData')
+            let baseAda  = pfromData $ bqAda
                 outAda   = plovelaceValueOf # rewardValue
                 inAda    = plovelaceValueOf # selfValue
                 exFee    = pdiv # (quoteAmount * exFeePerTokenNum) # exFeePerTokenDen
-            pure $ (inAda - baseAda - exFee) #<= (outAda - quoteAda)
+            pure $ (inAda - baseAda - exFee) #<= outAda
 
 validPrice ::
     Term
@@ -180,4 +179,5 @@ validPrice =
         let relaxedOut    = quoteAmount + 1
             reservesBase  = assetClassValueOf # poolValue # base
             reservesQuote = assetClassValueOf # poolValue # quote
-         in reservesQuote * baseAmount * feeNum #<= relaxedOut * (reservesBase * feeDen + baseAmount * feeNum)
+            correctOut    = pdiv # (reservesQuote * baseAmount * feeNum) # (reservesBase * feeDen + baseAmount * feeNum)
+         in correctOut #<= relaxedOut 

cardano-dex-contracts-offchain/Contracts/pool.uplc

@@ -23,7 +23,7 @@ import Plutarch.Unsafe (punsafeCoerce)
 import Plutarch.Internal
 
 cfgForValidator :: Config
-cfgForValidator = Config DoTracingAndBinds
+cfgForValidator = Config NoTracing
 
 wrapValidator ::
     (PIsData dt, PIsData rdmr) =>

cardano-dex-contracts-offchain/Contracts/redeem.uplc

@@ -23,6 +23,7 @@ import Gen.SwapGen
 checkSwap = testGroup "CheckSwap"
   [ HH.testProperty "correct_swap" successSwap
   , HH.testProperty "correct_swap_x_is_ada" successSwapWithXIsAda
+  , HH.testProperty "correct_swap_y_is_ada" successSwapWithYIsAda
   , HH.testProperty "swap_invalid_ex_fee" invalidExFee
   , HH.testProperty "swap_invalid_fair_price" invalidFairPrice
   ]
@@ -93,6 +94,34 @@ successSwapWithXIsAda = property $ do
 
   result === Right ()
 
+successSwapWithYIsAda :: Property
+successSwapWithYIsAda = property $ do
+  let (x, _, nft, lq) = genAssetClasses
+  pkh             <- forAll genPkh
+  orderTxRef      <- forAll genTxOutRef
+  let
+    y             = mkAdaAssetClass 
+    (cfgData, dh) = genSConfig x y nft 995 4160772239327619 100000000000000 pkh 49405 48068
+    orderTxIn     = genSTxIn orderTxRef dh x 49405 3489838
+    orderTxOut    = genSTxOut dh y 0 1479634 pkh
+  
+  poolTxRef <- forAll genTxOutRef
+  let
+    (pcfg, pdh) = genPConfig x y nft lq 1
+    poolTxIn    = genPTxIn poolTxRef pdh x 9940655 y 0 lq 9223372036844775807 nft 1 10060000
+    poolTxOut   = genPTxOut pdh x 9990060 y 0 lq 9223372036854775787 nft 1 10010497
+  
+  let
+    txInfo  = mkTxInfo poolTxIn orderTxIn poolTxOut orderTxOut
+    purpose = mkPurpose orderTxRef
+
+    cxtToData          = toData $ mkContext txInfo purpose
+    orderRedeemToData  = toData $ mkOrderRedeemer 1 0 1
+
+    result = eraseRight $ evalWithArgs (wrapValidator PSwap.swapValidatorT) [cfgData, orderRedeemToData, cxtToData]
+
+  result === Right ()
+
 invalidFairPrice :: Property
 invalidFairPrice = property $ do
   let (x, y, nft, lq) = genAssetClasses