Wait on unresolved decommit

Signed-off-by: Sasha Bogicevic <[email protected]>
cardano-scaling · Sep 11, 2024 · 7b32889 · 7b32889
1 parent 1e3279c
commit 7b32889
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/hydra-node/src/Hydra/HeadLogic.hs b/hydra-node/src/Hydra/HeadLogic.hs
@@ -430,6 +430,7 @@ onOpenNetworkReqSn env ledger st otherParty sv sn requestedTxIds mDecommitTx mIn
                       , number = sn
                       , confirmed = requestedTxIds
                       , utxo = u
+                      , utxoToCommit = mIncrementUTxO
                       , utxoToDecommit = mUtxoToDecommit
                       }
               -- Spec: η ← combine(𝑈)
@@ -856,19 +857,21 @@ onOpenChainDepositTx ::
   UTxOType tx ->
   Outcome tx
 onOpenChainDepositTx env st utxo =
-  if not snapshotInFlight && isLeader parameters party nextSn
-    then -- TODO: shall we include deposit tx in the ReqSn?
-      cause (NetworkEffect $ ReqSn version nextSn (txId <$> localTxs) Nothing (Just utxo))
-    else noop
+  waitOnUnresolvedDecommit $
+    if not snapshotInFlight && isLeader parameters party nextSn
+      then cause (NetworkEffect $ ReqSn version nextSn (txId <$> localTxs) Nothing (Just utxo))
+      else noop
  where
-  -- TODO: implement me!
-  waitOnResolvedDecrement cont = undefined
+  waitOnUnresolvedDecommit cont =
+    case decommitTx of
+      Nothing -> cont
+      Just tx -> wait $ WaitOnUnresolvedDecommit{decommitTx = tx}
 
   nextSn = confirmedSn + 1
 
   Environment{party} = env
 
-  CoordinatedHeadState{localTxs, confirmedSnapshot, seenSnapshot, version} = coordinatedHeadState
+  CoordinatedHeadState{localTxs, confirmedSnapshot, seenSnapshot, version, decommitTx} = coordinatedHeadState
 
   Snapshot{number = confirmedSn} = getSnapshot confirmedSnapshot
 

diff --git a/hydra-node/src/Hydra/HeadLogic/Outcome.hs b/hydra-node/src/Hydra/HeadLogic/Outcome.hs
@@ -177,6 +177,7 @@ data WaitReason tx
   | WaitOnTxs {waitingForTxIds :: [TxIdType tx]}
   | WaitOnContestationDeadline
   | WaitOnNotApplicableDecommitTx {notApplicableReason :: DecommitInvalidReason tx}
+  | WaitOnUnresolvedDecommit {decommitTx :: tx}
   deriving stock (Generic)
 
 deriving stock instance IsTx tx => Eq (WaitReason tx)

diff --git a/hydra-node/test/Hydra/HeadLogicSpec.hs b/hydra-node/test/Hydra/HeadLogicSpec.hs
@@ -508,6 +508,7 @@ spec =
                 , number = 1
                 , confirmed = []
                 , utxo = activeUTxO
+                , utxoToCommit = Nothing
                 , utxoToDecommit = Just $ utxoRefs [3]
                 }
             s0 =
@@ -1014,5 +1015,6 @@ testSnapshot number version confirmed utxo =
     , number
     , confirmed
     , utxo
+    , utxoToCommit = mempty
     , utxoToDecommit = mempty
     }