From a09cfba31be2fd7a79224256bf7a079cc3877a0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Fri, 22 Mar 2024 14:50:52 +0100 Subject: [PATCH 1/3] Bump cardano-api to 8.39.3.0 and ouroboros-* and ekg-forward as a consequence --- bench/locli/locli.cabal | 2 +- .../plutus-scripts-bench/plutus-scripts-bench.cabal | 2 +- bench/tx-generator/tx-generator.cabal | 2 +- cabal.project | 4 ++-- cardano-node/cardano-node.cabal | 8 ++++---- cardano-submit-api/cardano-submit-api.cabal | 4 ++-- cardano-testnet/cardano-testnet.cabal | 4 ++-- cardano-tracer/cardano-tracer.cabal | 4 ++-- flake.lock | 12 ++++++------ trace-dispatcher/trace-dispatcher.cabal | 4 ++-- trace-forward/trace-forward.cabal | 2 +- 11 files changed, 24 insertions(+), 24 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 23427588828..302529aa9ac 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-07T07:48:20Z - , cardano-haskell-packages 2024-03-05T10:16:08Z + , hackage.haskell.org 2024-03-22T11:04:03Z + , cardano-haskell-packages 2024-03-18T16:52:28Z packages: cardano-git-rev diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index 48aef24d223..c92f706a1f9 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,10 +185,10 @@ 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 >= 0.7.0.0 && < 0.7.1.0 - , ouroboros-network ^>= 0.12 + , ouroboros-network-api ^>= 0.7.1 + , ouroboros-network ^>= 0.13 , ouroboros-network-framework , ouroboros-network-protocols ^>= 0.8 , prettyprinter 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 2e5338c674c..e181e6c13f1 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 @@ -64,7 +64,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 ab7ed4eda5d..afd1d82ff4b 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1709731402, - "narHash": "sha256-7h4/ns3WRI3BtK1FbUEm6nMqW1ahNNehiHr7eQ03muk=", + "lastModified": 1711044046, + "narHash": "sha256-EdcE43LQtfzNFiwQfQp9RGqZizpfMR7fAT4XG3M9iO8=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "8e4f211a8e537c8c939b65e887556bd7441c774c", + "rev": "50ff95f584e05c942c9fabdd1b176996a0fb0cc5", "type": "github" }, "original": { @@ -624,11 +624,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1709770751, - "narHash": "sha256-mL09hxG1rOpC01xXT2CriE1dfSVgSHxW2QaPOYJxjvA=", + "lastModified": 1711066960, + "narHash": "sha256-KJtft6ryg++1PfwbbBkFZedOv4xeuge6IV5FBRa0f7s=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "bb33c267712d3d27329eed24f67ab027cb48a1f0", + "rev": "dca16b7a7eb69d9c0fdf5a4f205b347c19eb80bb", "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 diff --git a/trace-forward/trace-forward.cabal b/trace-forward/trace-forward.cabal index 007e1540094..7228768676b 100644 --- a/trace-forward/trace-forward.cabal +++ b/trace-forward/trace-forward.cabal @@ -64,7 +64,7 @@ library , deepseq , extra , io-classes - , ouroboros-network-api ^>= 0.7 + , ouroboros-network-api ^>= 0.7.1 , ouroboros-network-framework , serialise , stm From f054a9e1ba8f017aa3e4d1cd7688c9c9f38e5269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Fri, 22 Mar 2024 16:22:37 +0100 Subject: [PATCH 2/3] Integrate 8.9.1 release code change --- cardano-node/src/Cardano/Node/Tracing/StateRep.hs | 6 ------ 1 file changed, 6 deletions(-) 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 From 7f1a9f77cc0cee88dee55158d55ce2be0caba63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Mon, 25 Mar 2024 11:01:45 +0100 Subject: [PATCH 3/3] Update haskell.nix to circumvent failure of cabal patch --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index afd1d82ff4b..ba533ab7146 100644 --- a/flake.lock +++ b/flake.lock @@ -565,33 +565,33 @@ "type": "github" } }, - "ghc98X": { + "ghc910X": { "flake": false, "locked": { - "lastModified": 1696643148, - "narHash": "sha256-E02DfgISH7EvvNAu0BHiPvl1E5FGMDi0pWdNZtIBC9I=", - "ref": "ghc-9.8", - "rev": "443e870d977b1ab6fc05f47a9a17bc49296adbd6", - "revCount": 61642, + "lastModified": 1709693152, + "narHash": "sha256-j7K/oZLy1ZZIpOsjq101IF7cz/i/UxY1ofIeNUfuuXc=", + "ref": "ghc-9.10", + "rev": "21e3f3250e88640087a1a60bee2cc113bf04509f", + "revCount": 62524, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" }, "original": { - "ref": "ghc-9.8", + "ref": "ghc-9.10", "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" } }, - "ghc99": { + "ghc911": { "flake": false, "locked": { - "lastModified": 1701580282, - "narHash": "sha256-drA01r3JrXnkKyzI+owMZGxX0JameMzjK0W5jJE/+V4=", + "lastModified": 1710286031, + "narHash": "sha256-fz71zsU/ZukFMUsRNk2Ro3xTNMKsNrpvQtRtPqRI60c=", "ref": "refs/heads/master", - "rev": "f5eb0f2982e9cf27515e892c4bdf634bcfb28459", - "revCount": 62197, + "rev": "e6bfb85c842edca36754bb8914e725fbaa1a83a6", + "revCount": 62586, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -646,8 +646,8 @@ "cardano-shell": "cardano-shell", "flake-compat": "flake-compat_3", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", - "ghc98X": "ghc98X", - "ghc99": "ghc99", + "ghc910X": "ghc910X", + "ghc911": "ghc911", "hackage": [ "hackageNix" ], @@ -677,11 +677,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1708911681, - "narHash": "sha256-QGkzPN1HUYxgMU2EwiwjMvR2gQF0ffUdxALq1+bOdcY=", + "lastModified": 1711327801, + "narHash": "sha256-u1c7y+ksx0Er8C1s5tnoHDhhkG9eXskVOnKtzHUqQIw=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "5031fa0b8346fcc533c33073530ca87b8390add3", + "rev": "11337f2fb85cd606630929f8fce485160d343cdc", "type": "github" }, "original": { @@ -938,18 +938,18 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1691634696, - "narHash": "sha256-MZH2NznKC/gbgBu8NgIibtSUZeJ00HTLJ0PlWKCBHb0=", - "ref": "hkm/remote-iserv", - "rev": "43a979272d9addc29fbffc2e8542c5d96e993d73", - "revCount": 14, - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + "lastModified": 1708894040, + "narHash": "sha256-Rv+PajrnuJ6AeyhtqzMN+bcR8z9+aEnrUass+N951CQ=", + "owner": "stable-haskell", + "repo": "iserv-proxy", + "rev": "2f2a318fd8837f8063a0d91f329aeae29055fba9", + "type": "github" }, "original": { - "ref": "hkm/remote-iserv", - "type": "git", - "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" + "owner": "stable-haskell", + "ref": "iserv-syms", + "repo": "iserv-proxy", + "type": "github" } }, "lowdown-src": { @@ -1810,11 +1810,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1708906175, - "narHash": "sha256-KJDF0CO077Jx4GjjPK6pNkx6NkY7p1x5RMPfaIe8nl4=", + "lastModified": 1711325399, + "narHash": "sha256-Tx+/n9tBfnTgXj1TbBxgbceqB1TKdYY94BRNF6qSwJY=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "bfa4778050cf69fe50f91d39dcefbb9005d6d0d0", + "rev": "81b2725cbf27a23d7e292448072dc1bff976351a", "type": "github" }, "original": {