Make CloseOutdated work again

cardano-scaling · Jul 3, 2024 · 4accf1e · 4accf1e
1 parent 17ac2ff
commit 4accf1e
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 18 deletions.
diff --git a/hydra-node/test/Hydra/Chain/Direct/Contract/Close/CloseCurrent.hs b/hydra-node/test/Hydra/Chain/Direct/Contract/Close/CloseCurrent.hs
@@ -7,7 +7,7 @@ import Hydra.Cardano.Api
 import Hydra.Prelude hiding (label)
 
 import Data.Maybe (fromJust)
-import Hydra.Chain.Direct.Contract.Close.Healthy (healthyContestationDeadline, healthyContestationPeriodSeconds, healthyOnChainParties, healthyOpenDatum, healthyOpenHeadTxIn, healthyOpenHeadTxOut, healthySignature, healthySnapshot, somePartyCardanoVerificationKey, healthySplitUTxOInHead, healthyConfirmedClosingSnapshotTx)
+import Hydra.Chain.Direct.Contract.Close.Healthy (healthyContestationDeadline, healthyContestationPeriodSeconds, healthyOnChainParties, healthyOpenDatum, healthyOpenHeadTxIn, healthyOpenHeadTxOut, healthySignature, healthySnapshot, somePartyCardanoVerificationKey, healthySplitUTxOInHead, healthyConfirmedClosingTx)
 import Hydra.Chain.Direct.Contract.Gen (genHash, genMintedOrBurnedValue)
 import Hydra.Chain.Direct.Contract.Mutation (
   Mutation (..),
@@ -52,7 +52,7 @@ healthyCurrentSnapshotVersion = 1
 -- | Healthy close transaction for the generic case were we close a head
 --   after one or more snapshot have been agreed upon between the members.
 healthyCloseCurrentTx :: (Tx, UTxO)
-healthyCloseCurrentTx = healthyConfirmedClosingSnapshotTx healthyCurrentSnapshot
+healthyCloseCurrentTx = healthyConfirmedClosingTx healthyCurrentSnapshot
 
 healthyCurrentSnapshot :: Snapshot Tx
 healthyCurrentSnapshot = healthySnapshot healthyCurrentSnapshotNumber healthyCurrentSnapshotVersion

diff --git a/hydra-node/test/Hydra/Chain/Direct/Contract/Close/CloseInitial.hs b/hydra-node/test/Hydra/Chain/Direct/Contract/Close/CloseInitial.hs
@@ -8,7 +8,7 @@ import Hydra.Prelude hiding (label)
 
 import Cardano.Api.UTxO as UTxO
 import Data.Maybe (fromJust)
-import Hydra.Chain.Direct.Contract.Close.Healthy (healthyCloseLowerBoundSlot, healthyCloseUpperBoundPointInTime, healthyContestationDeadline, healthyContestationPeriod, healthyOnChainParties, healthyOpenDatum, healthyOpenHeadTxIn, healthyOpenHeadTxOut, healthySnapshot, healthyUTxO, somePartyCardanoVerificationKey)
+import Hydra.Chain.Direct.Contract.Close.Healthy (healthyCloseLowerBoundSlot, healthyCloseUpperBoundPointInTime, healthyContestationDeadline, healthyContestationPeriod, healthyOnChainParties, healthyOpenDatum, healthyOpenHeadTxIn, healthyOpenHeadTxOut, healthySnapshot, healthyUTxO, somePartyCardanoVerificationKey, scriptRegistry)
 import Hydra.Chain.Direct.Contract.Mutation (Mutation (..), SomeMutation (..), modifyInlineDatum, replaceContestationDeadline)
 import Hydra.Chain.Direct.Fixture qualified as Fixture
 import Hydra.Chain.Direct.ScriptRegistry (ScriptRegistry, genScriptRegistry, registryUTxO)
@@ -61,9 +61,6 @@ healthyCloseInitialTx =
     UTxO.singleton (healthyOpenHeadTxIn, healthyOpenHeadTxOut initialDatum)
       <> registryUTxO scriptRegistry
 
-  scriptRegistry :: ScriptRegistry
-  scriptRegistry = genScriptRegistry `generateWith` 42
-
   openThreadOutput :: OpenThreadOutput
   openThreadOutput =
     OpenThreadOutput

diff --git a/hydra-node/test/Hydra/Chain/Direct/Contract/Close/CloseOutdated.hs b/hydra-node/test/Hydra/Chain/Direct/Contract/Close/CloseOutdated.hs
@@ -6,7 +6,9 @@ module Hydra.Chain.Direct.Contract.Close.CloseOutdated where
 import Hydra.Cardano.Api
 import Hydra.Prelude hiding (label)
 
+import Cardano.Api.UTxO as UTxO
 import Data.Maybe (fromJust)
+import Hydra.Chain.Direct.Contract.Close.Healthy (healthyCloseLowerBoundSlot, healthyCloseUTxOHash, healthyCloseUpperBoundPointInTime, healthyConfirmedClosingSnapshot, healthyContestationDeadline, healthyContestationPeriod, healthyContestationPeriodSeconds, healthyOnChainParties, healthyOpenDatum, healthyOpenHeadTxIn, healthyOpenHeadTxOut, healthySignature, healthySplitUTxOInHead, healthySplitUTxOToDecommit, scriptRegistry, somePartyCardanoVerificationKey)
 import Hydra.Chain.Direct.Contract.Gen (genHash, genMintedOrBurnedValue)
 import Hydra.Chain.Direct.Contract.Mutation (
   Mutation (..),
@@ -22,12 +24,19 @@ import Hydra.Chain.Direct.Contract.Mutation (
   replaceSnapshotNumber,
   replaceUtxoHash,
  )
-import Hydra.Chain.Direct.Contract.Close.Healthy (healthyContestationDeadline, healthyContestationPeriodSeconds, healthyOnChainParties, healthyOpenDatum, healthyOpenHeadTxIn, healthyOpenHeadTxOut, healthySignature, somePartyCardanoVerificationKey, healthySplitUTxOInHead, healthySplitUTxOToDecommit, healthyCloseUTxOHash, healthyConfirmedClosingSnapshot, healthyConfirmedClosingSnapshotTx)
 import Hydra.Chain.Direct.Fixture qualified as Fixture
-import Hydra.Chain.Direct.Tx (ClosingSnapshot (..), UTxOHash (UTxOHash), mkHeadId)
+import Hydra.Chain.Direct.ScriptRegistry (registryUTxO)
+import Hydra.Chain.Direct.Tx (
+  ClosingSnapshot (..),
+  OpenThreadOutput (..),
+  UTxOHash (UTxOHash),
+  closeTx,
+  mkHeadId,
+ )
 import Hydra.Contract.Error (toErrorCode)
 import Hydra.Contract.HeadError (HeadError (..))
 import Hydra.Contract.HeadState qualified as Head
+import Hydra.Contract.HeadState qualified as HeadState
 import Hydra.Contract.HeadTokens (headPolicyId)
 import Hydra.Contract.Util (UtilError (MintingOrBurningIsForbidden))
 import Hydra.Crypto (MultiSignature (..), toPlutusSignatures)
@@ -69,8 +78,38 @@ healthyOutdatedConfirmedClosingSnapshot :: ClosingSnapshot
 healthyOutdatedConfirmedClosingSnapshot = healthyConfirmedClosingSnapshot healthyOutdatedSnapshot
 
 healthyCloseOutdatedTx :: (Tx, UTxO)
-healthyCloseOutdatedTx = healthyConfirmedClosingSnapshotTx healthyOutdatedSnapshot
+healthyCloseOutdatedTx =
+  (tx, lookupUTxO)
+ where
+  tx =
+    closeTx
+      scriptRegistry
+      somePartyCardanoVerificationKey
+      (healthyConfirmedClosingSnapshot healthyOutdatedSnapshot)
+      healthyCloseLowerBoundSlot
+      healthyCloseUpperBoundPointInTime
+      openThreadOutput
+      (mkHeadId Fixture.testPolicyId)
+      (healthyOutdatedSnapshotVersion + 1)
+
+  lookupUTxO :: UTxO' (TxOut CtxUTxO)
+  lookupUTxO =
+    UTxO.singleton (healthyOpenHeadTxIn, healthyOpenHeadTxOut datum)
+      <> registryUTxO scriptRegistry
+
+  datum :: TxOutDatum CtxUTxO
+  datum = toUTxOContext (mkTxOutDatumInline openDatum)
+
+  openDatum :: HeadState.State
+  openDatum = healthyOpenDatum healthyOutdatedSnapshot
 
+  openThreadOutput :: OpenThreadOutput
+  openThreadOutput =
+    OpenThreadOutput
+      { openThreadUTxO = (healthyOpenHeadTxIn, healthyOpenHeadTxOut datum)
+      , openParties = healthyOnChainParties
+      , openContestationPeriod = healthyContestationPeriod
+      }
 
 data CloseMutation
   = -- | Ensures collectCom does not allow any output address but νHead.

diff --git a/hydra-node/test/Hydra/Chain/Direct/Contract/Close/Healthy.hs b/hydra-node/test/Hydra/Chain/Direct/Contract/Close/Healthy.hs
@@ -6,13 +6,15 @@ module Hydra.Chain.Direct.Contract.Close.Healthy where
 import Hydra.Cardano.Api
 import Hydra.Prelude hiding (label)
 
+import Cardano.Api.UTxO qualified as UTxO
 import Hydra.Chain.Direct.Contract.Mutation (
   addParticipationTokens,
  )
 import Hydra.Chain.Direct.Fixture qualified as Fixture
+import Hydra.Chain.Direct.ScriptRegistry (ScriptRegistry, genScriptRegistry, registryUTxO)
 import Hydra.Chain.Direct.State (splitUTxO)
 import Hydra.Chain.Direct.TimeHandle (PointInTime)
-import Hydra.Chain.Direct.Tx (mkHeadId, mkHeadOutput, ClosingSnapshot (..), UTxOHash (..), OpenThreadOutput (..), closeTx)
+import Hydra.Chain.Direct.Tx (ClosingSnapshot (..), OpenThreadOutput (..), UTxOHash (..), closeTx, mkHeadId, mkHeadOutput)
 import Hydra.ContestationPeriod (fromChain)
 import Hydra.Contract.HeadState qualified as Head
 import Hydra.Crypto (HydraKey, MultiSignature, aggregate, sign)
@@ -24,12 +26,10 @@ import Hydra.Ledger.Cardano.Evaluate (genValidityBoundsFromContestationPeriod)
 import Hydra.Party (Party, deriveParty, partyToChain)
 import Hydra.Plutus.Orphans ()
 import Hydra.Snapshot as Snapshot (Snapshot (..), SnapshotNumber, SnapshotVersion)
-import PlutusLedgerApi.V2 (toBuiltin, BuiltinByteString)
+import PlutusLedgerApi.V2 (BuiltinByteString, toBuiltin)
 import Test.Hydra.Fixture (aliceSk, bobSk, carolSk, genForParty)
 import Test.QuickCheck (elements)
 import Test.QuickCheck.Instances ()
-import qualified Cardano.Api.UTxO as UTxO
-import Hydra.Chain.Direct.ScriptRegistry (registryUTxO, genScriptRegistry, ScriptRegistry)
 
 healthySeed :: Int
 healthySeed = 42
@@ -41,6 +41,9 @@ healthySplitUTxOInHead :: UTxO
 healthySplitUTxOToDecommit :: UTxO
 (healthySplitUTxOInHead, healthySplitUTxOToDecommit) = splitUTxO healthyUTxO
 
+scriptRegistry :: ScriptRegistry
+scriptRegistry = genScriptRegistry `generateWith` 42
+
 -- NOTE: We need to use the contestation period when generating start/end tx
 -- validity slots/time since if tx validity bound difference is bigger than
 -- contestation period our close validator will fail
@@ -127,8 +130,8 @@ healthyConfirmedClosingSnapshot snapshot =
     , version = Snapshot.version snapshot
     }
 
-healthyConfirmedClosingSnapshotTx :: Snapshot Tx -> (Tx, UTxO)
-healthyConfirmedClosingSnapshotTx snapshot@Snapshot{version} =
+healthyConfirmedClosingTx :: Snapshot Tx -> (Tx, UTxO)
+healthyConfirmedClosingTx snapshot@Snapshot{version} =
   (tx, lookupUTxO)
  where
   tx :: Tx
@@ -151,9 +154,6 @@ healthyConfirmedClosingSnapshotTx snapshot@Snapshot{version} =
     UTxO.singleton (healthyOpenHeadTxIn, healthyOpenHeadTxOut datum)
       <> registryUTxO scriptRegistry
 
-  scriptRegistry :: ScriptRegistry
-  scriptRegistry = genScriptRegistry `generateWith` healthySeed
-
   openThreadOutput :: OpenThreadOutput
   openThreadOutput =
     OpenThreadOutput