diff --git a/README.md b/README.md index c712fc1d83..1d77047e7c 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Ouroboros Consensus -[![consensus](https://img.shields.io/badge/ouroboros--consensus-0.26.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-0.26.0.0/) -[![diffusion](https://img.shields.io/badge/ouroboros--consensus--diffusion-0.22.0.1-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-diffusion-0.22.0.1/) +[![consensus](https://img.shields.io/badge/ouroboros--consensus-0.27.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-0.27.0.0/) +[![diffusion](https://img.shields.io/badge/ouroboros--consensus--diffusion-0.23.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-diffusion-0.23.0.0/) [![protocol](https://img.shields.io/badge/ouroboros--consensus--protocol-0.12.0.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-protocol-0.12.0.0/) -[![cardano](https://img.shields.io/badge/ouroboros--consensus--cardano-0.25.0.1-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-cardano-0.25.0.1/) +[![cardano](https://img.shields.io/badge/ouroboros--consensus--cardano-0.25.1.0-blue)](https://chap.intersectmbo.org/package/ouroboros-consensus-cardano-0.25.1.0/) [![sop-extras](https://img.shields.io/badge/sop--extras-0.4.0.0-blue)](https://chap.intersectmbo.org/package/sop-extras-0.4.0.0/) [![strict-sop-core](https://img.shields.io/badge/strict--sop--core-0.1.3.0-blue)](https://chap.intersectmbo.org/package/strict-sop-core-0.1.3.0/) diff --git a/cabal.project b/cabal.project index f26d6e6511..fb9f3afc16 100644 --- a/cabal.project +++ b/cabal.project @@ -14,9 +14,9 @@ repository cardano-haskell-packages -- update either of these. index-state: -- Bump this if you need newer packages from Hackage - , hackage.haskell.org 2025-04-08T10:52:25Z + , hackage.haskell.org 2025-05-15T07:59:00Z -- Bump this if you need newer packages from CHaP - , cardano-haskell-packages 2025-05-14T06:57:45Z + , cardano-haskell-packages 2025-05-15T08:36:14Z packages: ouroboros-consensus diff --git a/flake.lock b/flake.lock index 6f113aa968..6997cbaa1f 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1747207911, - "narHash": "sha256-ijyd8bWNukbL0ayBwApWB/RnZjzdGotqWu3CVqIKH1E=", + "lastModified": 1747299417, + "narHash": "sha256-VRwq8JRAMnIgoxfgR60ppz37Wo6NixL9BbzwVhBveik=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "d346f7e285cb09c285bc1662ffc57d0924168524", + "rev": "10ebc8624f5440c245112f2e3dbf0e123e7e99e5", "type": "github" }, "original": { @@ -237,11 +237,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1744244690, - "narHash": "sha256-WarmifGCtgMb9L4KQ90TahZFBHXWZNGrfZKqVZzVT+Q=", + "lastModified": 1747268661, + "narHash": "sha256-z+1y/asOg4eOx23SrdMUM2tYhSlBxIFmsx82odczNNk=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "079ed855d02b7d7df8a71922bb7e98c3ccfcdb30", + "rev": "232e5cb2402b52c2efd0f58e8ec1e24efcdaa22b", "type": "github" }, "original": { diff --git a/ouroboros-consensus-cardano/CHANGELOG.md b/ouroboros-consensus-cardano/CHANGELOG.md index 0af0fab9ed..e20f890d49 100644 --- a/ouroboros-consensus-cardano/CHANGELOG.md +++ b/ouroboros-consensus-cardano/CHANGELOG.md @@ -2,6 +2,17 @@ # Changelog entries + +## 0.25.1.0 -- 2025-05-15 + +### Patch + +- Removed reference to deleted NodeToNodeV_13 from SupportedNetworkProtocolVersion + +### Non-Breaking + +- Drop GHC 8.10 support. + ## 0.25.0.1 -- 2025-04-25 diff --git a/ouroboros-consensus-cardano/changelog.d/20250430_141707_alexander.esgen_drop_ghc810.md b/ouroboros-consensus-cardano/changelog.d/20250430_141707_alexander.esgen_drop_ghc810.md deleted file mode 100644 index fd5720d55d..0000000000 --- a/ouroboros-consensus-cardano/changelog.d/20250430_141707_alexander.esgen_drop_ghc810.md +++ /dev/null @@ -1,3 +0,0 @@ -### Non-Breaking - -- Drop GHC 8.10 support. diff --git a/ouroboros-consensus-cardano/changelog.d/20250513_142405_crocodile-dentist_integrate_o_network.md b/ouroboros-consensus-cardano/changelog.d/20250513_142405_crocodile-dentist_integrate_o_network.md deleted file mode 100644 index 33f52dadb1..0000000000 --- a/ouroboros-consensus-cardano/changelog.d/20250513_142405_crocodile-dentist_integrate_o_network.md +++ /dev/null @@ -1,25 +0,0 @@ - - - -### Patch - -- Removed reference to deleted NodeToNodeV_13 from SupportedNetworkProtocolVersion - - - - diff --git a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal index 77152831dd..86fa8bfaf0 100644 --- a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal +++ b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: ouroboros-consensus-cardano -version: 0.25.0.1 +version: 0.25.1.0 synopsis: The instantation of the Ouroboros consensus layer used by Cardano @@ -157,7 +157,7 @@ library microlens, mtl, nothunks, - ouroboros-consensus ^>=0.26, + ouroboros-consensus ^>=0.27, ouroboros-consensus-protocol ^>=0.12, ouroboros-network-api ^>=0.14, serialise ^>=0.2, @@ -200,7 +200,7 @@ library unstable-byronspec containers >=0.5 && <0.8, mtl, nothunks, - ouroboros-consensus ^>=0.26, + ouroboros-consensus ^>=0.27, serialise ^>=0.2, small-steps, transformers, @@ -573,9 +573,9 @@ library unstable-cardano-tools network, network-mux, nothunks, - ouroboros-consensus ^>=0.26, + ouroboros-consensus ^>=0.27, ouroboros-consensus-cardano, - ouroboros-consensus-diffusion ^>=0.22, + ouroboros-consensus-diffusion ^>=0.23, ouroboros-consensus-protocol:{ouroboros-consensus-protocol, unstable-protocol-testlib} ^>=0.12, ouroboros-network, ouroboros-network-api, diff --git a/ouroboros-consensus-diffusion/CHANGELOG.md b/ouroboros-consensus-diffusion/CHANGELOG.md index 9172121f08..2613808b13 100644 --- a/ouroboros-consensus-diffusion/CHANGELOG.md +++ b/ouroboros-consensus-diffusion/CHANGELOG.md @@ -2,6 +2,21 @@ # Changelog entries + +## 0.23.0.0 -- 2025-05-15 + +### Patch + +- Bump `ouroboros-network` packages dependencies. + +### Non-Breaking + +- Drop GHC 8.10 support. + +### Breaking + +- Use `HeaderWithTime` for the ChainSync candidates + ## 0.22.0.1 -- 2025-04-21 diff --git a/ouroboros-consensus-diffusion/changelog.d/20241218_095040_nick.frisby_annotate_headers_with_time.md b/ouroboros-consensus-diffusion/changelog.d/20241218_095040_nick.frisby_annotate_headers_with_time.md deleted file mode 100644 index 6c36754dc5..0000000000 --- a/ouroboros-consensus-diffusion/changelog.d/20241218_095040_nick.frisby_annotate_headers_with_time.md +++ /dev/null @@ -1,22 +0,0 @@ - - - - - -### Breaking - -- Use `HeaderWithTime` for the ChainSync candidates diff --git a/ouroboros-consensus-diffusion/changelog.d/20250430_141654_alexander.esgen_drop_ghc810.md b/ouroboros-consensus-diffusion/changelog.d/20250430_141654_alexander.esgen_drop_ghc810.md deleted file mode 100644 index fd5720d55d..0000000000 --- a/ouroboros-consensus-diffusion/changelog.d/20250430_141654_alexander.esgen_drop_ghc810.md +++ /dev/null @@ -1,3 +0,0 @@ -### Non-Breaking - -- Drop GHC 8.10 support. diff --git a/ouroboros-consensus-diffusion/changelog.d/20250513_152607_crocodile-dentist_integrate_o_network.md b/ouroboros-consensus-diffusion/changelog.d/20250513_152607_crocodile-dentist_integrate_o_network.md deleted file mode 100644 index 54083881da..0000000000 --- a/ouroboros-consensus-diffusion/changelog.d/20250513_152607_crocodile-dentist_integrate_o_network.md +++ /dev/null @@ -1,25 +0,0 @@ - - - -### Patch - -- ouroboros-network package bumps - - - - diff --git a/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal b/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal index d7744076a2..23727ae9b9 100644 --- a/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal +++ b/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: ouroboros-consensus-diffusion -version: 0.22.0.1 +version: 0.23.0.0 synopsis: Integration for the Ouroboros Network layer description: Top level integration for consensus & network layers of the Ouroboros blockchain protocol. @@ -90,7 +90,7 @@ library io-classes ^>=1.5, mtl, network-mux ^>=0.8, - ouroboros-consensus ^>=0.26, + ouroboros-consensus ^>=0.27, ouroboros-network ^>=0.21, ouroboros-network-api ^>=0.14, ouroboros-network-framework ^>=0.18, diff --git a/ouroboros-consensus-protocol/ouroboros-consensus-protocol.cabal b/ouroboros-consensus-protocol/ouroboros-consensus-protocol.cabal index 54c550fb53..1a1906df4f 100644 --- a/ouroboros-consensus-protocol/ouroboros-consensus-protocol.cabal +++ b/ouroboros-consensus-protocol/ouroboros-consensus-protocol.cabal @@ -76,7 +76,7 @@ library containers, mtl, nothunks, - ouroboros-consensus >=0.23 && <0.27, + ouroboros-consensus >=0.23 && <0.28, serialise, text, diff --git a/ouroboros-consensus/CHANGELOG.md b/ouroboros-consensus/CHANGELOG.md index d62e2106ea..e5994bf497 100644 --- a/ouroboros-consensus/CHANGELOG.md +++ b/ouroboros-consensus/CHANGELOG.md @@ -2,6 +2,42 @@ # Changelog entries + +## 0.27.0.0 -- 2025-05-15 + +### Patch + +- Fix potential race condition in `Follower` forwarding. + +- Bugfix in Ouroboros Genesis. Added the @GsmState@ argument to the + @registerClient@ function for the ChainSync Jumping optimization. If the node + is in the @GSM.CaughtUp@ state, new peers now immediately disengage from CSJ. + +- Bump `ouroboros-network` packages dependencies. + +### Non-Breaking + +- Maintain a parallel selection with time annotations since the + `ConsensusBlockFetchInterface` uses the same type argument for ChainSync + candidates and the current selection. + +- Drop GHC 8.10 support. + +### Breaking + +- Define `HeaderWithTime`. + +- Use `HeaderWithTime` for the ChainSync candidates. + +- Remove `SlotForgeTimeOracle` and its use in the BlockFetch client interface, + as we no longer translate time in the BlockFetch client. + +- Rename `GetLedgerConfig` to `DebugLedgerConfig`, indicating that it is a debug + query, meaning that compatibility across node versions is not guaranteed. + + Please let us know if you want to rely on this query and would benefit from + proper backwards-compatibility guarantees. + ## 0.26.0.0 -- 2025-04-21 diff --git a/ouroboros-consensus/changelog.d/20241218_095010_nick.frisby_annotate_headers_with_time.md b/ouroboros-consensus/changelog.d/20241218_095010_nick.frisby_annotate_headers_with_time.md deleted file mode 100644 index ed0f231e26..0000000000 --- a/ouroboros-consensus/changelog.d/20241218_095010_nick.frisby_annotate_headers_with_time.md +++ /dev/null @@ -1,27 +0,0 @@ - - - - -### Non-Breaking - -- Maintain a parallel selection with time annotations since the - `ConsensusBlockFetchInterface` uses the same type argument for ChainSync - candidates and the current selection. - -### Breaking - -- Define `HeaderWithTime`. - -- Use `HeaderWithTime` for the ChainSync candidates. - -- Remove `SlotForgeTimeOracle` and its use in the BlockFetch client interface, - as we no longer translate time in the BlockFetch client. diff --git a/ouroboros-consensus/changelog.d/20250429_155724_alexander.esgen_follower_forward_bug.md b/ouroboros-consensus/changelog.d/20250429_155724_alexander.esgen_follower_forward_bug.md deleted file mode 100644 index 25644650f5..0000000000 --- a/ouroboros-consensus/changelog.d/20250429_155724_alexander.esgen_follower_forward_bug.md +++ /dev/null @@ -1,3 +0,0 @@ -### Patch - -- Fix potential race condition in `Follower` forwarding. diff --git a/ouroboros-consensus/changelog.d/20250430_141645_alexander.esgen_drop_ghc810.md b/ouroboros-consensus/changelog.d/20250430_141645_alexander.esgen_drop_ghc810.md deleted file mode 100644 index fd5720d55d..0000000000 --- a/ouroboros-consensus/changelog.d/20250430_141645_alexander.esgen_drop_ghc810.md +++ /dev/null @@ -1,3 +0,0 @@ -### Non-Breaking - -- Drop GHC 8.10 support. diff --git a/ouroboros-consensus/changelog.d/20250505_133127_alexander.esgen_getledgerconfig_query_debug.md b/ouroboros-consensus/changelog.d/20250505_133127_alexander.esgen_getledgerconfig_query_debug.md deleted file mode 100644 index 78bec5361b..0000000000 --- a/ouroboros-consensus/changelog.d/20250505_133127_alexander.esgen_getledgerconfig_query_debug.md +++ /dev/null @@ -1,7 +0,0 @@ -### Breaking - -- Rename `GetLedgerConfig` to `DebugLedgerConfig`, indicating that it is a debug - query, meaning that compatibility across node versions is not guaranteed. - - Please let us know if you want to rely on this query and would benefit from - proper backwards-compatibility guarantees. diff --git a/ouroboros-consensus/changelog.d/20250506_090817_nick.frisby_bugfix_csj_gsm.md b/ouroboros-consensus/changelog.d/20250506_090817_nick.frisby_bugfix_csj_gsm.md deleted file mode 100644 index 84c92da05f..0000000000 --- a/ouroboros-consensus/changelog.d/20250506_090817_nick.frisby_bugfix_csj_gsm.md +++ /dev/null @@ -1,25 +0,0 @@ - - -### Patch - -- Bugfix in Ouroboros Genesis. Added the @GsmState@ argument to the - @registerClient@ function for the ChainSync Jumping optimization. If the node - is in the @GSM.CaughtUp@ state, new peers now immediately disengage from CSJ. - - - - diff --git a/ouroboros-consensus/changelog.d/20250513_152215_crocodile-dentist_integrate_o_network.md b/ouroboros-consensus/changelog.d/20250513_152215_crocodile-dentist_integrate_o_network.md deleted file mode 100644 index 54083881da..0000000000 --- a/ouroboros-consensus/changelog.d/20250513_152215_crocodile-dentist_integrate_o_network.md +++ /dev/null @@ -1,25 +0,0 @@ - - - -### Patch - -- ouroboros-network package bumps - - - - diff --git a/ouroboros-consensus/ouroboros-consensus.cabal b/ouroboros-consensus/ouroboros-consensus.cabal index 0f15d89b64..eea42167be 100644 --- a/ouroboros-consensus/ouroboros-consensus.cabal +++ b/ouroboros-consensus/ouroboros-consensus.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: ouroboros-consensus -version: 0.26.0.0 +version: 0.27.0.0 synopsis: Consensus layer for the Ouroboros blockchain protocol description: Consensus layer for the Ouroboros blockchain protocol. license: Apache-2.0 @@ -754,7 +754,7 @@ test-suite storage-test ouroboros-network-mock, pretty-show, quickcheck-dynamic, - quickcheck-lockstep, + quickcheck-lockstep <0.7, quickcheck-state-machine:no-vendored-treediff ^>=0.10, random, resource-registry,