Fix invocation of cardano-cli and pin-point the root cause

cardano-scaling · Jan 3, 2024 · 6a2fb64 · 6a2fb64
1 parent 4a69ba4
commit 6a2fb64
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/hydra-cluster/src/CardanoNode.hs b/hydra-cluster/src/CardanoNode.hs
@@ -16,6 +16,7 @@ import Hydra.Cardano.Api (
   AsType (AsPaymentKey),
   File (..),
   NetworkId,
+  NetworkMagic (..),
   PaymentKey,
   SigningKey,
   SocketPath,
@@ -441,7 +442,7 @@ cliQueryProtocolParameters nodeSocket networkId = do
       ]
         <> case networkId of
           Api.Mainnet -> ["--mainnet"]
-          Api.Testnet magic -> ["--testnet-magic", show magic]
+          Api.Testnet (NetworkMagic magic) -> ["--testnet-magic", show magic]
         <> [ "--out-file"
            , "/dev/stdout"
            ]

diff --git a/hydra-cluster/src/HydraNode.hs b/hydra-cluster/src/HydraNode.hs
@@ -310,7 +310,7 @@ withHydraNode' chainConfig workDir hydraNodeId hydraSKey hydraVKeys allNodeIds p
   withSystemTempDirectory "hydra-node" $ \dir -> do
     let cardanoLedgerProtocolParametersFile = dir </> "protocol-parameters.json"
     case chainConfig of
-      Offline _ -> undefined
+      Offline _ -> undefined -- TODO: should write default ProtocolParameters to cardanoLedgerProtocolParametersFile
       Direct DirectChainConfig{nodeSocket, networkId} -> do
         -- NOTE: This implicitly tests of cardano-cli with hydra-node
         protocolParameters <- cliQueryProtocolParameters nodeSocket networkId

diff --git a/hydra-node/src/Hydra/Ledger/Cardano/Configuration.hs b/hydra-node/src/Hydra/Ledger/Cardano/Configuration.hs
@@ -80,6 +80,8 @@ newGlobals genesisParameters = do
 
 -- * LedgerEnv
 
+-- | Decode protocol parameters using the 'ProtocolParameters' instance as this
+-- is used by cardano-cli and matches the schema. TODO: define the schema
 pparamsFromJson :: Json.Value -> Json.Parser (PParams LedgerEra)
 pparamsFromJson = parseJSON