diff --git a/README.md b/README.md index b2e8e13921..52d71548c6 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Ouroboros Consensus -[![consensus](https://img.shields.io/badge/ouroboros--consensus-0.13.0.0-blue)](https://input-output-hk.github.io/cardano-haskell-packages/package/ouroboros-consensus-0.13.0.0/) -[![diffusion](https://img.shields.io/badge/ouroboros--consensus--diffusion-0.8.0.2-blue)](https://input-output-hk.github.io/cardano-haskell-packages/package/ouroboros-consensus-diffusion-0.8.0.2/) +[![consensus](https://img.shields.io/badge/ouroboros--consensus-0.13.0.1-blue)](https://input-output-hk.github.io/cardano-haskell-packages/package/ouroboros-consensus-0.13.0.1/) +[![diffusion](https://img.shields.io/badge/ouroboros--consensus--diffusion-0.9.0.0-blue)](https://input-output-hk.github.io/cardano-haskell-packages/package/ouroboros-consensus-diffusion-0.9.0.0/) [![protocol](https://img.shields.io/badge/ouroboros--consensus--protocol-0.6.0.0-blue)](https://input-output-hk.github.io/cardano-haskell-packages/package/ouroboros-consensus-protocol-0.6.0.0/) -[![cardano](https://img.shields.io/badge/ouroboros--consensus--cardano-0.11.0.0-blue)](https://input-output-hk.github.io/cardano-haskell-packages/package/ouroboros-consensus-cardano-0.11.0.0/) +[![cardano](https://img.shields.io/badge/ouroboros--consensus--cardano-0.12.0.0-blue)](https://input-output-hk.github.io/cardano-haskell-packages/package/ouroboros-consensus-cardano-0.12.0.0/) [![sop-extras](https://img.shields.io/badge/sop--extras-0.1.0.0-blue)](https://input-output-hk.github.io/cardano-haskell-packages/package/sop-extras-0.1.0.0/) [![strict-sop-core](https://img.shields.io/badge/strict--sop--core-0.1.0.0-blue)](https://input-output-hk.github.io/cardano-haskell-packages/package/strict-sop-core-0.1.0.0/) diff --git a/cabal.project b/cabal.project index dfe48d5117..965c62f145 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 2023-11-07T14:32:35Z + , hackage.haskell.org 2023-11-09T23:50:15Z -- Bump this if you need newer packages from CHaP - , cardano-haskell-packages 2023-11-03T12:09:05Z + , cardano-haskell-packages 2023-11-14T12:07:29Z packages: ouroboros-consensus diff --git a/flake.lock b/flake.lock index 1c6613e195..01da1afc4e 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1699014040, - "narHash": "sha256-Be4mtEsXIQbjy9c4AtZ6dIKDjEfArZ/D1qEkdhdsB8o=", + "lastModified": 1699973203, + "narHash": "sha256-BZ12nGd+kXsyAV0NkHdUVSF7+LZe5M7qQ2HPRzbLAz4=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "653fe92c94baff7e89a9ff199a7bdcdadbd3fc1b", + "rev": "85d5852495a971165c1ef042624fa5eb86e10b37", "type": "github" }, "original": { @@ -225,11 +225,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1699316521, - "narHash": "sha256-WnSX8htpCWu9AFymD6pIO/42UPmeRKsefQ9ANLO9kRE=", + "lastModified": 1699921540, + "narHash": "sha256-d8T3DUJRTgT8Cap6Pkm/VfstnlNlNnHOQzdDejYiHSo=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "3c77651bc68c1a186bc47c58c6b5885610371135", + "rev": "fd9345e0caac82a4810e6a0ba6aa1d07fdde1a28", "type": "github" }, "original": { diff --git a/ouroboros-consensus-cardano/CHANGELOG.md b/ouroboros-consensus-cardano/CHANGELOG.md index 083ffc3792..080e5199df 100644 --- a/ouroboros-consensus-cardano/CHANGELOG.md +++ b/ouroboros-consensus-cardano/CHANGELOG.md @@ -2,6 +2,29 @@ # Changelog entries + +## 0.12.0.0 — 2023-11-14 + +### Non-Breaking + +- Updates dependency on `ouroboros-network-api` to `0.6.0`. + +- Update ledger packages + - `cardano-ledger-allegra`: `^>=1.2.5` + - `cardano-ledger-alonzo`: `^>=1.5.0 -> ^>=1.5.1` + - `cardano-ledger-babbage`: `^>=1.5.0 -> ^>=1.5.1` + - `cardano-ledger-binary`: `^>=1.2.1` + - `cardano-ledger-byron`: `^>=1.0` + - `cardano-ledger-conway`: `^>=1.10.0 -> ^>=1.11` + - `cardano-ledger-core`: `^>=1.8.0 -> ^>=1.9` + - `cardano-ledger-mary`: `^>=1.4` + - `cardano-ledger-shelley`: `^>=1.7.0 -> ^>=1.8` + - `cardano-protocol-tpraos`: `^>=1.0.3.6 -> ^>=1.0.3.7` + +### Breaking + +- Add a query for vote delegatees: GetFilteredVoteDelegatees + ## 0.11.0.0 — 2023-10-26 diff --git a/ouroboros-consensus-cardano/changelog.d/20231002_154149_armandoifsantos_fix_peerSharing_handshake.md b/ouroboros-consensus-cardano/changelog.d/20231002_154149_armandoifsantos_fix_peerSharing_handshake.md deleted file mode 100644 index 59fb057713..0000000000 --- a/ouroboros-consensus-cardano/changelog.d/20231002_154149_armandoifsantos_fix_peerSharing_handshake.md +++ /dev/null @@ -1,15 +0,0 @@ - - - -### Non-Breaking - -- Updates dependency on `ouroboros-network-api` to `0.6.0`. diff --git a/ouroboros-consensus-cardano/changelog.d/20231110_165234_carl.hammann_vote_delegatee_query.md b/ouroboros-consensus-cardano/changelog.d/20231110_165234_carl.hammann_vote_delegatee_query.md deleted file mode 100644 index 8ddbfdf0bd..0000000000 --- a/ouroboros-consensus-cardano/changelog.d/20231110_165234_carl.hammann_vote_delegatee_query.md +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - -### Breaking - -- Add a query for vote delegatees: GetFilteredVoteDelegatees diff --git a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal index b70f7067b6..d8c6ce8183 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.11.0.0 +version: 0.12.0.0 synopsis: The instantation of the Ouroboros consensus layer used by Cardano @@ -115,25 +115,25 @@ library , cardano-crypto , cardano-crypto-class , cardano-crypto-wrapper - , cardano-ledger-allegra - , cardano-ledger-alonzo ^>=1.5.0 + , cardano-ledger-allegra ^>=1.2.5 + , cardano-ledger-alonzo ^>=1.5.1 , cardano-ledger-api ^>=1.7 - , cardano-ledger-babbage ^>=1.5.0 - , cardano-ledger-binary - , cardano-ledger-byron - , cardano-ledger-conway ^>=1.10.0 - , cardano-ledger-core ^>=1.8.0 - , cardano-ledger-mary - , cardano-ledger-shelley ^>=1.7.0 + , cardano-ledger-babbage ^>=1.5.1 + , cardano-ledger-binary ^>=1.2.1 + , cardano-ledger-byron ^>=1.0.0.3 + , cardano-ledger-conway ^>=1.11 + , cardano-ledger-core ^>=1.9 + , cardano-ledger-mary ^>=1.4 + , cardano-ledger-shelley ^>=1.8 , cardano-prelude - , cardano-protocol-tpraos ^>=1.0.3.6 + , cardano-protocol-tpraos ^>=1.0.3.7 , cardano-slotting , cardano-strict-containers , cborg ^>=0.2.2 , containers >=0.5 && <0.7 , cryptonite >=0.25 && <0.31 , deepseq - , formatting >=6.3 && <7.2 + , formatting >=6.3 && <7.3 , measures , microlens , mtl @@ -362,7 +362,7 @@ library unstable-cardano-testlib , cardano-ledger-conway-test ^>=1.2.1.1 , cardano-ledger-conway:testlib , cardano-ledger-core:{cardano-ledger-core, testlib} - , cardano-ledger-shelley ^>=1.7 + , cardano-ledger-shelley , cardano-protocol-tpraos , cardano-slotting , cardano-strict-containers @@ -509,7 +509,7 @@ library unstable-cardano-tools , nothunks , ouroboros-consensus ^>=0.13 , ouroboros-consensus-cardano - , ouroboros-consensus-diffusion ^>=0.8 + , ouroboros-consensus-diffusion ^>=0.9 , ouroboros-consensus-protocol ^>=0.6.0.0 , ouroboros-network , ouroboros-network-api diff --git a/ouroboros-consensus-diffusion/CHANGELOG.md b/ouroboros-consensus-diffusion/CHANGELOG.md index dab40af9a7..f43eaeeb51 100644 --- a/ouroboros-consensus-diffusion/CHANGELOG.md +++ b/ouroboros-consensus-diffusion/CHANGELOG.md @@ -2,6 +2,15 @@ # Changelog entries + +## 0.9.0.0 — 2023-11-14 + +### Breaking + +- Adds `NodeToNodeVersion` to the arguments of `defaultCodecs` and `runWith` functions. + +- Adds `srnChainSyncTimeout` argument to `StdRunNodeArgs`. + ## 0.8.0.2 — 2023-10-26 diff --git a/ouroboros-consensus-diffusion/changelog.d/20231002_154502_armandoifsantos_fix_peerSharing_handshake.md b/ouroboros-consensus-diffusion/changelog.d/20231002_154502_armandoifsantos_fix_peerSharing_handshake.md deleted file mode 100644 index 3d40209a22..0000000000 --- a/ouroboros-consensus-diffusion/changelog.d/20231002_154502_armandoifsantos_fix_peerSharing_handshake.md +++ /dev/null @@ -1,16 +0,0 @@ - - - -### Breaking - -- Adds `NodeToNodeVersion` to the arguments of `defaultCodecs` and `runWith` functions. - diff --git a/ouroboros-consensus-diffusion/changelog.d/jasagredo_timeouts.md b/ouroboros-consensus-diffusion/changelog.d/jasagredo_timeouts.md new file mode 100644 index 0000000000..c53e14c075 --- /dev/null +++ b/ouroboros-consensus-diffusion/changelog.d/jasagredo_timeouts.md @@ -0,0 +1,4 @@ +### Breaking + +- Adds `srnChainSyncTimeout` argument to `StdRunNodeArgs`. + diff --git a/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal b/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal index 346d93069f..c1fd2af093 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.8.0.2 +version: 0.9.0.0 synopsis: Integration for the Ouroboros Network layer description: Top level integration for consensus & network layers of the Ouroboros blockchain protocol. diff --git a/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs b/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs index 911d6a972d..731b837ff1 100644 --- a/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs +++ b/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs @@ -807,6 +807,8 @@ data StdRunNodeArgs m blk (p2p :: Diffusion.P2P) = StdRunNodeArgs , srnMaybeMempoolCapacityOverride :: Maybe MempoolCapacityBytesOverride -- ^ Determine whether to use the system default mempool capacity or explicitly set -- capacity of the mempool. + , srnChainSyncTimeout :: Maybe NTN.ChainSyncTimeout + -- ^ A custom timeout for ChainSync. } -- | Conveniently packaged 'LowLevelRunNodeArgs' arguments from a standard @@ -832,7 +834,7 @@ stdLowLevelRunNodeArgsIO RunNodeArgs{ rnProtocolInfo llrnKeepAliveRng <- stdKeepAliveRngIO pure LowLevelRunNodeArgs { llrnBfcSalt - , llrnChainSyncTimeout = stdChainSyncTimeout + , llrnChainSyncTimeout = maybe stdChainSyncTimeout pure srnChainSyncTimeout , llrnCustomiseHardForkBlockchainTimeArgs = id , llrnKeepAliveRng , llrnChainDbArgsDefaults = diff --git a/ouroboros-consensus/CHANGELOG.md b/ouroboros-consensus/CHANGELOG.md index 49a11c9f93..c6d8562271 100644 --- a/ouroboros-consensus/CHANGELOG.md +++ b/ouroboros-consensus/CHANGELOG.md @@ -2,6 +2,13 @@ # Changelog entries + +## 0.13.0.1 — 2023-11-14 + +### Patch + +- Update to `vector ^>=0.13` + ## 0.13.0.0 — 2023-10-26 diff --git a/ouroboros-consensus/ouroboros-consensus.cabal b/ouroboros-consensus/ouroboros-consensus.cabal index fbbda31d75..bfecef6ff3 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.13.0.0 +version: 0.13.0.1 synopsis: Consensus layer for the Ouroboros blockchain protocol description: Consensus layer for the Ouroboros blockchain protocol. license: Apache-2.0 @@ -280,7 +280,7 @@ library , time , transformers , typed-protocols ^>=0.1.1 - , vector ^>=0.12 + , vector ^>=0.13 library unstable-consensus-testlib import: common-lib