Merge branch 'master' into lc/nix-fixtures

noonio · web-flow · commit 2e6ea1ee9180 · 2025-11-27T10:32:22.000Z
diff --git a/.github/workflows/binaries.yaml b/.github/workflows/binaries.yaml
@@ -8,11 +8,20 @@ on:
     - release
     tags:
     - "*.*.*"
+  # Allows to trigger runs on any branch
+  workflow_dispatch:
 
 jobs:
   build-linux:
-    name: "Build for x86_64-linux"
-    runs-on: ubuntu-latest
+    name: "Build for ${{ matrix.os.name }}"
+    runs-on: ${{ matrix.os.name }}
+    strategy:
+      matrix:
+        os:
+          - name: ubuntu-latest
+            arch: x86_linux
+          - name: ubuntu-24.04-arm
+            arch: aarm64
     steps:
     - name: 📥 Checkout repository
       uses: actions/checkout@v4
@@ -32,18 +41,25 @@ jobs:
         git fetch --tags --force
         echo "VERSION=$(git describe --always HEAD)" | tee "$GITHUB_ENV"
 
-    - name: ❄ Build static executables
+    - name: ❄ Build executables on ${{ matrix.os.name }}
       # Produces static ELF binary for using MuslC which includes all needed
       # libraries statically linked into it.
       run: |
