Merge pull request #1266 from input-output-hk/fix-contest-observation

Fix the observed contesters in Direct chain
cardano-scaling · Mar 21, 2024 · 013ae99 · 013ae99
2 parents 4f327fa + 85a9b36
commit 013ae99
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 4 deletions.
diff --git a/hydra-node/src/Hydra/Chain/Direct/Tx.hs b/hydra-node/src/Hydra/Chain/Direct/Tx.hs
@@ -993,10 +993,10 @@ observeContestTx utxo tx = do
   datum <- fromScriptData oldHeadDatum
   headId <- findStateToken headOutput
   case (datum, redeemer) of
-    (Head.Closed{contesters}, Head.Contest{}) -> do
+    (Head.Closed{}, Head.Contest{}) -> do
       (newHeadInput, newHeadOutput) <- findTxOutByScript @PlutusScriptV2 (utxoFromTx tx) headScript
       newHeadDatum <- txOutScriptData $ toTxContext newHeadOutput
-      let (onChainSnapshotNumber, contestationDeadline) = decodeDatum newHeadDatum
+      let (onChainSnapshotNumber, contestationDeadline, contesters) = decodeDatum newHeadDatum
       pure
         ContestObservation
           { contestedThreadOutput = (newHeadInput, newHeadOutput)
@@ -1011,7 +1011,7 @@ observeContestTx utxo tx = do
 
   decodeDatum headDatum =
     case fromScriptData headDatum of
-      Just Head.Closed{snapshotNumber, contestationDeadline} -> (snapshotNumber, contestationDeadline)
+      Just Head.Closed{snapshotNumber, contestationDeadline, contesters} -> (snapshotNumber, contestationDeadline, contesters)
       _ -> error "wrong state in output datum"
 
 newtype FanoutObservation = FanoutObservation {headId :: HeadId} deriving stock (Eq, Show, Generic)

diff --git a/hydra-node/test/Hydra/Chain/Direct/StateSpec.hs b/hydra-node/test/Hydra/Chain/Direct/StateSpec.hs
@@ -49,7 +49,45 @@ import Hydra.Chain.Direct.Contract.Mutation (
   replacePolicyIdWith,
  )
 import Hydra.Chain.Direct.Fixture (slotLength, systemStart, testNetworkId)
-import Hydra.Chain.Direct.State (ChainContext (..), ChainState (..), ClosedState (..), HasKnownUTxO (getKnownUTxO), HydraContext (..), InitialState (..), OpenState (..), abort, closedThreadOutput, commit, ctxHeadParameters, ctxParticipants, ctxParties, genChainStateWithTx, genCloseTx, genCollectComTx, genCommitFor, genCommits, genCommits', genContestTx, genFanoutTx, genHydraContext, genInitTx, genStInitial, getContestationDeadline, getKnownUTxO, initialize, observeClose, observeCollect, observeCommit, pickChainContext, unsafeAbort, unsafeClose, unsafeCollect, unsafeCommit, unsafeFanout, unsafeObserveInitAndCommits)
+import Hydra.Chain.Direct.State (
+  ChainContext (..),
+  ChainState (..),
+  ClosedState (..),
+  HasKnownUTxO (getKnownUTxO),
+  HydraContext (..),
+  InitialState (..),
+  OpenState (..),
+  abort,
+  closedThreadOutput,
+  commit,
+  ctxHeadParameters,
+  ctxParticipants,
+  ctxParties,
+  genChainStateWithTx,
+  genCloseTx,
+  genCollectComTx,
+  genCommitFor,
+  genCommits,
+  genCommits',
+  genContestTx,
+  genFanoutTx,
+  genHydraContext,
+  genInitTx,
+  genStInitial,
+  getContestationDeadline,
+  getKnownUTxO,
+  initialize,
+  observeClose,
+  observeCollect,
+  observeCommit,
+  pickChainContext,
+  unsafeAbort,
+  unsafeClose,
+  unsafeCollect,
+  unsafeCommit,
+  unsafeFanout,
+  unsafeObserveInitAndCommits,
+ )
 import Hydra.Chain.Direct.State qualified as Transition
 import Hydra.Chain.Direct.Tx (
   AbortObservation (..),