Bump hydra-node to v1.2.0; Add Blockfrost query layer option

errfrom · errfrom · commit c0a92e3f80af · 2025-12-01T16:44:50.000+01:00
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ of Hydra-based applications.
 | hydra-sdk   | hydra-node   | cardano-node |
 | ----------- | ------------ | ------------ |
 | **`1.0.0`** | **`0.19.0`** | **`10.1.2`** |
-| **`2.0.0`** | **`1.1.0`**  | **`10.5.3`** |
+| **`2.0.0`** | **`1.2.0`**  | **`10.5.3`** |
 
 
 ## Preliminaries
diff --git a/example/minimal/docker/cluster/config-a.json b/example/minimal/docker/cluster/config-a.json
@@ -7,16 +7,19 @@
     "persistDir": "hydra-persist",
     "hydraSigningKey": "keys/hydra-a.sk",
     "cardanoSigningKey": "keys/cardano-a.sk",
-    "network": {
-      "tag": "Testnet",
-      "magic": 1
+    "queryLayer": {
+      "tag": "CardanoNode",
+      "nodeSocket": "node-ipc/node.socket",
+      "network": {
+        "tag": "Testnet",
+        "magic": 1
+      }
     },
-    "nodeSocket": "node-ipc/node.socket",
     "pparams": "protocol-parameters.json",
     "hydraScripts": [
-      "152cfeb309be439f3e8a8940bd9e46ba634e469702370789b03bb53219fa42f9",
-      "d69468c6ea65aee0b1595d25fb8d16b5d32feb20749936a8fd82b112032f4d5f",
-      "828ff89d3f65ddb600ab8091a4ee27661277029ae5ec0c39457b271db9766c6f"
+      "ba97aaa648271c75604e66e3a4e00da49bdcaca9ba74d9031ab4c08f736e1c12",
+      "ff046eba10b9b0f90683bf5becbd6afa496059fc1cf610e798cfe778d85b70ba",
+      "4bb8c01290599cc9de195b586ee1eb73422b00198126f51f52b00a8e35da9ce3"
     ],
     "contestPeriodSec": 60,
     "peers": [
@@ -27,7 +30,7 @@
       }
     ]
   },
-  "blockfrostApiKey": "preprodq4qb2xZcZk6LUFk36DmEcxIFRM8DRwkV",
+  "blockfrostApiKeyFile": "blockfrost.txt",
   "logLevel": "trace",
   "ctlLogLevel": "warn",
   "commitOutRef": null
diff --git a/example/minimal/docker/cluster/config-b.json b/example/minimal/docker/cluster/config-b.json
@@ -7,16 +7,19 @@
     "persistDir": "hydra-persist",
     "hydraSigningKey": "keys/hydra-b.sk",
     "cardanoSigningKey": "keys/cardano-b.sk",
-    "network": {
-      "tag": "Testnet",
-      "magic": 1
+    "queryLayer": {
+      "tag": "CardanoNode",
+      "nodeSocket": "node-ipc/node.socket",
+      "network": {
+        "tag": "Testnet",
+        "magic": 1
+      }
     },
-    "nodeSocket": "node-ipc/node.socket",
     "pparams": "protocol-parameters.json",
     "hydraScripts": [
-      "152cfeb309be439f3e8a8940bd9e46ba634e469702370789b03bb53219fa42f9",
-      "d69468c6ea65aee0b1595d25fb8d16b5d32feb20749936a8fd82b112032f4d5f",
-      "828ff89d3f65ddb600ab8091a4ee27661277029ae5ec0c39457b271db9766c6f"
+      "ba97aaa648271c75604e66e3a4e00da49bdcaca9ba74d9031ab4c08f736e1c12",
+      "ff046eba10b9b0f90683bf5becbd6afa496059fc1cf610e798cfe778d85b70ba",
+      "4bb8c01290599cc9de195b586ee1eb73422b00198126f51f52b00a8e35da9ce3"
     ],
     "contestPeriodSec": 60,
     "peers": [
@@ -27,7 +30,7 @@
       }
     ]
   },
