Merge branch 'master' into vrom911/1911-handle-clientInput-failures-http-api

Author: vrom911

hydra-chain-observer/src/Hydra/ChainObserver.hs

@@ -21,7 +21,7 @@ main :: IO ()
 main = do
   Options{backend, startChainFrom, explorerBaseURI} <- execParser hydraChainObserverOptions
   withTracer (Verbose "hydra-chain-observer") $ \tracer -> do
-    traceWith tracer KnownScripts{scriptInfo = Contract.scriptInfo}
+    traceWith tracer KnownScripts{hydraScriptCatalogue = Contract.hydraScriptCatalogue}
     NodeClient{follow, networkId} <-
       case backend of
         Direct{networkId, nodeSocket} -> do

hydra-chain-observer/src/Hydra/ChainObserver/NodeClient.hs

@@ -13,7 +13,7 @@ import Hydra.Cardano.Api (
   UTxO,
  )
 import Hydra.Cardano.Api.Prelude (TxId)
-import Hydra.Contract (ScriptInfo)
+import Hydra.Contract (HydraScriptCatalogue)
 import Hydra.Ledger.Cardano (adjustUTxO)
 import Hydra.Tx.HeadId (HeadId (..))
 import Hydra.Tx.Observe (
@@ -54,7 +54,7 @@ data NodeClient m = NodeClient
 
 type ChainObserverLog :: Type
 data ChainObserverLog
-  = KnownScripts {scriptInfo :: ScriptInfo}
+  = KnownScripts {hydraScriptCatalogue :: HydraScriptCatalogue}
   | ConnectingToNode {nodeSocket :: SocketPath, networkId :: NetworkId}
   | ConnectingToExternalNode {networkId :: NetworkId}
   | StartObservingFrom {chainPoint :: ChainPoint}

hydra-node/bench/tx-cost/Main.hs

@@ -3,7 +3,7 @@ import Hydra.Prelude hiding (catch)
 import Data.ByteString (hPut)
 import Data.Fixed (Centi)
 import Hydra.Cardano.Api (Coin (..), serialiseToRawBytesHexText)
-import Hydra.Contract (ScriptInfo (..), scriptInfo)
+import Hydra.Contract (HydraScriptCatalogue (..), hydraScriptCatalogue)
 import Hydra.Ledger.Cardano.Evaluate (maxCpu, maxMem, maxTxSize)
 import Hydra.Plutus.Orphans ()
 import Options.Applicative (
@@ -165,7 +165,7 @@ scriptSizes =
   , ""
   ]
  where
-  ScriptInfo
+  HydraScriptCatalogue
     { mintingScriptHash
     , mintingScriptSize
     , initialScriptHash
@@ -176,7 +176,7 @@ scriptSizes =
     , headScriptSize
     , depositScriptHash
     , depositScriptSize
-    } = scriptInfo
+    } = hydraScriptCatalogue
 
 genFromSeed :: Gen a -> Int -> a
 genFromSeed (MkGen g) seed = g (mkQCGen seed) 30

hydra-node/src/Hydra/Options.hs

@@ -881,7 +881,7 @@ hydraNodeCommand =
   info
     ( commandParser
         <**> versionInfo
-        <**> scriptInfo
+        <**> hydraScriptCatalogue
         <**> helper
     )
     ( fullDesc
@@ -895,10 +895,10 @@ hydraNodeCommand =
       (showVersion hydraNodeVersion)
       (long "version" <> help "Show version")
 
-  scriptInfo :: Parser (a -> a)
-  scriptInfo =
+  hydraScriptCatalogue :: Parser (a -> a)
+  hydraScriptCatalogue =
     infoOption
-      (decodeUtf8 $ encodePretty Contract.scriptInfo)
+      (decodeUtf8 $ encodePretty Contract.hydraScriptCatalogue)
       (long "script-info" <> help "Dump script info as JSON")
 
 defaultContestationPeriod :: ContestationPeriod

hydra-plutus/exe/inspect-script/Main.hs

@@ -7,16 +7,16 @@ import Data.Aeson qualified as Aeson
 import Data.ByteString.Lazy qualified as BL
 import Data.Text (pack)
 import Hydra.Cardano.Api.Prelude (unsafeHashFromBytes)
-import Hydra.Contract (scriptInfo)
+import Hydra.Contract (hydraScriptCatalogue)
 import Hydra.Contract.HeadState as Head
 import Hydra.Contract.HeadTokens qualified as HeadTokens
 import PlutusLedgerApi.V3 (Data, toData)
 
 -- | Serialise Hydra scripts to files for submission through cardano-cli.
 main :: IO ()
 main = do
-  putTextLn "Script info:"
-  putLBSLn $ encodePretty scriptInfo
+  putTextLn "Hydra script catalogue:"
+  putLBSLn $ encodePretty hydraScriptCatalogue
 
   putTextLn "Serialise datums:"
   writeData datums

hydra-plutus/src/Hydra/Contract.hs

@@ -16,7 +16,7 @@ import Hydra.Plutus (commitValidatorScript, depositValidatorScript, initialValid
 import PlutusLedgerApi.V3 (TxId (..), TxOutRef (..), toBuiltin)
 
 -- | Information about relevant Hydra scripts.
-data ScriptInfo = ScriptInfo
+data HydraScriptCatalogue = HydraScriptCatalogue
   { mintingScriptHash :: ScriptHash
   -- ^ Hash of the μHead minting script given some default parameters.
   , mintingScriptSize :: Int
@@ -33,11 +33,11 @@ data ScriptInfo = ScriptInfo
   deriving stock (Eq, Show, Generic)
   deriving anyclass (ToJSON)
 
--- | Gather 'ScriptInfo' from the current Hydra scripts. This is useful to
+-- | Gather 'HydraScriptCatalogue' from the current Hydra scripts. This is useful to
 -- determine changes in between version of 'hydra-plutus'.
-scriptInfo :: ScriptInfo
-scriptInfo =
-  ScriptInfo
+hydraScriptCatalogue :: HydraScriptCatalogue
+hydraScriptCatalogue =
+  HydraScriptCatalogue
     { mintingScriptHash = scriptHash $ HeadTokens.mintingPolicyScript defaultOutRef
     , mintingScriptSize = scriptSize $ HeadTokens.mintingPolicyScript defaultOutRef
     , initialScriptHash = scriptHash initialValidatorScript

hydra-tx/src/Hydra/Tx/ScriptRegistry.hs

@@ -17,7 +17,7 @@ import Hydra.Cardano.Api (
   pattern ReferenceScript,
   pattern ReferenceScriptNone,
  )
-import Hydra.Contract (ScriptInfo (..), scriptInfo)
+import Hydra.Contract (HydraScriptCatalogue (..), hydraScriptCatalogue)
 
 -- | Hydra scripts published as reference scripts at these UTxO.
 data ScriptRegistry = ScriptRegistry
@@ -67,11 +67,11 @@ newScriptRegistry =
       Nothing -> Left $ MissingScript name sh (Map.keysSet m)
       Just s -> Right s
 
-  ScriptInfo
+  HydraScriptCatalogue
     { initialScriptHash
     , commitScriptHash
     , headScriptHash
-    } = scriptInfo
+    } = hydraScriptCatalogue
 
 -- | Get the UTxO that corresponds to a script registry.
 --