Keep abortTx valid by distinguishing initial redeemer as Commit | Abort

input-output-hk · Jan 26, 2022 · 2c7422e · 2c7422e
1 parent 4a35e66
commit 2c7422e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/hydra-node/src/Hydra/Chain/Direct/Tx.hs b/hydra-node/src/Hydra/Chain/Direct/Tx.hs
@@ -196,7 +196,7 @@ commitTx networkId party utxo (initialInput, vkh) =
   initialDatum =
     Api.mkDatumForTxIn $ Initial.datum vkh
   initialRedeemer =
-    Api.mkRedeemerForTxIn $ Initial.redeemer ()
+    Api.mkRedeemerForTxIn $ Initial.redeemer Initial.Commit
 
   commitOutput =
     Api.TxOut commitAddress commitValue commitDatum
@@ -398,7 +398,7 @@ abortTx networkId (Api.fromLedgerTxIn -> headInput, Api.fromLedgerData -> headDa
   initialScript =
     Api.fromPlutusScript Initial.validatorScript
   initialRedeemer =
-    Api.mkRedeemerForTxIn $ Initial.redeemer ()
+    Api.mkRedeemerForTxIn $ Initial.redeemer Initial.Abort
 
 -- * Observe Hydra Head transactions
 

diff --git a/hydra-plutus/src/Hydra/Contract/Initial.hs b/hydra-plutus/src/Hydra/Contract/Initial.hs
@@ -18,9 +18,15 @@ import PlutusTx.IsData.Class (ToData (..))
 
 data Initial
 
+data InitialRedeemer
+  = Abort
+  | Commit
+
+PlutusTx.unstableMakeIsData ''InitialRedeemer
+
 instance Scripts.ValidatorTypes Initial where
   type DatumType Initial = PubKeyHash
-  type RedeemerType Initial = ()
+  type RedeemerType Initial = InitialRedeemer
 
 validator ::
   -- | Commit validator
@@ -29,8 +35,10 @@ validator ::
   RedeemerType Initial ->
   ScriptContext ->
   Bool
-validator commitValidator _datum _redeemer context@ScriptContext{scriptContextTxInfo = txInfo} =
-  checkOutputValue
+validator commitValidator _datum red context@ScriptContext{scriptContextTxInfo = txInfo} =
+  case red of
+    Abort -> True
+    Commit -> checkOutputValue
  where
   checkOutputValue =
     traceIfFalse "commitLockedValue does not match" $