Merge pull request #5724 from IntersectMBO/smelc/bump-cardano-api-to-…

…8.39.3.0 Bump cardano-api to 8.39.3.0 and ouroboros-* and ekg-forward as a consequence
IntersectMBO · Mar 26, 2024 · 8b2f7c7 · 8b2f7c7
2 parents c5d3d63 + 7f1a9f7
commit 8b2f7c7
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 60 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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-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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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