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

Author: vrom911

CHANGELOG.md

@@ -8,10 +8,41 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 As a minor extension, we also keep a semantic version for the `UNRELEASED`
 changes.
 
-## [0.23.0] - UNRELEASED
+## [0.22.4] - 2025-08-05
 
 - Accept additional field `amount` when depositing to specify the amount of Lovelace that should be depositted to a Head returning any leftover to the user.
 
+- Fix API not correctly handling event log rotation. This was evident in not
+  being able to use `/commit` although the head is initializing or outdated
+  information in the `Greetings` message.
+
+- Ignore snapshot signatures of already confirmed snapshots. This was previously
+  resulting in the node waiting for the accompanying snapshot request and
+  occurred when running heads with mirror nodes.
+
+- Fix an internal persistent queue blocking after restart when it reached
+  capacity.
+
+- Timeout and retry broadcast of network messages after 3 seconds in case the
+  `etcd` grpc server is not responsive. This should avoid build-up on the
+  outbound persistent queue.
+
+- Handle failing lease keep alive in network component and avoid bursts in
+  heartbeating.
+
+- Fix for blocking bug when broadcasting messages via etcd. See:
+  https://github.com/cardano-scaling/hydra/issues/2167. This is not a full fix
+  but is enough to resolve the problem until we can identify the central cause
+  of the issue.
+
+## [0.22.3] - 2025-07-21
+
+* Change behavior of `Hydra.Network.Etcd` to fallback to earliest possible
+  revision if `last-known-revision` is missing or too old. This can happen if a
+  node is down for a long time and the `etcd` cluster compacted the last known
+  revision in the meantime
+  [#2136](https://github.com/cardano-scaling/hydra/issues/2136).
+
 - Don't keep around invalid transactions as they could lead to stuck Head.
 
 - Hydra API server responds with the correct `Content-Type` header `application-json`.
@@ -39,15 +70,15 @@ when the number of persisted `StateChanged` events exceeds the configured `--per
   preserving sequential order and making it easier to identify which rotated log file was used to compute it.
 
 
-## [0.22.2] - 2025.06.30
+## [0.22.2] - 2025-06-30
 
 * Fix wrong hydra-script-tx-ids in networks.json
 
-## [0.22.1] - 2025.06.27
+## [0.22.1] - 2025-06-27
 
 * Fix for bug where node got stalled at `ReplayingState` [#2089](https://github.com/cardano-scaling/hydra/issues/2089)
 
-## [0.22.0] - 2025.06.17
+## [0.22.0] - 2025-06-17
 
 - Tested with `cardano-node 10.1.4` and `cardano-cli 10.1.1.0`.
 

demo/docker-compose.yaml

@@ -21,7 +21,7 @@ services:
 
   hydra-node-1:
    # NOTE: Make sure to use the same image in ./seed-devnet.sh
-    image: ghcr.io/cardano-scaling/hydra-node:0.22.2
+    image: ghcr.io/cardano-scaling/hydra-node:0.22.4
     build:
       context: ../
       target: hydra-node
@@ -58,7 +58,7 @@ services:
 
   hydra-node-2:
     # NOTE: Make sure to use the same image in ./seed-devnet.sh
-    image: ghcr.io/cardano-scaling/hydra-node:0.22.2
+    image: ghcr.io/cardano-scaling/hydra-node:0.22.4
     build:
       context: ../
       target: hydra-node
@@ -95,7 +95,7 @@ services:
 
   hydra-node-3:
     # NOTE: Make sure to use the same image in ./seed-devnet.sh
-    image: ghcr.io/cardano-scaling/hydra-node:0.22.2
+    image: ghcr.io/cardano-scaling/hydra-node:0.22.4
     build:
       context: ../
       target: hydra-node
@@ -131,7 +131,7 @@ services:
     restart: always
 
   hydra-tui-1:
-    image: ghcr.io/cardano-scaling/hydra-tui:0.22.2
+    image: ghcr.io/cardano-scaling/hydra-tui:0.22.4
     build:
        context: ../
        target: hydra-tui
@@ -148,7 +148,7 @@ services:
         ipv4_address: 172.16.238.11
 
   hydra-tui-2:
-    image: ghcr.io/cardano-scaling/hydra-tui:0.22.2
+    image: ghcr.io/cardano-scaling/hydra-tui:0.22.4
     build:
        context: ../
        target: hydra-tui
@@ -165,7 +165,7 @@ services:
         ipv4_address: 172.16.238.21
 
   hydra-tui-3:
-    image: ghcr.io/cardano-scaling/hydra-tui:0.22.2
+    image: ghcr.io/cardano-scaling/hydra-tui:0.22.4
     build:
        context: ../
        target: hydra-tui

demo/seed-devnet.sh

@@ -55,7 +55,7 @@ function hnode() {
       docker run --rm -it \
         --pull always \
         -v ${SCRIPT_DIR}/devnet:/devnet \
-        ghcr.io/cardano-scaling/hydra-node:0.22.2 -- ${@}
+        ghcr.io/cardano-scaling/hydra-node:0.22.4 -- ${@}
   fi
 }
 

docs/docs/tutorial/index.md

@@ -45,7 +45,7 @@ that you have a good version of jq with this command:
 ```shell
 mkdir -p bin
 
-hydra_version=0.22.2
+hydra_version=0.22.4
 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
 
@@ -71,7 +71,7 @@ Finally, verify your node installation by running `./bin/hydra-node --help`
 ```shell
 mkdir -p bin
 
-hydra_version=0.22.2
+hydra_version=0.22.4
 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
 
@@ -415,7 +415,7 @@ Start the `hydra-node` using these parameters:
 <TabItem value="alice" label="Alice">
 
 ```shell
-hydra_version=0.22.2
+hydra_version=0.22.4
 hydra-node \
   --node-id "alice-node" \
   --persistence-dir persistence-alice \
@@ -437,7 +437,7 @@ hydra-node \
 <TabItem value="bob" label="Bob">
 
 ```shell
-hydra_version=0.22.2
+hydra_version=0.22.4
 hydra-node \
   --node-id "bob-node" \
   --persistence-dir persistence-bob \

hydra-cardano-api/hydra-cardano-api.cabal

@@ -1,6 +1,6 @@
 cabal-version: 3.0
 name:          hydra-cardano-api
-version:       0.22.2
+version:       0.22.4
 synopsis:      A Haskell API for Cardano, tailored to the Hydra project.
 author:        IOG
 copyright:     2022 IOG

hydra-chain-observer/hydra-chain-observer.cabal

@@ -1,6 +1,6 @@
 cabal-version: 3.0
 name:          hydra-chain-observer
-version:       0.22.2
+version:       0.22.4
 synopsis:      Hydra Chain Observer
 author:        IOG
 copyright:     2023 IOG

hydra-cluster/hydra-cluster.cabal

@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               hydra-cluster
-version:            0.22.2
+version:            0.22.4
 synopsis:
   Integration test suite using a local cluster of cardano and hydra nodes
 

hydra-cluster/src/Hydra/Cluster/Scenarios.hs

@@ -805,8 +805,9 @@ singlePartyCommitsScriptBlueprint tracer workDir backend hydraScriptsTxId =
     withHydraNode hydraTracer aliceChainConfig workDir hydraNodeId aliceSk [] [1] $ \n1 -> do
       send n1 $ input "Init" []
       headId <- waitMatch (10 * blockTime) n1 $ headIsInitializingWith (Set.fromList [alice])
-
-      (clientPayload, scriptUTxO) <- prepareScriptPayload 3_000_000
+      -- NOTE: We don't use amount in _regular_ commits - the ones before the
+      -- head is not yet opened - since we will remove this process soon.
+      (clientPayload, scriptUTxO) <- prepareScriptPayload 7_000_000 0
 
       res <-
         runReq defaultHttpConfig $
@@ -825,8 +826,12 @@ singlePartyCommitsScriptBlueprint tracer workDir backend hydraScriptsTxId =
         guard $ v ^? key "tag" == Just "HeadIsOpen"
         pure $ v ^? key "utxo"
       lockedUTxO `shouldBe` Just (toJSON scriptUTxO)
+
       -- incrementally commit script to a running Head
-      (clientPayload', scriptUTxO') <- prepareScriptPayload 2_000_000
+      let commitAmount = 2_000_000
+      (clientPayload', scriptUTxO') <- prepareScriptPayload 5_000_000 commitAmount
+
+      let toCommit = fst $ capUTxO scriptUTxO' (Coin commitAmount)
 
       res' <-
         runReq defaultHttpConfig $
@@ -843,13 +848,12 @@ singlePartyCommitsScriptBlueprint tracer workDir backend hydraScriptsTxId =
       Backend.submitTransaction backend tx
 
       waitFor hydraTracer (2 * realToFrac depositPeriod) [n1] $
-        output "CommitApproved" ["headId" .= headId, "utxoToCommit" .= scriptUTxO']
+        output "CommitApproved" ["headId" .= headId, "utxoToCommit" .= toCommit]
       waitFor hydraTracer (20 * blockTime) [n1] $
         output "CommitFinalized" ["headId" .= headId, "depositTxId" .= getTxId (getTxBody tx)]
-
-      getSnapshotUTxO n1 `shouldReturn` scriptUTxO <> scriptUTxO'
+      getSnapshotUTxO n1 `shouldReturn` scriptUTxO <> toCommit
  where
-  prepareScriptPayload lovelaceAmt = do
+  prepareScriptPayload lovelaceAmt commitAmount = do
     networkId <- Backend.queryNetworkId backend
     let scriptAddress = mkScriptAddress networkId dummyValidatorScript
     let datumHash :: TxOutDatum ctx
@@ -869,6 +873,7 @@ singlePartyCommitsScriptBlueprint tracer workDir backend hydraScriptsTxId =
       ( Aeson.object
           [ "blueprintTx" .= spendingTx
           , "utxo" .= scriptUTxO
+          , "amount" .= Coin commitAmount
           ]
       , scriptUTxO
       )