From d9c6492ff39533a07be7c2836f4ff6c6d0845a3f Mon Sep 17 00:00:00 2001 From: Alexander Esgen Date: Thu, 28 Sep 2023 10:01:15 +0200 Subject: [PATCH 1/2] `check-cabal-files.sh`: exclude `asserts.cabal` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This suddenly started failing on CI even though this file has been there for several weeks already 🤔 --- scripts/ci/check-cabal-files.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/check-cabal-files.sh b/scripts/ci/check-cabal-files.sh index 2cd8ae36fb..7ef07a2b52 100755 --- a/scripts/ci/check-cabal-files.sh +++ b/scripts/ci/check-cabal-files.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -for x in $(find . -name '*.cabal' | grep -v dist-newstyle | cut -c 3-); do +for x in $(find . -name '*.cabal' | grep -vE 'dist-newstyle|asserts\.cabal' | cut -c 3-); do ( d=$(dirname $x) echo "== $d ==" From 71e88770ddc1cef9aa8447e25c72f1cf13006660 Mon Sep 17 00:00:00 2001 From: Alexander Esgen Date: Wed, 27 Sep 2023 16:41:31 +0200 Subject: [PATCH 2/2] Cut releases for Node 8.5 ouroboros-consensus-0.12.0.0 ouroboros-consensus-diffusion-0.8.0.1 ouroboros-consensus-protocol-0.5.0.7 ouroboros-consensus-cardano-0.10.0.0 --- ouroboros-consensus-cardano/CHANGELOG.md | 27 +++++++++++++++++++ ...25447_alexander.esgen_ledger_conway_1_9.md | 20 -------------- .../ouroboros-consensus-cardano.cabal | 12 ++++----- ouroboros-consensus-diffusion/CHANGELOG.md | 8 ++++++ .../ouroboros-consensus-diffusion.cabal | 4 +-- ouroboros-consensus-protocol/CHANGELOG.md | 7 +++++ .../ouroboros-consensus-protocol.cabal | 6 ++--- ouroboros-consensus/CHANGELOG.md | 7 +++++ ouroboros-consensus/ouroboros-consensus.cabal | 2 +- 9 files changed, 61 insertions(+), 32 deletions(-) delete mode 100644 ouroboros-consensus-cardano/changelog.d/20230927_125447_alexander.esgen_ledger_conway_1_9.md diff --git a/ouroboros-consensus-cardano/CHANGELOG.md b/ouroboros-consensus-cardano/CHANGELOG.md index 29328aa26e..376c2fbbfa 100644 --- a/ouroboros-consensus-cardano/CHANGELOG.md +++ b/ouroboros-consensus-cardano/CHANGELOG.md @@ -2,6 +2,33 @@ # Changelog entries + +## 0.10.0.0 — 2023-09-27 + +### Non-Breaking + + - Updated to newer `cardano-ledger-*` packages: + * `cardano-ledger-api-1.6` + * `cardano-ledger-core-1.7` + * `cardano-ledger-conway-1.9` + + - Protocol parameters (in particular the version number) in the ledger state + are now updated properly on the Babbage→Conway era transition. + +### Breaking + + - `CardanoProtocolParams` now contains a `TransitionConfig` (new Ledger + concept) and the `CardanoHardForkTriggers` instead of the previous per-era + `ProtocolTransitionParams`. + + - Removed `ShelleyGenesis` from `ProtocolParamsShelleyBased` as a + `TransitionConfig` already contains a `ShelleyGenesis`. + + - Removed `registerInitialFunds` and `registerGenesisStaking`, these now live + in Ledger as part of the `EraTransition` class. + + - Removed now-unused `Ouroboros.Consensus.Cardano.ShelleyBased` module. + ## 0.9.0.0 — 2023-09-06 diff --git a/ouroboros-consensus-cardano/changelog.d/20230927_125447_alexander.esgen_ledger_conway_1_9.md b/ouroboros-consensus-cardano/changelog.d/20230927_125447_alexander.esgen_ledger_conway_1_9.md deleted file mode 100644 index 676928854a..0000000000 --- a/ouroboros-consensus-cardano/changelog.d/20230927_125447_alexander.esgen_ledger_conway_1_9.md +++ /dev/null @@ -1,20 +0,0 @@ -### Non-Breaking - - - Updated to newer `cardano-ledger-*` packages: - * `cardano-ledger-api-1.6` - * `cardano-ledger-core-1.7` - * `cardano-ledger-conway-1.9` - -### Breaking - - - `CardanoProtocolParams` now contains a `TransitionConfig` (new Ledger - concept) and the `CardanoHardForkTriggers` instead of the previous per-era - `ProtocolTransitionParams`. - - - Removed `ShelleyGenesis` from `ProtocolParamsShelleyBased` as a - `TransitionConfig` already contains a `ShelleyGenesis`. - - - Removed `registerInitialFunds` and `registerGenesisStaking`, these now live - in Ledger as part of the `EraTransition` class. - - - Removed now-unused `Ouroboros.Consensus.Cardano.ShelleyBased` module. diff --git a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal index 1b2301b43a..e0ad93e328 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.9.0.0 +version: 0.10.0.0 synopsis: The instantation of the Ouroboros consensus layer used by Cardano @@ -138,8 +138,8 @@ library , microlens , mtl , nothunks - , ouroboros-consensus ^>=0.11 - , ouroboros-consensus-protocol ^>=0.5.0.6 + , ouroboros-consensus ^>=0.12 + , ouroboros-consensus-protocol ^>=0.5.0.7 , ouroboros-network-api ^>=0.5.1 , serialise ^>=0.2 , small-steps @@ -178,7 +178,7 @@ library unstable-byronspec , containers >=0.5 && <0.7 , mtl , nothunks - , ouroboros-consensus ^>=0.11 + , ouroboros-consensus ^>=0.12 , serialise ^>=0.2 , small-steps , transformers @@ -506,10 +506,10 @@ library unstable-cardano-tools , mtl , network , nothunks - , ouroboros-consensus ^>=0.11 + , ouroboros-consensus ^>=0.12 , ouroboros-consensus-cardano , ouroboros-consensus-diffusion ^>=0.8 - , ouroboros-consensus-protocol ^>=0.5.0.6 + , ouroboros-consensus-protocol ^>=0.5.0.7 , ouroboros-network , ouroboros-network-api , ouroboros-network-framework diff --git a/ouroboros-consensus-diffusion/CHANGELOG.md b/ouroboros-consensus-diffusion/CHANGELOG.md index 9c784a701d..2df5d27168 100644 --- a/ouroboros-consensus-diffusion/CHANGELOG.md +++ b/ouroboros-consensus-diffusion/CHANGELOG.md @@ -2,6 +2,14 @@ # Changelog entries + +## 0.8.0.1 — 2023-09-27 + +### Patch + +- Update bound on `ouroboros-consensus` to account for changes in unstable test + libraries. + ## 0.8.0.0 — 2023-09-06 diff --git a/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal b/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal index af38eb0b96..d9fcf16582 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.0 +version: 0.8.0.1 synopsis: Integration for the Ouroboros Network layer description: Top level integration for consensus & network layers of the Ouroboros blockchain protocol. @@ -76,7 +76,7 @@ library , hashable , io-classes ^>=1.2 , mtl - , ouroboros-consensus ^>=0.11 + , ouroboros-consensus ^>=0.12 , ouroboros-network ^>=0.9.1 , ouroboros-network-api ^>=0.5.1 , ouroboros-network-framework ^>=0.9 diff --git a/ouroboros-consensus-protocol/CHANGELOG.md b/ouroboros-consensus-protocol/CHANGELOG.md index e26a31d371..442c8d695d 100644 --- a/ouroboros-consensus-protocol/CHANGELOG.md +++ b/ouroboros-consensus-protocol/CHANGELOG.md @@ -2,6 +2,13 @@ # Changelog entries + +## 0.5.0.7 — 2023-09-27 + +### Patch + +- Update upper bound on `ouroboros-consensus` + ## 0.5.0.6 — 2023-08-21 diff --git a/ouroboros-consensus-protocol/ouroboros-consensus-protocol.cabal b/ouroboros-consensus-protocol/ouroboros-consensus-protocol.cabal index 99a8428701..e94774c834 100644 --- a/ouroboros-consensus-protocol/ouroboros-consensus-protocol.cabal +++ b/ouroboros-consensus-protocol/ouroboros-consensus-protocol.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: ouroboros-consensus-protocol -version: 0.5.0.6 +version: 0.5.0.7 synopsis: Cardano consensus protocols description: Cardano consensus protocols. license: Apache-2.0 @@ -51,7 +51,7 @@ library Ouroboros.Consensus.Protocol.Translate build-depends: - , base >=4.14 && <4.19 + , base >=4.14 && <4.19 , bytestring , cardano-binary , cardano-crypto-class @@ -64,7 +64,7 @@ library , containers , mtl , nothunks - , ouroboros-consensus >=0.8 && <0.12 + , ouroboros-consensus ^>=0.12 , serialise , text diff --git a/ouroboros-consensus/CHANGELOG.md b/ouroboros-consensus/CHANGELOG.md index 2c456b747e..e00293db46 100644 --- a/ouroboros-consensus/CHANGELOG.md +++ b/ouroboros-consensus/CHANGELOG.md @@ -2,6 +2,13 @@ # Changelog entries + +## 0.12.0.0 — 2023-09-27 + +### Breaking + +- Refactorings in unstable test libraries. + ## 0.11.0.0 — 2023-09-06 diff --git a/ouroboros-consensus/ouroboros-consensus.cabal b/ouroboros-consensus/ouroboros-consensus.cabal index 244290d4b5..e38084f54c 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.11.0.0 +version: 0.12.0.0 synopsis: Consensus layer for the Ouroboros blockchain protocol description: Consensus layer for the Ouroboros blockchain protocol. license: Apache-2.0