-        nix build .#release-static
+        # XXX: aarm64 can't build static binaries yet.
+        # See: https://github.com/cardano-scaling/hydra/issues/2370
+        if [[ "${{ matrix.os.name }}" == "ubuntu-latest" ]]; then
+          nix build .#release-static
+        else
+          nix build .#release
+        fi
+
         # XXX: Why unzip https://github.com/actions/upload-artifact/issues/39
         unzip result/*.zip -d out
 
     - name: 💾 Upload executables
       uses: actions/upload-artifact@v4
       with:
-        name: hydra-x86_64-linux-${{ env.VERSION }} # automatically zips
+        name: hydra-${{ matrix.os.arch }}-${{ env.VERSION }} # automatically zips
         path: out/*
 
   build-macos:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,8 +11,12 @@ changes.
 
 ## [1.2.0] - UNRELEASED
 
+- Add support for Blockfrost to the `hydra-tui` [#2032](https://github.com/cardano-scaling/hydra/issues/2032).
+
 - `hydra-node` has a new endpoint `GET /head-initialization` which serves the timestamp of the last Head initialization.
 
+- Tested with `cardano-node 10.5.3` and `cardano-cli 10.11.0.0`.
+
 
 ## [1.1.0] - 2025-10-28
 
diff --git a/demo/docker-compose.yaml b/demo/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   cardano-node:
-    image: ghcr.io/intersectmbo/cardano-node:10.4.1
+    image: ghcr.io/intersectmbo/cardano-node:10.5.3
     volumes:
       - ./devnet:/devnet
     environment:
diff --git a/demo/seed-devnet.sh b/demo/seed-devnet.sh
@@ -80,7 +80,7 @@ function seedFaucet() {
         --tx-body-file ${DEVNET_DIR}/seed-${ACTOR}.draft \
         --signing-key-file ${DEVNET_DIR}/credentials/faucet.sk \
         --out-file ${DEVNET_DIR}/seed-${ACTOR}.signed >&2
-    SEED_TXID=$(ccli_ conway transaction txid --tx-file ${DEVNET_DIR}/seed-${ACTOR}.signed | tr -d '\r')
+    SEED_TXID=$(ccli_ conway transaction txid --tx-file ${DEVNET_DIR}/seed-${ACTOR}.signed | tr -d '\r' | jq '.txhash' -r)
     SEED_TXIN="${SEED_TXID}#0"
     ccli conway transaction submit --tx-file ${DEVNET_DIR}/seed-${ACTOR}.signed >&2
 
diff --git a/docs/docs/tutorial/index.md b/docs/docs/tutorial/index.md
@@ -49,7 +49,7 @@ hydra_version=1.1.0
 curl -L -O https://github.com/cardano-scaling/hydra/releases/download/${hydra_version}/hydra-x86_64-linux-${hydra_version}.zip
 unzip -d bin hydra-x86_64-linux-${hydra_version}.zip
 
-cardano_node_version=10.4.1
+cardano_node_version=10.5.3
 curl -L -O https://github.com/IntersectMBO/cardano-node/releases/download/${cardano_node_version}/cardano-node-${cardano_node_version}-linux.tar.gz
 tar xf cardano-node-${cardano_node_version}-linux.tar.gz ./bin/cardano-node ./bin/cardano-cli
 tar xf cardano-node-${cardano_node_version}-linux.tar.gz ./share/preprod --strip-components=3
@@ -75,7 +75,7 @@ hydra_version=1.1.0
 curl -L -O https://github.com/cardano-scaling/hydra/releases/download/${hydra_version}/hydra-aarch64-darwin-${hydra_version}.zip
 unzip -d bin hydra-aarch64-darwin-${hydra_version}.zip
 
-cardano_node_version=10.4.1
+cardano_node_version=10.5.3
 curl -L -O https://github.com/IntersectMBO/cardano-node/releases/download/${cardano_node_version}/cardano-node-${cardano_node_version}-macos.tar.gz
 tar xf cardano-node-${cardano_node_version}-macos.tar.gz ./bin/cardano-node ./bin/cardano-cli './bin/*.dylib'
 tar xf cardano-node-${cardano_node_version}-macos.tar.gz --strip-components=3 ./share/preprod/
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -5,7 +5,7 @@
       flake = false;
     };
     aiken.url = "github:aiken-lang/aiken/v1.1.9";
-    cardano-node.url = "github:intersectmbo/cardano-node/10.4.1";
+    cardano-node.url = "github:intersectmbo/cardano-node/10.5.3";
     flake-parts.url = "github:hercules-ci/flake-parts";
     haskellNix.url = "github:input-output-hk/haskell.nix";
     hydra-coding-standards.url = "github:cardano-scaling/hydra-coding-standards/0.6.5";
diff --git a/hydra-cluster/test/Test/CardanoNodeSpec.hs b/hydra-cluster/test/Test/CardanoNodeSpec.hs
@@ -22,7 +22,7 @@ supportedNetworks :: [KnownNetwork]
 supportedNetworks = [Mainnet, Preproduction, Preview]
 
 supportedCardanoNodeVersion :: String
-supportedCardanoNodeVersion = "10.4.1"
+supportedCardanoNodeVersion = "10.5.3"
 
 forSupportedKnownNetworks :: String -> (KnownNetwork -> IO ()) -> Spec
 forSupportedKnownNetworks msg action = forEachKnownNetwork msg $ \network -> do
diff --git a/hydra-cluster/test/Test/Hydra/Cluster/CardanoCliSpec.hs b/hydra-cluster/test/Test/Hydra/Cluster/CardanoCliSpec.hs
@@ -38,7 +38,7 @@ spec =
             Just something -> something == "Tx ConwayEra"
 
     it "has expected cardano-cli version available" $
-      readProcess "cardano-cli" ["--version"] "" >>= (`shouldContain` "10.8.0.0")
+      readProcess "cardano-cli" ["--version"] "" >>= (`shouldContain` "10.11.0.0")
 
     around (showLogsOnFailure "CardanoCliSpec") $ do
       it "query protocol-parameters is compatible with our FromJSON instance" $ \tracer ->
diff --git a/hydra-node/src/Hydra/Chain/CardanoClient.hs b/hydra-node/src/Hydra/Chain/CardanoClient.hs
@@ -56,14 +56,6 @@ data CardanoClient = CardanoClient
   , networkId :: NetworkId
   }
 
--- | Construct a 'CardanoClient' handle.
-mkCardanoClient :: NetworkId -> SocketPath -> CardanoClient
-mkCardanoClient networkId nodeSocket =
-  CardanoClient
-    { queryUTxOByAddress = queryUTxO networkId nodeSocket QueryTip
-    , networkId
-    }
-
 -- * Tx Construction / Submission
 
 -- | Submit a (signed) transaction to the node.
diff --git a/hydra-node/src/Hydra/Options.hs b/hydra-node/src/Hydra/Options.hs
@@ -183,12 +183,15 @@ defaultBlockfrostOptions =
   BlockfrostOptions
     { projectPath = "blockfrost-project.txt"
     , queryTimeout = defaultBFQueryTimeout
-    , retryTimeout = 300
+    , retryTimeout = defaultBFRetryTimeout
     }
 
 defaultBFQueryTimeout :: Int
 defaultBFQueryTimeout = 20
 
+defaultBFRetryTimeout :: Int
+defaultBFRetryTimeout = 300
+
 publishOptionsParser :: Parser PublishOptions
 publishOptionsParser =
   PublishOptions <$> chainBackendOptionsParser <*> cardanoSigningKeyFileParser
diff --git a/hydra-tui/src/Hydra/Client.hs b/hydra-tui/src/Hydra/Client.hs
@@ -17,6 +17,7 @@ import Hydra.Cardano.Api.Prelude (
   SigningKey,
  )
 import Hydra.Cardano.Api.Tx (signTx)
+import Hydra.Chain.Blockfrost.Client qualified as BF
 import Hydra.Chain.CardanoClient (submitTransaction)
 import Hydra.Chain.ChainState (IsChainState)
 import Hydra.Ledger.Cardano (Tx)
@@ -73,7 +74,7 @@ withClient ::
   IsChainState tx =>
   Options ->
   ClientComponent tx IO a
-withClient Options{hydraNodeHost = Host{hostname, port}, cardanoSigningKey, cardanoNetworkId, cardanoNodeSocket} callback action = do
+withClient Options{hydraNodeHost = Host{hostname, port}, cardanoSigningKey, cardanoNetworkId, cardanoConnection} callback action = do
   sk <- readExternalSk
   q <- newLabelledTBQueueIO "tui-client-queue" 10
   withAsyncLabelled ("client-reconnect", reconnect $ client q) $ \thread -> do
@@ -119,7 +120,12 @@ withClient Options{hydraNodeHost = Host{hostname, port}, cardanoSigningKey, card
     runReq defaultHttpConfig request
       <&> responseBody
         >>= \DraftCommitTxResponse{commitTx} ->
-          submitTransaction cardanoNetworkId cardanoNodeSocket $ signTx sk commitTx
+          case cardanoConnection of
+            Left bfProject -> do
+              prj <- liftIO $ BF.projectFromFile bfProject
+              void $ BF.runBlockfrostM prj $ BF.submitTransaction $ signTx sk commitTx
+            Right socketPath ->
+              submitTransaction cardanoNetworkId socketPath $ signTx sk commitTx
    where
     request =
       Req.req
diff --git a/hydra-tui/src/Hydra/TUI.hs b/hydra-tui/src/Hydra/TUI.hs
@@ -14,18 +14,44 @@ import Graphics.Vty (
   defaultConfig,
  )
 import Graphics.Vty.Platform.Unix (mkVty)
-import Hydra.Chain.CardanoClient (mkCardanoClient)
+import Hydra.Chain.Blockfrost.Client as BF
+import Hydra.Chain.CardanoClient as CC
 import Hydra.Chain.Direct.State ()
 import Hydra.Client (HydraEvent (..), withClient)
+import Hydra.Options (BlockfrostOptions (..), defaultBFQueryTimeout, defaultBFRetryTimeout)
 import Hydra.TUI.Drawing
 import Hydra.TUI.Handlers
 import Hydra.TUI.Logging.Types
 import Hydra.TUI.Model
 import Hydra.TUI.Options (Options (..))
 import Hydra.TUI.Style
 
+-- | Construct a 'CardanoClient' handle.
+mkCardanoClient :: NetworkId -> SocketPath -> CardanoClient
+mkCardanoClient networkId nodeSocket =
+  CardanoClient
+    { queryUTxOByAddress = CC.queryUTxO networkId nodeSocket CC.QueryTip
+    , networkId
+    }
+
+mkBFClient :: NetworkId -> FilePath -> CardanoClient
+mkBFClient networkId bfProject =
+  CardanoClient
+    { queryUTxOByAddress = \address -> do
+        prj <- liftIO $ BF.projectFromFile bfProject
+        let bfOptions =
+              BlockfrostOptions
+                { projectPath = bfProject
+                , queryTimeout = defaultBFQueryTimeout
+                , retryTimeout = defaultBFRetryTimeout
+                }
+
+        BF.runBlockfrostM prj $ BF.queryUTxO bfOptions networkId address
+    , networkId
+    }
+
 runWithVty :: IO Vty -> Options -> IO RootState
-runWithVty buildVty options@Options{hydraNodeHost, cardanoNetworkId, cardanoNodeSocket} = do
+runWithVty buildVty options@Options{hydraNodeHost, cardanoNetworkId, cardanoConnection} = do
   eventChan <- newBChan 10
   withAsyncLabelled ("run-vty-timer", timer eventChan) $ \_ ->
     -- REVIEW(SN): what happens if callback blocks?
@@ -50,7 +76,10 @@ runWithVty buildVty options@Options{hydraNodeHost, cardanoNetworkId, cardanoNode
       , logState = LogState{logMessages = [], logVerbosity = Short}
       }
 
-  cardanoClient = mkCardanoClient cardanoNetworkId cardanoNodeSocket
+  cardanoClient =
+    case cardanoConnection of
+      Left bfProject -> mkBFClient cardanoNetworkId bfProject
+      Right nodeSocket -> mkCardanoClient cardanoNetworkId nodeSocket
 
   timer :: BChan (HydraEvent tx) -> IO ()
   timer chan = forever $ do
diff --git a/hydra-tui/src/Hydra/TUI/Options.hs b/hydra-tui/src/Hydra/TUI/Options.hs
@@ -24,7 +24,7 @@ import Paths_hydra_tui (version)
 
 data Options = Options
   { hydraNodeHost :: Host
-  , cardanoNodeSocket :: SocketPath
+  , cardanoConnection :: Either FilePath SocketPath
   , cardanoNetworkId :: NetworkId
   , cardanoSigningKey :: FilePath
   -- ^ User key used by the tui client to commit
@@ -35,7 +35,7 @@ parseOptions :: Parser Options
 parseOptions =
   ( Options
       <$> parseNodeHost
-      <*> parseCardanoNodeSocket
+      <*> parsecardanoConnection
       <*> networkIdParser
       <*> parseCardanoSigningKey
   )
@@ -56,15 +56,27 @@ parseOptions =
         <|> gitRevision
         <|> Just unknownVersion
 
-parseCardanoNodeSocket :: Parser SocketPath
-parseCardanoNodeSocket =
-  strOption
-    ( long "node-socket"
-        <> metavar "FILE"
-        <> help "The path to the Cardano node domain socket for client communication."
-        <> value "node.socket"
-        <> showDefault
-    )
+parsecardanoConnection :: Parser (Either FilePath SocketPath)
+parsecardanoConnection = Right <$> cardanoNodeSocket <|> Left <$> blockFrost
+ where
+  cardanoNodeSocket :: Parser SocketPath
+  cardanoNodeSocket =
+    strOption
+      ( long "node-socket"
+          <> metavar "FILE"
+          <> help "The path to the Cardano node domain socket for client communication."
+          <> value "node.socket"
+          <> showDefault
+      )
+  blockFrost :: Parser FilePath
+  blockFrost =
+    strOption
+      ( long "blockfrost"
+          <> metavar "FILE"
+          <> help "The path to the Blockfrost project file."
+          <> value "blockfrost-project.txt"
+          <> showDefault
+      )
 
 parseNodeHost :: Parser Host
 parseNodeHost =
diff --git a/hydra-tui/test/Hydra/TUI/OptionsSpec.hs b/hydra-tui/test/Hydra/TUI/OptionsSpec.hs
@@ -30,7 +30,7 @@ spec = parallel $ do
   it "parses --cardano-signing-key option" $ do
     shouldParseWith parseOptions ["--cardano-signing-key", "foo.sk"] defaultOptions{cardanoSigningKey = "foo.sk"}
   it "parses --node-socket option" $ do
-    shouldParseWith parseOptions ["--node-socket", "something.socket"] defaultOptions{cardanoNodeSocket = "something.socket"}
+    shouldParseWith parseOptions ["--node-socket", "something.socket"] defaultOptions{cardanoConnection = Right "something.socket"}
   it "parses --version option" $ do
     case execParserPure defaultPrefs (info parseOptions mempty) ["--version"] of
       Failure theFailure ->
@@ -44,7 +44,7 @@ defaultOptions =
   Options
     { hydraNodeHost = Host "127.0.0.1" 4001
     , cardanoNetworkId = Testnet $ NetworkMagic 42
-    , cardanoNodeSocket = "node.socket"
+    , cardanoConnection = Right "node.socket"
     , cardanoSigningKey = "me.sk"
     }
 
diff --git a/hydra-tui/test/Hydra/TUISpec.hs b/hydra-tui/test/Hydra/TUISpec.hs
@@ -308,8 +308,8 @@ withTUIRotatedTest tracer tmpDir nodeId backend externalKeyFilePath options' act
                       { hostname = "127.0.0.1"
                       , port = fromIntegral $ 4000 + hydraNodeId
                       }
-                , cardanoNodeSocket =
-                    nodeSocket
+                , cardanoConnection =
+                    Right nodeSocket
                 , cardanoNetworkId =
                     networkId
                 , cardanoSigningKey = externalKeyFilePath
@@ -358,8 +358,8 @@ setupNodeAndTUI' hostname lovelace action =
                           { hostname = hostname
                           , port = fromIntegral $ 4000 + hydraNodeId
                           }
-                    , cardanoNodeSocket =
-                        nodeSocket
+                    , cardanoConnection =
+                        Right nodeSocket
                     , cardanoNetworkId =
                         networkId
                     , cardanoSigningKey = externalKeyFilePath