-  "blockfrostApiKey": "preprodq4qb2xZcZk6LUFk36DmEcxIFRM8DRwkV",
+  "blockfrostApiKeyFile": "blockfrost.txt",
   "logLevel": "trace",
   "ctlLogLevel": "warn",
   "commitOutRef": null
diff --git a/example/minimal/docker/node/Dockerfile b/example/minimal/docker/node/Dockerfile
@@ -21,10 +21,12 @@ RUN npx --no-install spago install
 COPY example/minimal/src src
 COPY example/minimal/app app
 COPY example/minimal/protocol-parameters.json .
+COPY example/minimal/blockfrost.txt .
 RUN npx --no-install spago build
 
-RUN curl -LO https://github.com/input-output-hk/hydra/releases/download/1.1.0/hydra-x86_64-linux-1.1.0.zip
-RUN unzip -d /usr/local/bin/ hydra-x86_64-linux-1.1.0.zip
+ARG HYDRA_VERSION=1.2.0
+RUN curl -LO https://github.com/input-output-hk/hydra/releases/download/${HYDRA_VERSION}/hydra-x86_linux-${HYDRA_VERSION}.zip
+RUN unzip -d /usr/local/bin/ hydra-x86_linux-${HYDRA_VERSION}.zip
 RUN chmod +x /usr/local/bin/hydra-node
 
 ENTRYPOINT ["npx", "--no-install", "spago", "-q", "run", "--main", "HydraSdk.Example.Minimal.Main", "--exec-args"]
diff --git a/example/minimal/spago.dhall b/example/minimal/spago.dhall
@@ -16,14 +16,18 @@
   , "maybe"
   , "monad-logger"
   , "newtype"
+  , "node-buffer"
   , "node-child-process"
+  , "node-fs"
+  , "node-path"
   , "node-process"
   , "ordered-collections"
   , "posix-types"
   , "prelude"
   , "profunctor-lenses"
   , "quickcheck"
   , "refs"
+  , "strings"
   , "transformers"
   , "tuples"
   , "uint"
diff --git a/example/minimal/src/App.purs b/example/minimal/src/App.purs
@@ -15,7 +15,7 @@ module HydraSdk.Example.Minimal.App
 
 import Prelude
 
-import Cardano.Types (TransactionInput, TransactionOutput)
+import Cardano.Types (NetworkId(MainnetId, TestnetId), TransactionInput, TransactionOutput)
 import Contract.Config
   ( ContractParams
   , PrivatePaymentKeySource(PrivatePaymentKeyFile)
@@ -39,7 +39,9 @@ import Ctl.Internal.ServerConfig (blockfrostPublicSanchonetServerConfig)
 import Data.Log.Formatter.Pretty (prettyFormatter)
 import Data.Log.Message (Message)
 import Data.Maybe (Maybe(Just, Nothing), maybe)
+import Data.String (take, trim) as String
 import Data.Tuple (Tuple(Tuple))
+import Data.Tuple.Nested (type (/\), (/\))
 import Effect (Effect)
 import Effect.AVar (AVar)
 import Effect.Aff (Aff, launchAff)
@@ -58,6 +60,8 @@ import HydraSdk.Types
   , emptySnapshot
   , networkToNetworkId
   )
+import Node.Encoding (Encoding(UTF8))
+import Node.FS.Sync (readTextFile)
 
 type AppM (a :: Type) = LoggerT (ReaderT AppState Aff) a
 
@@ -109,9 +113,9 @@ setUtxoSnapshot snapshot =
     =<< asks _.utxoSnapshot
 
 initApp :: DelegateServerConfig -> Aff AppState
