From ae923e18b1e98032e7531897c44bf0155f0209a5 Mon Sep 17 00:00:00 2001 From: Armando Santos Date: Mon, 18 Mar 2024 14:46:17 +0000 Subject: [PATCH] Release 8.9.1 --- bench/locli/locli.cabal | 2 +- bench/plutus-scripts-bench/plutus-scripts-bench.cabal | 2 +- bench/tx-generator/tx-generator.cabal | 2 +- cabal.project | 4 ++-- cardano-node/cardano-node.cabal | 10 +++++----- cardano-node/src/Cardano/Node/Tracing/StateRep.hs | 6 ------ cardano-submit-api/cardano-submit-api.cabal | 4 ++-- cardano-testnet/cardano-testnet.cabal | 4 ++-- cardano-tracer/cardano-tracer.cabal | 4 ++-- flake.lock | 6 +++--- trace-dispatcher/trace-dispatcher.cabal | 4 ++-- 11 files changed, 21 insertions(+), 27 deletions(-) diff --git a/bench/locli/locli.cabal b/bench/locli/locli.cabal index 1eb98f55af9..c7418a99fb0 100644 --- a/bench/locli/locli.cabal +++ b/bench/locli/locli.cabal @@ -121,7 +121,7 @@ library , optparse-generic , ouroboros-consensus -- for Data.SOP.Strict: - , ouroboros-network ^>= 0.12 + , ouroboros-network ^>= 0.13 , ouroboros-network-api , process , quiet diff --git a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal index b0dac39a86c..8a43f18258d 100644 --- a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal +++ b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal @@ -73,7 +73,7 @@ library -- IOG dependencies -------------------------- build-depends: - , cardano-api ^>= 8.39.2.0 + , cardano-api ^>= 8.39.3.0 , plutus-ledger-api >=1.0.0 , plutus-tx >=1.0.0 , plutus-tx-plugin ^>=1.21 diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal index b3eee7f8bff..29bf628c290 100644 --- a/bench/tx-generator/tx-generator.cabal +++ b/bench/tx-generator/tx-generator.cabal @@ -100,7 +100,7 @@ library , attoparsec-aeson , base16-bytestring , bytestring - , cardano-api ^>= 8.39.2.0 + , cardano-api ^>= 8.39.3.0 , cardano-binary , cardano-cli ^>= 8.20.3.0 , cardano-crypto-class diff --git a/cabal.project b/cabal.project index abf1dc0f689..df7fb2d8628 100644 --- a/cabal.project +++ b/cabal.project @@ -13,8 +13,8 @@ repository cardano-haskell-packages -- See CONTRIBUTING for information about these, including some Nix commands -- you need to run if you change them index-state: - , hackage.haskell.org 2024-03-06T13:35:48Z - , cardano-haskell-packages 2024-03-06T12:32:14Z + , hackage.haskell.org 2024-03-20T14:55:30Z + , cardano-haskell-packages 2024-03-20T14:22:58Z packages: cardano-git-rev diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index 7d425f8cd85..cf2496f9ad5 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -144,7 +144,7 @@ library , async , base16-bytestring , bytestring - , cardano-api ^>= 8.39.2.0 + , cardano-api ^>= 8.39.3.0 , cardano-crypto-class , cardano-crypto-wrapper , cardano-git-rev @@ -185,11 +185,11 @@ library , optparse-applicative-fork >= 0.18.1 , ouroboros-consensus ^>= 0.16 , ouroboros-consensus-cardano ^>= 0.14 - , ouroboros-consensus-diffusion ^>= 0.11 + , ouroboros-consensus-diffusion ^>= 0.12 , ouroboros-consensus-protocol - , ouroboros-network-api - , ouroboros-network ^>= 0.12 - , ouroboros-network-framework + , ouroboros-network-api ^>= 0.7 + , ouroboros-network ^>= 0.13 + , ouroboros-network-framework ^>= 0.12 , ouroboros-network-protocols ^>= 0.8 , prettyprinter , prettyprinter-ansi-terminal diff --git a/cardano-node/src/Cardano/Node/Tracing/StateRep.hs b/cardano-node/src/Cardano/Node/Tracing/StateRep.hs index 8dc1ecb7667..b34e63ec717 100644 --- a/cardano-node/src/Cardano/Node/Tracing/StateRep.hs +++ b/cardano-node/src/Cardano/Node/Tracing/StateRep.hs @@ -47,12 +47,6 @@ deriving instance ToJSON ChunkNo deriving instance NFData ChunkNo -deriving instance Generic NPV.NodeToNodeVersion -deriving instance NFData NPV.NodeToNodeVersion - -deriving instance Generic NPV.NodeToClientVersion -deriving instance NFData NPV.NodeToClientVersion - data OpeningDbs = StartedOpeningImmutableDB | OpenedImmutableDB (WithOrigin SlotNo) ChunkNo diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal index dfbc7cbd560..e587c260290 100644 --- a/cardano-submit-api/cardano-submit-api.cabal +++ b/cardano-submit-api/cardano-submit-api.cabal @@ -39,7 +39,7 @@ library , aeson , async , bytestring - , cardano-api ^>= 8.39.2.0 + , cardano-api ^>= 8.39.3.0 , cardano-binary , cardano-cli ^>= 8.20.3.0 , cardano-crypto-class ^>= 2.1.2 @@ -49,7 +49,7 @@ library , network , optparse-applicative-fork , ouroboros-consensus-cardano - , ouroboros-network ^>= 0.12 + , ouroboros-network ^>= 0.13 , ouroboros-network-protocols , prometheus >= 2.2.4 , servant diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal index 0f3d20e0f61..3dfabfd85ec 100644 --- a/cardano-testnet/cardano-testnet.cabal +++ b/cardano-testnet/cardano-testnet.cabal @@ -34,7 +34,7 @@ library build-depends: aeson , ansi-terminal , bytestring - , cardano-api ^>= 8.39.2.0 + , cardano-api ^>= 8.39.3.0 , cardano-cli ^>= 8.20.3.0 , cardano-crypto-class , cardano-crypto-wrapper @@ -63,7 +63,7 @@ library , network , network-mux , optparse-applicative-fork - , ouroboros-network ^>= 0.12 + , ouroboros-network ^>= 0.13 , ouroboros-network-api , prettyprinter , process diff --git a/cardano-tracer/cardano-tracer.cabal b/cardano-tracer/cardano-tracer.cabal index 3c5958eaca2..e2904cff589 100644 --- a/cardano-tracer/cardano-tracer.cabal +++ b/cardano-tracer/cardano-tracer.cabal @@ -147,12 +147,12 @@ library , directory , ekg , ekg-core - , ekg-forward ^>= 0.4 + , ekg-forward ^>= 0.5 , extra , filepath , mime-mail , optparse-applicative - , ouroboros-network ^>= 0.12 + , ouroboros-network ^>= 0.13 , ouroboros-network-api , ouroboros-network-framework , signal diff --git a/flake.lock b/flake.lock index 45a12b2767b..9b0014d755c 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1709731402, - "narHash": "sha256-7h4/ns3WRI3BtK1FbUEm6nMqW1ahNNehiHr7eQ03muk=", + "lastModified": 1710945682, + "narHash": "sha256-xp1txUjrtCuKHAy0nvz/lu0MlNdNnzvP8l2p9MFB73Y=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "8e4f211a8e537c8c939b65e887556bd7441c774c", + "rev": "8df2bf06e4525ec39c106cd2593e3c5fd7f2b081", "type": "github" }, "original": { diff --git a/trace-dispatcher/trace-dispatcher.cabal b/trace-dispatcher/trace-dispatcher.cabal index b6cbc908018..bf3b07cf655 100644 --- a/trace-dispatcher/trace-dispatcher.cabal +++ b/trace-dispatcher/trace-dispatcher.cabal @@ -56,11 +56,11 @@ library , deepseq , ekg , ekg-core - , ekg-forward >= 0.4 + , ekg-forward >= 0.5 , hostname , network , optparse-applicative-fork - , ouroboros-network ^>= 0.12 + , ouroboros-network ^>= 0.13 , ouroboros-network-api , ouroboros-network-framework , serialise