Use plain validatorHash when passing Dependencies to validator

After upgrading to more recent Plutus version, validatorHash is in sync with hashScript from the ledger API so we can use it directly to compute dependencies.
cardano-scaling · Oct 12, 2021 · 7ff91c0 · 7ff91c0
1 parent 270ffcd
commit 7ff91c0
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 42 deletions.
diff --git a/hydra-node/src/Hydra/Chain/Direct/Tx.hs b/hydra-node/src/Hydra/Chain/Direct/Tx.hs
@@ -12,7 +12,7 @@ module Hydra.Chain.Direct.Tx where
 
 import Hydra.Prelude
 
-import Cardano.Binary (serialize, serialize')
+import Cardano.Binary (serialize)
 import Cardano.Ledger.Address (Addr (Addr))
 import Cardano.Ledger.Alonzo (AlonzoEra, Script)
 import Cardano.Ledger.Alonzo.Data (Data (Data), DataHash, hashData)
@@ -27,7 +27,6 @@ import Cardano.Ledger.ShelleyMA.Timelocks (ValidityInterval (..))
 import Cardano.Ledger.Val (inject)
 import Control.Monad (foldM)
 import Control.Monad.Class.MonadSTM (stateTVar)
-import Data.ByteArray (convert)
 import qualified Data.Map as Map
 import qualified Data.Sequence.Strict as StrictSeq
 import qualified Data.Set as Set
@@ -165,7 +164,6 @@ abortTx (smInput, token, HeadParameters{contestationPeriod, parties}) initInputs
   (policyId, _) = first currencyMPSHash (unAssetClass token)
 
   initialScript = plutusScript Initial.validatorScript
-  commitScript = plutusScript Commit.validatorScript
   headScript = plutusScript $ Head.validatorScript policyId
 
   scripts =
@@ -201,9 +199,9 @@ abortTx (smInput, token, HeadParameters{contestationPeriod, parties}) initInputs
       dependencies =
         Initial.Dependencies
           { Initial.headScript =
-              Plutus.ValidatorHash $ convert $ serialize' $ hashScript @Era headScript
+              Head.validatorHash policyId
           , Initial.commitScript =
-              Plutus.ValidatorHash $ convert $ serialize' $ hashScript @Era commitScript
+              Commit.validatorHash
           }
   abortDatum =
     Data $ toData Head.Final

diff --git a/hydra-node/test/Hydra/Chain/Direct/TxSpec.hs b/hydra-node/test/Hydra/Chain/Direct/TxSpec.hs
@@ -10,7 +10,7 @@ import Test.Hydra.Prelude
 
 import Test.Cardano.Ledger.Generic.Updaters hiding (vkey)
 import Test.Cardano.Ledger.Generic.Proof
-import Cardano.Binary (serialize, serialize')
+import Cardano.Binary (serialize)
 import Cardano.Ledger.Alonzo (TxOut)
 import Cardano.Ledger.Alonzo.Data (Data (Data), hashData)
 import Cardano.Ledger.Alonzo.Language (Language (PlutusV1))
@@ -21,15 +21,13 @@ import Cardano.Ledger.Alonzo.Tx (ValidatedTx (ValidatedTx, body, wits))
 import Cardano.Ledger.Alonzo.TxBody (TxOut (TxOut))
 import Cardano.Ledger.Alonzo.TxWitness (RdmrPtr, TxWitness (txdats), unTxDats)
 import Cardano.Ledger.Crypto (StandardCrypto)
-import Cardano.Ledger.Era (hashScript)
 import Cardano.Ledger.Mary.Value (AssetName, PolicyID, Value (Value))
 import qualified Cardano.Ledger.SafeHash as SafeHash
 import Cardano.Ledger.Slot (EpochSize (EpochSize))
 import Cardano.Ledger.Val (inject)
 import Cardano.Slotting.EpochInfo (fixedEpochInfo)
 import Cardano.Slotting.Time (SystemStart (..), mkSlotLength)
 import Data.Array (array)
-import Data.ByteArray (convert)
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.Map as Map
 import Data.Maybe (fromJust)
@@ -45,11 +43,10 @@ import Hydra.Data.Party (partyFromVerKey)
 import Hydra.Party (vkey)
 import Ledger.Value (currencyMPSHash, unAssetClass)
 import Plutus.V1.Ledger.Api (PubKeyHash (PubKeyHash), toBuiltin, toBuiltinData, toData)
-import qualified Plutus.V1.Ledger.Api as Plutus
 import Shelley.Spec.Ledger.API (Coin (Coin), StrictMaybe (SJust), TxId (TxId), TxIn (TxIn), UTxO (UTxO))
 import Test.Cardano.Ledger.Alonzo.PlutusScripts (defaultCostModel)
 import Test.Cardano.Ledger.Alonzo.Serialisation.Generators ()
-import Test.QuickCheck (Gen, NonEmptyList (NonEmpty), counterexample, listOf, oneof, (===))
+import Test.QuickCheck (Gen, NonEmptyList (NonEmpty), counterexample, listOf, oneof, (===), withMaxSuccess)
 import Test.QuickCheck.Instances ()
 
 maxTxSize :: Int64
@@ -94,30 +91,31 @@ spec =
 
       -- TODO(SN): this requires the abortTx to include a redeemer, for a TxIn,
       -- spending a Head-validated output
-      prop "validates against 'head' script in haskell (unlimited budget)" $ \txIn params@HeadParameters{contestationPeriod, parties} (NonEmpty initials) ->
-        let tx = abortTx (txIn, threadToken, params) initials
-            -- input governed by head script
-            -- datum : Initiafl + head parameters
-            -- redeemer : State
-
-            txOut = TxOut headAddress headValue (SJust headDatumHash)
-            (policyId, _) = first currencyMPSHash (unAssetClass threadToken)
-            headAddress = scriptAddr $ plutusScript $ Head.validatorScript policyId
-            headValue = inject (Coin 0)
-            headDatumHash =
-              hashData @Era . Data $
-                toData $
-                  Head.Initial
-                    (contestationPeriodFromDiffTime contestationPeriod)
-                    (map (partyFromVerKey . vkey) parties)
-
-            utxo = UTxO $ Map.fromList $ (txIn, txOut) : map toTxOut initials
-
-            results = validateTxScriptsUnlimited tx utxo
-         in 1 + length initials == length (rights $ Map.elems results)
-              & counterexample ("Evaluation results: " <> show results)
-              & counterexample ("Tx: " <> show tx)
-              & counterexample ("Input utxo: " <> show utxo)
+      prop "validates against 'head' script in haskell (unlimited budget)" $
+        withMaxSuccess 30 $ \txIn params@HeadParameters{contestationPeriod, parties} (NonEmpty initials) ->
+          let tx = abortTx (txIn, threadToken, params) initials
+              -- input governed by head script
+              -- datum : Initiafl + head parameters
+              -- redeemer : State
+
+              txOut = TxOut headAddress headValue (SJust headDatumHash)
+              (policyId, _) = first currencyMPSHash (unAssetClass threadToken)
+              headAddress = scriptAddr $ plutusScript $ Head.validatorScript policyId
+              headValue = inject (Coin 0)
+              headDatumHash =
+                hashData @Era . Data $
+                  toData $
+                    Head.Initial
+                      (contestationPeriodFromDiffTime contestationPeriod)
+                      (map (partyFromVerKey . vkey) parties)
+
+              utxo = UTxO $ Map.fromList $ (txIn, txOut) : map toTxOut initials
+
+              results = validateTxScriptsUnlimited tx utxo
+           in 1 + length initials == length (rights $ Map.elems results)
+                & counterexample ("Evaluation results: " <> show results)
+                & counterexample ("Tx: " <> show tx)
+                & counterexample ("Input utxo: " <> show utxo)
 
 toTxOut :: (TxIn StandardCrypto, PubKeyHash) -> (TxIn StandardCrypto, TxOut Era)
 toTxOut (txIn, pkh) =
@@ -129,15 +127,11 @@ toTxOut (txIn, pkh) =
     hashData @Era $ Data $ toData $ Initial.datum (policyId, dependencies, pkh)
    where
     (policyId, _) = first currencyMPSHash (unAssetClass threadToken)
-    headScript = plutusScript (Head.validatorScript policyId)
-    commitScript = plutusScript Commit.validatorScript
     dependencies =
-      Initial.Dependencies
-        { Initial.headScript =
-            Plutus.ValidatorHash $ convert $ serialize' $ hashScript @Era headScript
-        , Initial.commitScript =
-            Plutus.ValidatorHash $ convert $ serialize' $ hashScript @Era commitScript
-        }
+        Initial.Dependencies
+          { Initial.headScript = Head.validatorHash policyId
+          , Initial.commitScript = Commit.validatorHash
+          }
 
 isImplemented :: PostChainTx tx -> OnChainHeadState -> Bool
 isImplemented tx st =