Align decommit off-chain spec/impl

These checks there are really not "require" statements, as they would not "detect cheating" as described in the specification.
cardano-scaling · Mar 7, 2024 · 159ce16 · 159ce16
1 parent f24c855
commit 159ce16
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 54 deletions.
diff --git a/hydra-node/src/Hydra/HeadLogic.hs b/hydra-node/src/Hydra/HeadLogic.hs
@@ -620,24 +620,49 @@ onOpenClientDecommit ::
   tx ->
   Outcome tx
 onOpenClientDecommit env headId ledger currentSlot coordinatedHeadState decommitTx =
-  case mExistingDecommitTx of
-    Just existingDecommitTx ->
+  checkNoDecommitInFlight $
+    checkValidDecommitTx $
       Effects
-        [ ClientEffect
-            ServerOutput.DecommitInvalid
-              { headId
-              , decommitInvalidReason = ServerOutput.DecommitAlreadyInFlight{decommitTx = existingDecommitTx}
-              }
+        [ NetworkEffect ReqDec{transaction = decommitTx, decommitRequester = party}
         ]
-    Nothing ->
-      requireValidDecommitTx headId ledger currentSlot coordinatedHeadState decommitTx $
+ where
+  checkNoDecommitInFlight continue =
+    case mExistingDecommitTx of
+      Just existingDecommitTx ->
         Effects
-          [ NetworkEffect ReqDec{transaction = decommitTx, decommitRequester = party}
+          [ ClientEffect
+              ServerOutput.DecommitInvalid
+                { headId
+                , decommitInvalidReason = ServerOutput.DecommitAlreadyInFlight{decommitTx = existingDecommitTx}
+                }
           ]
- where
-  Environment{party} = env
+      Nothing -> continue
+
+  checkValidDecommitTx cont =
+    case applyTransactions ledger currentSlot confirmedUTxO [decommitTx] of
+      Left (_, err) ->
+        Effects
+          [ ClientEffect
+              ServerOutput.DecommitInvalid
+                { headId
+                , decommitInvalidReason =
+                    ServerOutput.DecommitTxInvalid
+                      { confirmedUTxO
+                      , decommitTx
+                      , validationError = err
+                      }
+                }
+          ]
+      Right _ -> cont
+
+  confirmedUTxO = (getSnapshot confirmedSnapshot).utxo
+
+  CoordinatedHeadState{confirmedSnapshot} = coordinatedHeadState
+
   CoordinatedHeadState{decommitTx = mExistingDecommitTx} = coordinatedHeadState
 
+  Environment{party} = env
+
 -- | Process the request 'ReqDec' to decommit something from the Open head.
 --
 -- __Transition__: 'OpenState' → 'OpenState'
@@ -1212,40 +1237,3 @@ recoverState ::
   t (StateChanged tx) ->
   HeadState tx
 recoverState = foldl' aggregate
-
--- Decommit helpers
-
--- TODO: Spec: require U̅ ◦ decTx /= ⊥
-
--- | Prevents further evaluation if Decommit tx is not applicable to the local
--- ledger state. In this case emits 'DecommitInvalid' otherwise it alows
--- continuation to proceed.
-requireValidDecommitTx ::
-  Monoid (UTxOType tx) =>
-  HeadId ->
-  Ledger tx ->
-  ChainSlot ->
-  CoordinatedHeadState tx ->
-  tx ->
-  Outcome tx ->
-  Outcome tx
-requireValidDecommitTx headId ledger currentSlot coordinatedHeadState decommitTx cont =
-  case applyTransactions ledger currentSlot confirmedUTxO [decommitTx] of
-    Left (_, err) ->
-      Effects
-        [ ClientEffect
-            ServerOutput.DecommitInvalid
-              { headId
-              , decommitInvalidReason =
-                  ServerOutput.DecommitTxInvalid
-                    { confirmedUTxO
-                    , decommitTx
-                    , validationError = err
-                    }
-              }
-        ]
-    Right _ -> cont
- where
-  confirmedUTxO = (getSnapshot confirmedSnapshot).utxo
-
-  CoordinatedHeadState{confirmedSnapshot} = coordinatedHeadState
diff --git a/spec/fig_offchain_prot.tex b/spec/fig_offchain_prot.tex
@@ -90,10 +90,8 @@
 
 						%%% DECOMMIT
 						\On{$(\mathtt{decommit},\tx)$ from client}{
-						    \textcolor{red}{
-							% TODO: check U_\omega is bottom to not have multiple in-flight?
-							\Req{$\barmU \applytx \tx \not= \bot$} \;
-							\Multi{} $(\mathtt{reqDec},\tx)$%
+							\If{\textcolor{blue}{$\tx_{\omega} = \bot \land \barmU \applytx \tx \not= \bot$}}{
+							  \Multi{} $(\mathtt{reqDec},\tx)$%
 							}
 						}
 

diff --git a/spec/prel.tex b/spec/prel.tex
@@ -20,7 +20,7 @@ \subsection{Notation}
 
 \noindent Furthermore, given a set $\mathcal{A}$, let
 \begin{itemize}
-	\item $\mathcal{A}^? = \mathcal{A} \cup \Diamond$ denotes an option: a value from $\mathcal{A}$ or no value at all,
+	\item $\mathcal{A}^? = \mathcal{A} \cup \Diamond$ denotes an option: a value from $\mathcal{A}$ or no value at all indicated by $\bot$,
 	\item $\mathcal{A}^n$ be the set of all n-sized sequences over $\mathcal{A}$,
 	\item $\mathcal{A}^! = \bigcup_{i=1}^{n \in \tyNatural} \mathcal{A}^{i}$ be the set of non-empty sequences over $\mathcal{A}$, and
 	\item $\mathcal{A}^* = \bigcup_{i=0}^{n \in \tyNatural} \mathcal{A}^{i}$ be