size: 14965

input-output-hk · Nov 23, 2021 · 1df2e52 · 1df2e52
1 parent e091477
commit 1df2e52
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/marlowe/src/Language/Marlowe/Scripts.hs b/marlowe/src/Language/Marlowe/Scripts.hs
@@ -241,7 +241,12 @@ smallMarloweValidator params MarloweData{..} inputs ctx@ScriptContext{scriptCont
                         totalIncome = foldMap collectDeposits inputs
                         totalPayouts = foldMap snd payoutsByParty
                         finalBalance = inputBalance + totalIncome - totalPayouts
-                        in checkOwnOutputConstraint ownInput marloweData finalBalance
+                        outConstrs = OutputConstraint
+                                    { ocDatum = marloweData
+                                    , ocValue = finalBalance
+                                    }
+                        in checkOwnOutputConstraint ctx outConstrs
+                        -- in checkOwnOutputConstraint ownInput marloweData finalBalance
             preconditionsOk && payoutsOk && checkContinuation
         Error TEAmbiguousSlotIntervalError -> traceError "E1"
         Error TEApplyNoMatchError -> traceError "E2"
@@ -254,8 +259,8 @@ smallMarloweValidator params MarloweData{..} inputs ctx@ScriptContext{scriptCont
                     txOutValue == value && hsh == Just svh && txOutAddress == addr
     checkOutput _ _ _ _ = False
 
-    checkOwnOutputConstraint :: TxInInfo -> MarloweData -> Val.Value -> Bool
-    checkOwnOutputConstraint TxInInfo{txInInfoResolved=TxOut{txOutAddress=ownAddress}} ocDatum ocValue =
+    checkOwnOutputConstraint1 :: TxInInfo -> MarloweData -> Val.Value -> Bool
+    checkOwnOutputConstraint1 TxInInfo{txInInfoResolved=TxOut{txOutAddress=ownAddress}} ocDatum ocValue =
         let hsh = findDatumHash (Datum $ PlutusTx.toBuiltinData ocDatum) scriptContextTxInfo
         in traceIfFalse "L1" -- "Output constraint"
         $ any (checkOutput ownAddress hsh ocValue) allOutputs