Use ouroboros-network packages from CHaP

IntersectMBO · Jan 2, 2025 · 8633497 · 8633497
1 parent dbeaf44
commit 8633497
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 39 deletions.
diff --git a/bench/locli/locli.cabal b/bench/locli/locli.cabal
@@ -113,7 +113,7 @@ library
                       , hashable
                       , optparse-applicative-fork >= 0.18.1
                       , ouroboros-consensus
-                      , ouroboros-network-api ^>= 0.11
+                      , ouroboros-network-api ^>= 0.12
                       , sop-core
                       , split
                       , statistics

diff --git a/cabal.project b/cabal.project
@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2024-12-10T16:20:07Z
-  , cardano-haskell-packages 2024-12-18T14:29:04Z
+  , cardano-haskell-packages 2025-01-02T14:22:02Z
 
 packages:
   cardano-node
@@ -71,30 +71,11 @@ allow-newer:
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
 
-source-repository-package
-  type: git
-  location: https://github.com/IntersectMBO/ouroboros-network.git
-  tag: 4920b7a8e1a639e6b6a85611bef6d541e21d012a
-  --sha256: sha256-mrGXtC/mStln5KqoXlruKYl2vHYZhgw3biRlZm82h7A=
-  subdir:
-    cardano-client
-    cardano-ping
-    monoidal-synchronisation
-    network-mux
-    ntp-client
-    ouroboros-network
-    ouroboros-network-api
-    ouroboros-network-framework
-    ouroboros-network-mock
-    ouroboros-network-protocols
-    ouroboros-network-testing
-    quickcheck-monoids
-
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/ouroboros-consensus.git
-  tag: f2d134da6d6d4f7bcbfb85ba94b30f49b3f2b7c6
-  --sha256: sha256-4Lu716WX9S+5dguxa8lUjAgeCQYsxj9QZZ9xLyyjivQ=
+  tag: 98d2087ed0f7594760b9bdbfe92821883b09dbc0
+  --sha256: sha256-kgiHxl26/6/ckJ+V0Ov/rn+LVN2WmWeJRB2dTQ8+Hj8=
   subdir:
     ouroboros-consensus
     ouroboros-consensus-cardano
@@ -104,21 +85,21 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/cardano-api.git
-  tag: 04ac6b36284ea823da0a7b88210c03b586f7f808
-  --sha256: sha256-LcZe9GcH2qRvNCk4leJHMLEX0KMiqbkYP4xACBE/znE=
+  tag: dca44167864887d9c7db71d4ed4781babb1daffb
+  --sha256: sha256-UUbEd8OTZE92hZ4kKmK5Pu4Mr8wns2ODDGZYbdr/8Hc=
   subdir:
     cardano-api
 
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/cardano-cli.git
-  tag: e2940caf43f5ba3194173523369553c93c2340b7
-  --sha256: sha256-Bzic7wIBU8Md/vzj87d9kgdpOGfTXOtjBYLyTR/rZ5g=
+  tag: 23ccb91eeafa7716f4ba1e90fc9130075881f29f
+  --sha256: sha256-HolhCVVZh5D7zNkvhhnT0uQ0w5BTJbIhT5sO3BCnTww=
   subdir:
     cardano-cli
 
 source-repository-package
   type: git
   location: https://github.com/neilmayhew/ekg-forward.git
-  tag: 4ba8bb693093f6cf54d43d6e9bbce1e08b0457dd
-  --sha256: sha256-g0gYqzRGjmZwxEzihJ4JifJe+GRfdLIMzaot7rUcjlI=
+  tag: d51ade51b2367345183095ae623bdddb708b8b22
+  --sha256: sha256-HykoFsyC68wznXaIiP6uJclpQTWVWW2FrXGCDLAs3zg=
diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
@@ -184,17 +184,17 @@ library
                       , lobemo-backend-trace-forwarder
                       , mtl
                       , network
-                      , network-mux >= 0.4
+                      , network-mux >= 0.5
                       , nothunks
                       , optparse-applicative-fork >= 0.18.1
                       , ouroboros-consensus ^>= 0.21
                       , ouroboros-consensus-cardano ^>= 0.20
                       , ouroboros-consensus-diffusion ^>= 0.18
                       , ouroboros-consensus-protocol
-                      , ouroboros-network-api ^>= 0.11
-                      , ouroboros-network ^>= 0.18
+                      , ouroboros-network-api ^>= 0.12
+                      , ouroboros-network ^>= 0.19
                       , ouroboros-network-framework
-                      , ouroboros-network-protocols ^>= 0.12
+                      , ouroboros-network-protocols ^>= 0.13
                       , prettyprinter
                       , prettyprinter-ansi-terminal
                       , psqueues

diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal
@@ -49,7 +49,7 @@ library
                       , network
                       , optparse-applicative-fork
                       , ouroboros-consensus-cardano
-                      , ouroboros-network ^>= 0.18
+                      , ouroboros-network ^>= 0.19
                       , ouroboros-network-protocols
                       , prometheus >= 2.2.4
                       , servant

diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal
@@ -49,7 +49,7 @@ library
                       , cardano-ledger-core:{cardano-ledger-core, testlib}
                       , cardano-ledger-shelley
                       , cardano-node
-                      , cardano-ping ^>= 0.6
+                      , cardano-ping ^>= 0.7
                       , contra-tracer
                       , containers
                       , data-default-class
@@ -70,7 +70,7 @@ library
                       , network
                       , network-mux
                       , optparse-applicative-fork
-                      , ouroboros-network ^>= 0.18
+                      , ouroboros-network ^>= 0.19
                       , ouroboros-network-api
                       , prettyprinter
                       , process

diff --git a/cardano-tracer/cardano-tracer.cabal b/cardano-tracer/cardano-tracer.cabal
@@ -178,7 +178,7 @@ library
                       , mime-mail
                       , network-mux
                       , optparse-applicative
-                      , ouroboros-network ^>= 0.18
+                      , ouroboros-network ^>= 0.19
                       , ouroboros-network-api
                       , ouroboros-network-framework
                       , signal

diff --git a/trace-dispatcher/trace-dispatcher.cabal b/trace-dispatcher/trace-dispatcher.cabal
@@ -61,7 +61,7 @@ library
                       , network
                       , network-mux
                       , optparse-applicative-fork
-                      , ouroboros-network ^>= 0.18
+                      , ouroboros-network ^>= 0.19
                       , ouroboros-network-api
                       , ouroboros-network-framework
                       , serialise

diff --git a/trace-forward/trace-forward.cabal b/trace-forward/trace-forward.cabal
@@ -67,7 +67,7 @@ library
                       , network-mux
                       , ouroboros-network-api
                       , singletons ^>= 3.0
-                      , ouroboros-network-framework ^>= 0.14
+                      , ouroboros-network-framework ^>= 0.15
                       , serialise
                       , stm
                       , text