-initApp config@{ hydraNodeStartupParams: { network, cardanoSigningKey }, commitOutRef } = do
-  backendParams <- liftEffect mkBackendParams
-  contractEnv <- mkContractEnv $ contractParams backendParams
+initApp config@{ hydraNodeStartupParams: { cardanoSigningKey }, commitOutRef } = do
+  networkId /\ backendParams <- liftEffect mkBackendParams
+  contractEnv <- mkContractEnv $ contractParams backendParams networkId
   commitUtxo <- runContractInEnv contractEnv do
     oref <- maybe getCollateral pure commitOutRef
     resolveCommitOutRef oref
@@ -134,29 +138,31 @@ initApp config@{ hydraNodeStartupParams: { network, cardanoSigningKey }, commitO
           =<< getUtxo oref
       )
 
-  mkBackendParams :: Effect ProviderBackendParams
+  mkBackendParams :: Effect (NetworkId /\ ProviderBackendParams)
   mkBackendParams = do
-    blockfrostConfig <-
-      case network of
-        Mainnet -> pure blockfrostPublicMainnetServerConfig
-        Testnet { magic } ->
-          case magic of
-            1 -> pure blockfrostPublicPreprodServerConfig
-            2 -> pure blockfrostPublicPreviewServerConfig
-            4 -> pure blockfrostPublicSanchonetServerConfig
-            _ ->
-              throw $ "mkBackendParams: unsupported testnet network with magic: "
-                <> show magic
-    pure $ mkBlockfrostBackendParams
+    blockfrostApiKey <- String.trim <$> readTextFile UTF8 config.blockfrostApiKeyFile
+    let networkPrefix = String.take 7 blockfrostApiKey
+    networkId /\ blockfrostConfig <-
+      case networkPrefix of
+        "mainnet" ->
+          pure $ MainnetId /\ blockfrostPublicMainnetServerConfig
+        "preprod" ->
+          pure $ TestnetId /\ blockfrostPublicPreprodServerConfig
+        "preview" ->
+          pure $ TestnetId /\ blockfrostPublicPreviewServerConfig
+        _ ->
+          throw $ "mkBackendParams: unsupported network. Blockfrost API key prefix: "
+            <> networkPrefix
+    pure $ networkId /\ mkBlockfrostBackendParams
       { blockfrostConfig
-      , blockfrostApiKey: config.blockfrostApiKey
+      , blockfrostApiKey: Just blockfrostApiKey
       , confirmTxDelay: defaultConfirmTxDelay
       }
 
