From 1475ae1135468e26106c1bc4443b19fadfaf5f39 Mon Sep 17 00:00:00 2001 From: Daniel Firth Date: Tue, 7 Jan 2025 15:43:34 +0000 Subject: [PATCH] Use PlutusScriptSerialised consistently instead of fromPlutusScript --- hydra-cardano-api/hydra-cardano-api.cabal | 1 - hydra-cardano-api/src/Hydra/Cardano/Api.hs | 1 - .../src/Hydra/Cardano/Api/PlutusScript.hs | 14 ---------- .../src/Hydra/Cardano/Api/ReferenceScript.hs | 5 ++-- .../src/Hydra/Cardano/Api/ScriptHash.hs | 2 -- hydra-node/src/Hydra/Chain/Direct/State.hs | 26 +++++++++---------- hydra-node/src/Hydra/Chain/Direct/Tx.hs | 24 ++++++++--------- .../test/Hydra/Chain/Direct/StateSpec.hs | 5 ++-- hydra-plutus/exe/inspect-script/Main.hs | 2 +- hydra-plutus/src/Hydra/Contract.hs | 10 +++---- hydra-plutus/src/Hydra/Contract/HeadTokens.hs | 5 ++-- hydra-plutus/test/Hydra/Plutus/GoldenSpec.hs | 4 +-- hydra-tx/src/Hydra/Tx/Abort.hs | 6 ++--- hydra-tx/src/Hydra/Tx/Close.hs | 2 +- hydra-tx/src/Hydra/Tx/CollectCom.hs | 4 +-- hydra-tx/src/Hydra/Tx/Commit.hs | 2 +- hydra-tx/src/Hydra/Tx/Contest.hs | 2 +- hydra-tx/src/Hydra/Tx/Decrement.hs | 2 +- hydra-tx/src/Hydra/Tx/Deposit.hs | 4 +-- hydra-tx/src/Hydra/Tx/Fanout.hs | 2 +- hydra-tx/src/Hydra/Tx/Increment.hs | 4 +-- hydra-tx/src/Hydra/Tx/Init.hs | 4 +-- hydra-tx/src/Hydra/Tx/Recover.hs | 4 +-- hydra-tx/test/Hydra/Tx/Contract/Abort.hs | 8 +++--- hydra-tx/test/Hydra/Tx/Contract/CollectCom.hs | 4 +-- hydra-tx/testlib/Test/Hydra/Tx/Mutation.hs | 2 +- 26 files changed, 64 insertions(+), 85 deletions(-) delete mode 100644 hydra-cardano-api/src/Hydra/Cardano/Api/PlutusScript.hs diff --git a/hydra-cardano-api/hydra-cardano-api.cabal b/hydra-cardano-api/hydra-cardano-api.cabal index 08f59d1f925..f4130ffcc78 100644 --- a/hydra-cardano-api/hydra-cardano-api.cabal +++ b/hydra-cardano-api/hydra-cardano-api.cabal @@ -51,7 +51,6 @@ library Hydra.Cardano.Api.Hash Hydra.Cardano.Api.Network Hydra.Cardano.Api.NetworkId - Hydra.Cardano.Api.PlutusScript Hydra.Cardano.Api.PolicyId Hydra.Cardano.Api.Prelude Hydra.Cardano.Api.Pretty diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api.hs b/hydra-cardano-api/src/Hydra/Cardano/Api.hs index 090d7442219..032341d5d48 100644 --- a/hydra-cardano-api/src/Hydra/Cardano/Api.hs +++ b/hydra-cardano-api/src/Hydra/Cardano/Api.hs @@ -129,7 +129,6 @@ import Hydra.Cardano.Api.CtxTx as Extras import Hydra.Cardano.Api.ExecutionUnits as Extras import Hydra.Cardano.Api.Hash as Extras import Hydra.Cardano.Api.NetworkId () -import Hydra.Cardano.Api.PlutusScript as Extras import Hydra.Cardano.Api.PolicyId as Extras import Hydra.Cardano.Api.ReferenceScript as Extras import Hydra.Cardano.Api.ScriptData as Extras diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api/PlutusScript.hs b/hydra-cardano-api/src/Hydra/Cardano/Api/PlutusScript.hs deleted file mode 100644 index d58560c4ca9..00000000000 --- a/hydra-cardano-api/src/Hydra/Cardano/Api/PlutusScript.hs +++ /dev/null @@ -1,14 +0,0 @@ -{-# OPTIONS_GHC -Wno-orphans #-} - -module Hydra.Cardano.Api.PlutusScript where - -import Hydra.Cardano.Api.Prelude - -import PlutusLedgerApi.Common qualified as Plutus - --- * Type Conversions - --- | Convert a serialized plutus script into a cardano-api 'PlutusScript'. -fromPlutusScript :: Plutus.SerialisedScript -> PlutusScript lang -fromPlutusScript = - PlutusScriptSerialised diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api/ReferenceScript.hs b/hydra-cardano-api/src/Hydra/Cardano/Api/ReferenceScript.hs index ecea1773f36..5c7876fe1f5 100644 --- a/hydra-cardano-api/src/Hydra/Cardano/Api/ReferenceScript.hs +++ b/hydra-cardano-api/src/Hydra/Cardano/Api/ReferenceScript.hs @@ -2,7 +2,6 @@ module Hydra.Cardano.Api.ReferenceScript where import Hydra.Cardano.Api.Prelude -import Hydra.Cardano.Api.PlutusScript (fromPlutusScript) import PlutusLedgerApi.V3 qualified as Plutus -- | Construct a 'ReferenceScript' from any given Plutus script. @@ -13,7 +12,7 @@ mkScriptRef = ReferenceScript babbageBasedEra . toScriptInAnyLang . PlutusScript PlutusScriptV3 - . fromPlutusScript + . PlutusScriptSerialised -- | Construct a PlutusV3 'ReferenceScript' from any given Plutus script. mkScriptRefV3 :: Plutus.SerialisedScript -> ReferenceScript Era @@ -21,4 +20,4 @@ mkScriptRefV3 = ReferenceScript babbageBasedEra . toScriptInAnyLang . PlutusScript PlutusScriptV3 - . fromPlutusScript + . PlutusScriptSerialised diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api/ScriptHash.hs b/hydra-cardano-api/src/Hydra/Cardano/Api/ScriptHash.hs index 7e70816f22e..bdf51f1aff2 100644 --- a/hydra-cardano-api/src/Hydra/Cardano/Api/ScriptHash.hs +++ b/hydra-cardano-api/src/Hydra/Cardano/Api/ScriptHash.hs @@ -4,8 +4,6 @@ module Hydra.Cardano.Api.ScriptHash where import Hydra.Cardano.Api.Prelude -import Hydra.Cardano.Api.PlutusScript () - -- * Extras -- | Like 'hashScript', but for a 'ScriptInAnyLang'. diff --git a/hydra-node/src/Hydra/Chain/Direct/State.hs b/hydra-node/src/Hydra/Chain/Direct/State.hs index 302de9f1195..d85f81f8220 100644 --- a/hydra-node/src/Hydra/Chain/Direct/State.hs +++ b/hydra-node/src/Hydra/Chain/Direct/State.hs @@ -35,7 +35,6 @@ import Hydra.Cardano.Api ( UTxO, UTxO' (UTxO), chainPointToSlotNo, - fromPlutusScript, fromScriptData, genTxIn, getTxBody, @@ -52,6 +51,7 @@ import Hydra.Cardano.Api ( txOutValue, txSpendingUTxO, pattern ByronAddressInEra, + pattern PlutusScriptSerialised, pattern ShelleyAddressInEra, pattern TxIn, pattern TxOut, @@ -407,11 +407,11 @@ abort ctx seedTxIn spendableUTxO committedUTxO = do commits = UTxO.toMap $ UTxO.filter (isScriptTxOut commitScript) utxoOfThisHead' - commitScript = fromPlutusScript @PlutusScriptV3 commitValidatorScript + commitScript = PlutusScriptSerialised commitValidatorScript - headScript = fromPlutusScript @PlutusScriptV3 Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript - initialScript = fromPlutusScript @PlutusScriptV3 initialValidatorScript + initialScript = PlutusScriptSerialised initialValidatorScript headTokenScript = mkHeadTokenScript seedTxIn @@ -443,9 +443,9 @@ collect ctx headId headParameters utxoToCollect spendableUTxO = do pure $ collectComTx networkId scriptRegistry ownVerificationKey headId headParameters headUTxO commits utxoToCollect where - headScript = fromPlutusScript @PlutusScriptV3 Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript - commitScript = fromPlutusScript @PlutusScriptV3 commitValidatorScript + commitScript = PlutusScriptSerialised commitValidatorScript ChainContext{networkId, ownVerificationKey, scriptRegistry} = ctx @@ -490,8 +490,8 @@ increment ctx spendableUTxO headId headParameters incrementingSnapshot depositTx Left SnapshotIncrementUTxOIsNull | otherwise -> Right $ incrementTx scriptRegistry ownVerificationKey headId headParameters headUTxO sn (UTxO.singleton (depositedIn, depositedOut)) upperValiditySlot sigs where - headScript = fromPlutusScript @PlutusScriptV3 Head.validatorScript - depositScript = fromPlutusScript @PlutusScriptV3 depositValidatorScript + headScript = PlutusScriptSerialised Head.validatorScript + depositScript = PlutusScriptSerialised depositValidatorScript Snapshot{utxoToCommit} = sn @@ -530,7 +530,7 @@ decrement ctx spendableUTxO headId headParameters decrementingSnapshot = do Left DecrementValueNegative Right $ decrementTx scriptRegistry ownVerificationKey headId headParameters headUTxO sn sigs where - headScript = fromPlutusScript @PlutusScriptV3 Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript decommitValue = foldMap txOutValue $ fromMaybe mempty $ utxoToDecommit sn @@ -584,7 +584,7 @@ recover ctx headId depositedTxId spendableUTxO lowerValiditySlot = do then Left InvalidHeadIdInRecover{headId} else Right $ recoverTx depositedTxId deposited lowerValiditySlot where - depositScript = fromPlutusScript @PlutusScriptV3 depositValidatorScript + depositScript = PlutusScriptSerialised depositValidatorScript ChainContext{networkId} = ctx -- | Construct a close transaction spending the head output in given 'UTxO', @@ -627,7 +627,7 @@ close ctx spendableUTxO headId HeadParameters{parties, contestationPeriod} openV where Snapshot{utxoToCommit, utxoToDecommit} = getSnapshot confirmedSnapshot - headScript = fromPlutusScript @PlutusScriptV3 Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript ChainContext{ownVerificationKey, scriptRegistry} = ctx @@ -699,7 +699,7 @@ contest ctx spendableUTxO headId contestationPeriod openVersion contestingSnapsh ChainContext{ownVerificationKey, scriptRegistry} = ctx - headScript = fromPlutusScript @PlutusScriptV3 Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript data FanoutTxError = CannotFindHeadOutputToFanout @@ -738,7 +738,7 @@ fanout ctx spendableUTxO seedTxIn utxo utxoToCommit utxoToDecommit deadlineSlotN ChainContext{scriptRegistry} = ctx - headScript = fromPlutusScript @PlutusScriptV3 Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript checkHeadDatum headUTxO@(_, headOutput) = do headDatum <- diff --git a/hydra-node/src/Hydra/Chain/Direct/Tx.hs b/hydra-node/src/Hydra/Chain/Direct/Tx.hs index b1bdc9c29ed..e33948b735a 100644 --- a/hydra-node/src/Hydra/Chain/Direct/Tx.hs +++ b/hydra-node/src/Hydra/Chain/Direct/Tx.hs @@ -171,7 +171,7 @@ observeInitTx tx = do guard $ isScriptTxOut headScript out (ix,out,) <$> (fromScriptData =<< txOutScriptData out) - headScript = fromPlutusScript @PlutusScriptV3 Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript indexedOutputs = zip [0 ..] (txOuts' tx) @@ -184,7 +184,7 @@ observeInitTx tx = do isInitial = isScriptTxOut initialScript - initialScript = fromPlutusScript @PlutusScriptV3 initialValidatorScript + initialScript = PlutusScriptSerialised initialValidatorScript mintedTokenNames pid = [ assetName @@ -262,11 +262,11 @@ observeCommitTx networkId utxo tx = do initialAddress = mkScriptAddress @PlutusScriptV3 networkId initialScript - initialScript = fromPlutusScript @PlutusScriptV3 initialValidatorScript + initialScript = PlutusScriptSerialised initialValidatorScript commitAddress = mkScriptAddress networkId commitScript - commitScript = fromPlutusScript @PlutusScriptV3 commitValidatorScript + commitScript = PlutusScriptSerialised commitValidatorScript data CollectComObservation = CollectComObservation { threadOutput :: OpenThreadOutput @@ -307,7 +307,7 @@ observeCollectComTx utxo tx = do } _ -> Nothing where - headScript = fromPlutusScript Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript decodeUtxoHash datum = case fromScriptData datum of Just (Head.Open Head.OpenDatum{utxoHash}) -> Just $ fromBuiltin utxoHash @@ -350,8 +350,8 @@ observeIncrementTx utxo tx = do _ -> Nothing _ -> Nothing where - depositScript = fromPlutusScript depositValidatorScript - headScript = fromPlutusScript Head.validatorScript + depositScript = PlutusScriptSerialised depositValidatorScript + headScript = PlutusScriptSerialised Head.validatorScript data DecrementObservation = DecrementObservation { headId :: HeadId @@ -389,7 +389,7 @@ observeDecrementTx utxo tx = do _ -> Nothing _ -> Nothing where - headScript = fromPlutusScript Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript data CloseObservation = CloseObservation { threadOutput :: ClosedThreadOutput @@ -434,7 +434,7 @@ observeCloseTx utxo tx = do } _ -> Nothing where - headScript = fromPlutusScript Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript data ContestObservation = ContestObservation { contestedThreadOutput :: (TxIn, TxOut CtxUTxO) @@ -474,7 +474,7 @@ observeContestTx utxo tx = do } _ -> Nothing where - headScript = fromPlutusScript Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript decodeDatum headDatum = case fromScriptData headDatum of @@ -500,7 +500,7 @@ observeFanoutTx utxo tx = do Head.Fanout{} -> pure FanoutObservation{headId} _ -> Nothing where - headScript = fromPlutusScript Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript newtype AbortObservation = AbortObservation {headId :: HeadId} deriving stock (Eq, Show, Generic) @@ -519,7 +519,7 @@ observeAbortTx utxo tx = do Head.Abort -> pure $ AbortObservation headId _ -> Nothing where - headScript = fromPlutusScript Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript -- * Cardano specific identifiers diff --git a/hydra-node/test/Hydra/Chain/Direct/StateSpec.hs b/hydra-node/test/Hydra/Chain/Direct/StateSpec.hs index 607cebd5aeb..ec6ee76b522 100644 --- a/hydra-node/test/Hydra/Chain/Direct/StateSpec.hs +++ b/hydra-node/test/Hydra/Chain/Direct/StateSpec.hs @@ -19,7 +19,6 @@ import Hydra.Cardano.Api ( TxOut, UTxO, findRedeemerSpending, - fromPlutusScript, genTxIn, hashScript, isScriptTxOut, @@ -427,11 +426,11 @@ genCommitTxMutation utxo tx = fromMaybe (error "not found redeemer") $ findRedeemerSpending @Initial.RedeemerType tx initialTxIn - initialScript = fromPlutusScript @PlutusScriptV3 initialValidatorScript + initialScript = PlutusScriptSerialised initialValidatorScript fakeScriptAddress = mkScriptAddress @PlutusScriptV3 testNetworkId fakeScript - fakeScript = fromPlutusScript dummyValidatorScript + fakeScript = PlutusScriptSerialised dummyValidatorScript genAdaOnlyUTxOOnMainnetWithAmountBiggerThanOutLimit :: Gen UTxO genAdaOnlyUTxOOnMainnetWithAmountBiggerThanOutLimit = do diff --git a/hydra-plutus/exe/inspect-script/Main.hs b/hydra-plutus/exe/inspect-script/Main.hs index 56dbc710f30..8cb9abaf8f8 100644 --- a/hydra-plutus/exe/inspect-script/Main.hs +++ b/hydra-plutus/exe/inspect-script/Main.hs @@ -55,7 +55,7 @@ main = do serialised = Aeson.encode $ serialiseToTextEnvelope (Just $ fromString itemName) $ - fromPlutusScript @PlutusScriptV3 item + PlutusScriptSerialised item BL.writeFile itemFile serialised putTextLn $ " " <> pack itemFile <> ": " <> sizeInKb (serialise item) diff --git a/hydra-plutus/src/Hydra/Contract.hs b/hydra-plutus/src/Hydra/Contract.hs index 85333b23fcd..041646a631a 100644 --- a/hydra-plutus/src/Hydra/Contract.hs +++ b/hydra-plutus/src/Hydra/Contract.hs @@ -9,9 +9,9 @@ import Data.ByteString.Lazy qualified as BSL import Hydra.Cardano.Api ( PlutusScriptVersion (PlutusScriptV3), ScriptHash, - fromPlutusScript, hashScript, pattern PlutusScript, + pattern PlutusScriptSerialised, ) import Hydra.Cardano.Api.Prelude qualified as Api import Hydra.Contract.Head qualified as Head @@ -44,18 +44,18 @@ scriptInfo = ScriptInfo { mintingScriptHash = plutusScriptHash $ HeadTokens.mintingPolicyScript defaultOutRef , mintingScriptSize = scriptSize $ HeadTokens.mintingPolicyScript defaultOutRef - , initialScriptHash = hashScript $ Api.PlutusScript PlutusScriptV3 $ fromPlutusScript initialValidatorScript + , initialScriptHash = hashScript $ Api.PlutusScript PlutusScriptV3 $ PlutusScriptSerialised initialValidatorScript , initialScriptSize = scriptSize initialValidatorScript - , commitScriptHash = hashScript $ Api.PlutusScript PlutusScriptV3 $ fromPlutusScript commitValidatorScript + , commitScriptHash = hashScript $ Api.PlutusScript PlutusScriptV3 $ PlutusScriptSerialised commitValidatorScript , commitScriptSize = scriptSize commitValidatorScript , headScriptHash = plutusScriptHash Head.validatorScript , headScriptSize = scriptSize Head.validatorScript - , depositScriptHash = hashScript $ Api.PlutusScript PlutusScriptV3 $ fromPlutusScript depositValidatorScript + , depositScriptHash = hashScript $ Api.PlutusScript PlutusScriptV3 $ PlutusScriptSerialised depositValidatorScript , depositScriptSize = scriptSize depositValidatorScript } where plutusScriptHash = - hashScript . PlutusScript . fromPlutusScript + hashScript . PlutusScript . PlutusScriptSerialised scriptSize = BSL.length . serialise diff --git a/hydra-plutus/src/Hydra/Contract/HeadTokens.hs b/hydra-plutus/src/Hydra/Contract/HeadTokens.hs index ab31cf0c1a3..b4a8484ce4e 100644 --- a/hydra-plutus/src/Hydra/Contract/HeadTokens.hs +++ b/hydra-plutus/src/Hydra/Contract/HeadTokens.hs @@ -16,13 +16,12 @@ module Hydra.Contract.HeadTokens where import PlutusTx.Prelude import Hydra.Cardano.Api ( - PlutusScriptV3, PolicyId, TxIn, - fromPlutusScript, scriptPolicyId, toPlutusTxOutRef, pattern PlutusScript, + pattern PlutusScriptSerialised, ) import Hydra.Cardano.Api qualified as Api @@ -206,4 +205,4 @@ headPolicyId = -- | Get the applied head minting policy script given a seed 'TxIn'. mkHeadTokenScript :: TxIn -> Api.PlutusScript mkHeadTokenScript = - fromPlutusScript @PlutusScriptV3 . mintingPolicyScript . toPlutusTxOutRef + PlutusScriptSerialised . mintingPolicyScript . toPlutusTxOutRef diff --git a/hydra-plutus/test/Hydra/Plutus/GoldenSpec.hs b/hydra-plutus/test/Hydra/Plutus/GoldenSpec.hs index 92cf4901671..00385640f3b 100644 --- a/hydra-plutus/test/Hydra/Plutus/GoldenSpec.hs +++ b/hydra-plutus/test/Hydra/Plutus/GoldenSpec.hs @@ -17,11 +17,11 @@ import Hydra.Cardano.Api ( AsType (AsPlutusScriptV3, AsScript), File (..), Script, - fromPlutusScript, hashScript, readFileTextEnvelope, writeFileTextEnvelope, pattern PlutusScript, + pattern PlutusScriptSerialised, ) import Hydra.Contract.Head qualified as Head import Hydra.Contract.HeadTokens qualified as HeadTokens @@ -49,7 +49,7 @@ spec = do goldenScript :: String -> Plutus.SerialisedScript -> Golden Script goldenScript name plutusScript = Golden - { output = PlutusScript $ fromPlutusScript plutusScript + { output = PlutusScript $ PlutusScriptSerialised plutusScript , encodePretty = show . hashScript , writeToFile , readFromFile diff --git a/hydra-tx/src/Hydra/Tx/Abort.hs b/hydra-tx/src/Hydra/Tx/Abort.hs index 7b86e39ecb2..ce058fdc360 100644 --- a/hydra-tx/src/Hydra/Tx/Abort.hs +++ b/hydra-tx/src/Hydra/Tx/Abort.hs @@ -63,7 +63,7 @@ abortTx committedUTxO scriptRegistry vk (headInput, initialHeadOutput) headToken headScriptRef = fst (headReference scriptRegistry) headScript = - fromPlutusScript @PlutusScriptV3 Head.validatorScript + PlutusScriptSerialised Head.validatorScript headRedeemer = toScriptData Head.Abort @@ -87,7 +87,7 @@ abortTx committedUTxO scriptRegistry vk (headInput, initialHeadOutput) headToken initialScriptRef = fst (initialReference scriptRegistry) initialScript = - fromPlutusScript @PlutusScriptV3 initialValidatorScript + PlutusScriptSerialised initialValidatorScript initialRedeemer = toScriptData $ Initial.redeemer Initial.ViaAbort @@ -99,7 +99,7 @@ abortTx committedUTxO scriptRegistry vk (headInput, initialHeadOutput) headToken commitScriptRef = fst (commitReference scriptRegistry) commitScript = - fromPlutusScript @PlutusScriptV3 commitValidatorScript + PlutusScriptSerialised commitValidatorScript commitRedeemer = toScriptData (Commit.redeemer Commit.ViaAbort) diff --git a/hydra-tx/src/Hydra/Tx/Close.hs b/hydra-tx/src/Hydra/Tx/Close.hs index b334b6cdbf4..6880312bb91 100644 --- a/hydra-tx/src/Hydra/Tx/Close.hs +++ b/hydra-tx/src/Hydra/Tx/Close.hs @@ -85,7 +85,7 @@ closeTx scriptRegistry vk headId openVersion confirmedSnapshot startSlotNo (endS fst (headReference scriptRegistry) headScript = - fromPlutusScript @PlutusScriptV3 Head.validatorScript + PlutusScriptSerialised Head.validatorScript headRedeemer = toScriptData $ Head.Close closeRedeemer diff --git a/hydra-tx/src/Hydra/Tx/CollectCom.hs b/hydra-tx/src/Hydra/Tx/CollectCom.hs index 0776d8b80ee..22ca9d3ce45 100644 --- a/hydra-tx/src/Hydra/Tx/CollectCom.hs +++ b/hydra-tx/src/Hydra/Tx/CollectCom.hs @@ -59,7 +59,7 @@ collectComTx networkId scriptRegistry vk headId headParameters (headInput, initi BuildTxWith $ ScriptWitness scriptWitnessInCtx $ mkScriptReference headScriptRef headScript InlineScriptDatum headRedeemer - headScript = fromPlutusScript @PlutusScriptV3 Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript headScriptRef = fst (headReference scriptRegistry) headRedeemer = toScriptData Head.CollectCom headOutput = @@ -91,6 +91,6 @@ collectComTx networkId scriptRegistry vk headId headParameters (headInput, initi commitValue = mconcat $ txOutValue <$> Map.elems commits commitScript = - fromPlutusScript @PlutusScriptV3 commitValidatorScript + PlutusScriptSerialised commitValidatorScript commitRedeemer = toScriptData $ Commit.redeemer Commit.ViaCollectCom diff --git a/hydra-tx/src/Hydra/Tx/Commit.hs b/hydra-tx/src/Hydra/Tx/Commit.hs index bb6081df693..39bbf348ced 100644 --- a/hydra-tx/src/Hydra/Tx/Commit.hs +++ b/hydra-tx/src/Hydra/Tx/Commit.hs @@ -130,7 +130,7 @@ commitTx networkId scriptRegistry headId party commitBlueprintTx (initialInput, TxOut commitAddress commitValue commitDatum ReferenceScriptNone commitScript = - fromPlutusScript @PlutusScriptV3 commitValidatorScript + PlutusScriptSerialised commitValidatorScript commitAddress = mkScriptAddress networkId commitScript diff --git a/hydra-tx/src/Hydra/Tx/Contest.hs b/hydra-tx/src/Hydra/Tx/Contest.hs index 1c36c5e6f46..aac5ea38a18 100644 --- a/hydra-tx/src/Hydra/Tx/Contest.hs +++ b/hydra-tx/src/Hydra/Tx/Contest.hs @@ -83,7 +83,7 @@ contestTx scriptRegistry vk headId contestationPeriod openVersion snapshot sig ( fst (headReference scriptRegistry) headScript = - fromPlutusScript @PlutusScriptV3 Head.validatorScript + PlutusScriptSerialised Head.validatorScript contestRedeemer = case incrementalAction of diff --git a/hydra-tx/src/Hydra/Tx/Decrement.hs b/hydra-tx/src/Hydra/Tx/Decrement.hs index ea6d973eb50..0f00c88c898 100644 --- a/hydra-tx/src/Hydra/Tx/Decrement.hs +++ b/hydra-tx/src/Hydra/Tx/Decrement.hs @@ -68,7 +68,7 @@ decrementTx scriptRegistry vk headId headParameters (headInput, headOutput) snap decommitOutputs = maybe [] toList utxoToDecommit - headScript = fromPlutusScript @PlutusScriptV3 Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript headScriptRef = fst (headReference scriptRegistry) diff --git a/hydra-tx/src/Hydra/Tx/Deposit.hs b/hydra-tx/src/Hydra/Tx/Deposit.hs index 88913b65e0a..f1c494a54c9 100644 --- a/hydra-tx/src/Hydra/Tx/Deposit.hs +++ b/hydra-tx/src/Hydra/Tx/Deposit.hs @@ -46,7 +46,7 @@ depositTx networkId headId commitBlueprintTx deadline = depositValue = foldMap txOutValue depositUTxO - depositScript = fromPlutusScript @PlutusScriptV3 depositValidatorScript + depositScript = PlutusScriptSerialised depositValidatorScript deposits = mapMaybe Commit.serializeCommit $ UTxO.pairs depositUTxO @@ -62,7 +62,7 @@ depositTx networkId headId commitBlueprintTx deadline = ReferenceScriptNone depositAddress :: NetworkId -> AddressInEra -depositAddress networkId = mkScriptAddress @PlutusScriptV3 networkId (fromPlutusScript @PlutusScriptV3 depositValidatorScript) +depositAddress networkId = mkScriptAddress @PlutusScriptV3 networkId (PlutusScriptSerialised depositValidatorScript) -- * Observation diff --git a/hydra-tx/src/Hydra/Tx/Fanout.hs b/hydra-tx/src/Hydra/Tx/Fanout.hs index 5158c1f95e4..98c96b074a1 100644 --- a/hydra-tx/src/Hydra/Tx/Fanout.hs +++ b/hydra-tx/src/Hydra/Tx/Fanout.hs @@ -49,7 +49,7 @@ fanoutTx scriptRegistry utxo utxoToCommit utxoToDecommit (headInput, headOutput) headScriptRef = fst (headReference scriptRegistry) headScript = - fromPlutusScript @PlutusScriptV3 Head.validatorScript + PlutusScriptSerialised Head.validatorScript headRedeemer = toScriptData $ Head.Fanout diff --git a/hydra-tx/src/Hydra/Tx/Increment.hs b/hydra-tx/src/Hydra/Tx/Increment.hs index 00395bd8bc5..f4c26c09213 100644 --- a/hydra-tx/src/Hydra/Tx/Increment.hs +++ b/hydra-tx/src/Hydra/Tx/Increment.hs @@ -69,7 +69,7 @@ incrementTx scriptRegistry vk headId headParameters (headInput, headOutput) snap & modifyTxOutDatum (const headDatumAfter) & modifyTxOutValue (<> depositedValue) - headScript = fromPlutusScript @PlutusScriptV3 Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript headScriptRef = fst (headReference scriptRegistry) @@ -93,7 +93,7 @@ incrementTx scriptRegistry vk headId headParameters (headInput, headOutput) snap depositedValue = foldMap (txOutValue . snd) $ UTxO.pairs (fromMaybe mempty utxoToCommit) - depositScript = fromPlutusScript @PlutusScriptV3 depositValidatorScript + depositScript = PlutusScriptSerialised depositValidatorScript -- NOTE: we expect always a single output from a deposit tx (depositIn, _) = List.head $ UTxO.pairs depositScriptUTxO diff --git a/hydra-tx/src/Hydra/Tx/Init.hs b/hydra-tx/src/Hydra/Tx/Init.hs index e457fa4b166..6bd90a6fdcf 100644 --- a/hydra-tx/src/Hydra/Tx/Init.hs +++ b/hydra-tx/src/Hydra/Tx/Init.hs @@ -48,7 +48,7 @@ mkHeadOutput networkId tokenPolicyId datum = datum ReferenceScriptNone where - headScript = fromPlutusScript Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript mkHeadOutputInitial :: NetworkId -> TxIn -> HeadParameters -> TxOut CtxTx mkHeadOutputInitial networkId seedTxIn HeadParameters{contestationPeriod, parties} = @@ -74,6 +74,6 @@ mkInitialOutput networkId seedTxIn participant = initialAddress = mkScriptAddress @PlutusScriptV3 networkId initialScript initialScript = - fromPlutusScript @PlutusScriptV3 initialValidatorScript + PlutusScriptSerialised initialValidatorScript initialDatum = mkTxOutDatumInline $ Initial.datum (toPlutusCurrencySymbol tokenPolicyId) diff --git a/hydra-tx/src/Hydra/Tx/Recover.hs b/hydra-tx/src/Hydra/Tx/Recover.hs index a18f03c6daa..e406852e95c 100644 --- a/hydra-tx/src/Hydra/Tx/Recover.hs +++ b/hydra-tx/src/Hydra/Tx/Recover.hs @@ -42,7 +42,7 @@ recoverTx depositTxId deposited lowerBoundSlot = depositOutputs = toTxContext <$> toList deposited - depositScript = fromPlutusScript @PlutusScriptV3 depositValidatorScript + depositScript = PlutusScriptSerialised depositValidatorScript data RecoverObservation = RecoverObservation { headId :: HeadId @@ -77,4 +77,4 @@ observeRecoverTx networkId utxo tx = do ) else Nothing where - depositScript = fromPlutusScript depositValidatorScript + depositScript = PlutusScriptSerialised depositValidatorScript diff --git a/hydra-tx/test/Hydra/Tx/Contract/Abort.hs b/hydra-tx/test/Hydra/Tx/Contract/Abort.hs index adaa51af71f..4d7bb77a274 100644 --- a/hydra-tx/test/Hydra/Tx/Contract/Abort.hs +++ b/hydra-tx/test/Hydra/Tx/Contract/Abort.hs @@ -122,7 +122,7 @@ propHasInitial (_, utxo) = & counterexample ("UTxO: " <> decodeUtf8 (encodePretty utxo)) & counterexample ("Looking for Initial Script: " <> show addr) where - addr = mkScriptAddress testNetworkId (fromPlutusScript @PlutusScriptV3 initialValidatorScript) + addr = mkScriptAddress testNetworkId (PlutusScriptSerialised initialValidatorScript) paysToInitialScript txOut = txOutAddress txOut == addr @@ -132,7 +132,7 @@ propHasCommit (_, utxo) = & counterexample ("UTxO: " <> decodeUtf8 (encodePretty utxo)) & counterexample ("Looking for Commit Script: " <> show addr) where - addr = mkScriptAddress testNetworkId (fromPlutusScript @PlutusScriptV3 commitValidatorScript) + addr = mkScriptAddress testNetworkId (PlutusScriptSerialised commitValidatorScript) paysToCommitScript txOut = txOutAddress txOut == addr @@ -292,7 +292,7 @@ genAbortableOutputs parties = (mkTxOutDatumInline initialDatum) ReferenceScriptNone - initialScript = fromPlutusScript @PlutusScriptV3 initialValidatorScript + initialScript = PlutusScriptSerialised initialValidatorScript initialDatum = Initial.datum (toPlutusCurrencySymbol testPolicyId) @@ -332,7 +332,7 @@ generateCommitUTxOs parties = do ] ] - commitScript = fromPlutusScript @PlutusScriptV3 commitValidatorScript + commitScript = PlutusScriptSerialised commitValidatorScript commitDatum = mkCommitDatum party utxo (toPlutusCurrencySymbol testPolicyId) diff --git a/hydra-tx/test/Hydra/Tx/Contract/CollectCom.hs b/hydra-tx/test/Hydra/Tx/Contract/CollectCom.hs index 56663dfa518..93bec1bd1ea 100644 --- a/hydra-tx/test/Hydra/Tx/Contract/CollectCom.hs +++ b/hydra-tx/test/Hydra/Tx/Contract/CollectCom.hs @@ -173,7 +173,7 @@ healthyCommitOutput participant party committed = txIn = genTxIn `genForParty` party commitScript = - fromPlutusScript @PlutusScriptV3 commitValidatorScript + PlutusScriptSerialised commitValidatorScript commitAddress = mkScriptAddress testNetworkId commitScript commitValue = @@ -253,7 +253,7 @@ genCollectComMutation (tx, _utxo) = txIn (toCtxUTxOTxOut $ mkInitialOutput testNetworkId testSeedInput participant) (Just . toScriptData . Initial.redeemer $ Initial.ViaCommit [toPlutusTxOutRef txIn]) - , AddScript $ fromPlutusScript initialValidatorScript + , AddScript $ PlutusScriptSerialised initialValidatorScript ] , SomeMutation (pure $ toErrorCode MintingOrBurningIsForbidden) MutateTokenMintingOrBurning <$> (changeMintedTokens tx =<< genMintedOrBurnedValue) diff --git a/hydra-tx/testlib/Test/Hydra/Tx/Mutation.hs b/hydra-tx/testlib/Test/Hydra/Tx/Mutation.hs index 562c7ee6daa..d934d0a6f0f 100644 --- a/hydra-tx/testlib/Test/Hydra/Tx/Mutation.hs +++ b/hydra-tx/testlib/Test/Hydra/Tx/Mutation.hs @@ -515,7 +515,7 @@ isHeadOutput :: TxOut CtxUTxO -> Bool isHeadOutput TxOut{txOutAddress = addr} = addr == headAddress where headAddress = mkScriptAddress @PlutusScriptV3 Fixture.testNetworkId headScript - headScript = fromPlutusScript Head.validatorScript + headScript = PlutusScriptSerialised Head.validatorScript -- | Adds given 'Datum' and corresponding hash to the transaction's scripts. -- TODO: As we are creating the `TxOutDatum` from a known datum, passing a `TxOutDatum` is