-  contractParams :: ProviderBackendParams -> ContractParams
-  contractParams backendParams =
+  contractParams :: ProviderBackendParams -> NetworkId -> ContractParams
+  contractParams backendParams networkId =
     { backendParams
-    , networkId: networkToNetworkId network
+    , networkId
     , logLevel: config.ctlLogLevel
     , walletSpec: Just $ UseKeys (PrivatePaymentKeyFile cardanoSigningKey) Nothing Nothing
     , customLogger: Nothing
diff --git a/example/minimal/src/Config.purs b/example/minimal/src/Config.purs
@@ -16,11 +16,12 @@ import Effect (Effect)
 import Effect.Exception (throw)
 import HydraSdk.Lib (caDecodeFile, logLevelCodec, orefCodec)
 import HydraSdk.Process (HydraNodeStartupParams, hydraNodeStartupParamsCodec)
+import Node.Path (FilePath)
 import Node.Process (argv)
 
 type DelegateServerConfig =
   { hydraNodeStartupParams :: HydraNodeStartupParams
-  , blockfrostApiKey :: Maybe String
+  , blockfrostApiKeyFile :: FilePath
   , logLevel :: LogLevel
   , ctlLogLevel :: LogLevel
   , commitOutRef :: Maybe TransactionInput
@@ -30,7 +31,7 @@ delegateServerConfigCodec :: CA.JsonCodec DelegateServerConfig
 delegateServerConfigCodec =
   CA.object "DelegateServerConfig" $ CAR.record
     { hydraNodeStartupParams: hydraNodeStartupParamsCodec
-    , blockfrostApiKey: CA.maybe CA.string
+    , blockfrostApiKeyFile: CA.string
     , logLevel: logLevelCodec
     , ctlLogLevel: logLevelCodec
     , commitOutRef: CA.maybe orefCodec
diff --git a/example/minimal/src/Contract/L2.purs b/example/minimal/src/Contract/L2.purs
@@ -66,9 +66,9 @@ placeArbitraryDatumL2 snapshotUtxos = withPatchedGetUtxoByOrefQuery snapshotUtxo
 withPatchedGetUtxoByOrefQuery :: forall (a :: Type). UtxoMap -> Contract a -> Contract a
 withPatchedGetUtxoByOrefQuery snapshotUtxos =
   local \env -> env
-    { provider = env.provider 
+    { provider = env.provider
         { getUtxoByOref = \oref ->
             maybe (env.provider.getUtxoByOref oref) (pure <<< Right <<< Just) $
-              Map.lookup oref snapshotUtxos 
+              Map.lookup oref snapshotUtxos
         }
     }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -11,11 +11,11 @@
     cardano-node.follows = "ctl/cardano-node";
     ctl.url = "github:Plutonomicon/cardano-transaction-lib/8ba78bf6f1fc3016844cdb95ce8dcde3f0f99927";
     hydra = {
-      url = "github:input-output-hk/hydra/1.1.0";
+      url = "github:input-output-hk/hydra/1.2.0";
       inputs.cardano-node.follows = "cardano-node";
     };
     hydra-fixtures = {
-      url = "github:input-output-hk/hydra/1.1.0";
+      url = "github:input-output-hk/hydra/1.2.0";
       flake = false;
     };
   };
diff --git a/src/Internal/Process/HydraNode.purs b/src/Internal/Process/HydraNode.purs
@@ -30,8 +30,18 @@ import Effect.AVar (empty, tryPut) as AVar
 import Effect.Class (class MonadEffect, liftEffect)
 import HydraSdk.Internal.Lib.Codec (txHashCodec)
 import HydraSdk.Internal.Lib.Misc (cborBytesToHex)
-import HydraSdk.Internal.Types.HostPort (HostPort, hostPortStringCodec, printHost, printHostPort, printPort)
-import HydraSdk.Internal.Types.Network (Network(Testnet, Mainnet), networkCodec)
+import HydraSdk.Internal.Types.HostPort
+  ( HostPort
+  , hostPortStringCodec
+  , printHost
+  , printHostPort
+  , printPort
+  )
+import HydraSdk.Internal.Types.Network (Network(Testnet, Mainnet))
+import HydraSdk.Internal.Types.QueryLayer
+  ( QueryLayer(CardanoNode, Blockfrost)
+  , queryLayerCodec
+  )
 import Node.ChildProcess (ChildProcess, defaultSpawnOptions, spawn, stderr, stdout)
 import Node.Encoding (Encoding(UTF8)) as Encoding
 import Node.Path (FilePath)
@@ -46,8 +56,7 @@ type HydraNodeStartupParams =
   , persistDir :: FilePath
   , hydraSigningKey :: FilePath
   , cardanoSigningKey :: FilePath
-  , network :: Network
-  , nodeSocket :: FilePath
+  , queryLayer :: QueryLayer
   , pparams :: FilePath
   , hydraScripts :: Array TransactionHash
   , contestPeriodSec :: Int
@@ -65,8 +74,7 @@ hydraNodeStartupParamsCodec =
     , persistDir: CA.string
     , hydraSigningKey: CA.string
     , cardanoSigningKey: CA.string
-    , network: networkCodec
-    , nodeSocket: CA.string
+    , queryLayer: queryLayerCodec
     , pparams: CA.string
     , hydraScripts: CA.array txHashCodec
     , contestPeriodSec: CA.int
@@ -147,14 +155,30 @@ spawnHydraNode params handlers = liftEffect do
   option :: String -> String -> Array String
   option name val = [ "--" <> name, val ]
 
-  networkArgs :: Array String
+  optionMaybe :: forall (a :: Type). String -> (a -> String) -> Maybe a -> Array String
+  optionMaybe name f val = maybe mempty (option name <<< f) val
+
+  networkArgs :: Network -> Array String
   networkArgs =
-    case params.network of
+    case _ of
       Testnet { magic } ->
         option "testnet-magic" $ Int.toStringAs Int.decimal magic
       Mainnet ->
         Array.singleton "--mainnet"
 
+  queryLayerArgs :: Array String
+  queryLayerArgs =
+    case params.queryLayer of
+      CardanoNode { nodeSocket, network } ->
+        networkArgs network
+          <> option "node-socket" nodeSocket
+      Blockfrost { apiKeyFile, queryTimeoutSec, retryTimeoutSec } ->
+        Array.concat
+          [ option "blockfrost" apiKeyFile
+          , optionMaybe "blockfrost-query-timeout" show queryTimeoutSec
+          , optionMaybe "blockfrost-retry-timeout" show retryTimeoutSec
+          ]
+
   peerArgs :: Array String
   peerArgs =
     foldMap
@@ -168,16 +192,15 @@ spawnHydraNode params handlers = liftEffect do
 
   hydraNodeArgs :: Array String
   hydraNodeArgs =
-    networkArgs <> peerArgs <> Array.concat
+    queryLayerArgs <> peerArgs <> Array.concat
       [ option "node-id" params.nodeId
       , option "listen" $ printHostPort params.hydraNodeAddress
-      , maybe mempty (option "advertise" <<< printHostPort) params.hydraNodeAdvertisedAddress
+      , optionMaybe "advertise" printHostPort params.hydraNodeAdvertisedAddress
       , option "api-host" $ printHost params.hydraNodeApiAddress
       , option "api-port" $ printPort params.hydraNodeApiAddress
       , option "persistence-dir" params.persistDir
       , option "hydra-signing-key" params.hydraSigningKey
       , option "cardano-signing-key" params.cardanoSigningKey
-      , option "node-socket" params.nodeSocket
       , option "ledger-protocol-parameters" params.pparams
       , option "hydra-scripts-tx-id" $
           String.joinWith "," (cborBytesToHex <<< encodeCbor <$> params.hydraScripts)
diff --git a/src/Internal/Types/NodeApiMessage.purs b/src/Internal/Types/NodeApiMessage.purs
@@ -872,4 +872,3 @@ newTxMessageCodec =
     { transaction: hydraTxCodec
     }
 
-
diff --git a/src/Internal/Types/QueryLayer.purs b/src/Internal/Types/QueryLayer.purs
diff --git a/src/Types.purs b/src/Types.purs
diff --git a/test/Unit/Aeson.purs b/test/Unit/Aeson.purs

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,9 @@ placeArbitraryDatumL2 snapshotUtxos = withPatchedGetUtxoByOrefQuery snapshotUtxo`
`66`	`66`	`withPatchedGetUtxoByOrefQuery :: forall (a :: Type). UtxoMap -> Contract a -> Contract a`
`67`	`67`	`withPatchedGetUtxoByOrefQuery snapshotUtxos =`
`68`	`68`	`local \env -> env`
`69`		`- { provider = env.provider`
	`69`	`+ { provider = env.provider`
`70`	`70`	`{ getUtxoByOref = \oref ->`
`71`	`71`	`maybe (env.provider.getUtxoByOref oref) (pure <<< Right <<< Just) $`
`72`		`- Map.lookup oref snapshotUtxos`
	`72`	`+ Map.lookup oref snapshotUtxos`
`73`	`73`	`}`
`74`	`74`	`}`