Integration work for node 8.7.0

IntersectMBO · Nov 8, 2023 · 382fe14 · 382fe14
1 parent 1a808a5
commit 382fe14
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/cabal.project b/cabal.project
@@ -14,9 +14,9 @@ repository cardano-haskell-packages
 -- update either of these.
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2023-08-02T14:18:01Z
+  , hackage.haskell.org 2023-11-06T00:00:00Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2023-10-26T00:00:00Z
+  , cardano-haskell-packages 2023-11-06T00:00:00Z
 
 packages:
   ouroboros-consensus

diff --git a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal
@@ -116,31 +116,31 @@ library
     , cardano-crypto-class
     , cardano-crypto-wrapper
     , cardano-ledger-allegra
-    , cardano-ledger-alonzo         ^>=1.5.0
+    , cardano-ledger-alonzo         ^>=1.5.1
     , cardano-ledger-api            ^>=1.7
-    , cardano-ledger-babbage        ^>=1.5.0
+    , cardano-ledger-babbage        ^>=1.5.1
     , cardano-ledger-binary
     , cardano-ledger-byron
-    , cardano-ledger-conway         ^>=1.10.0
-    , cardano-ledger-core           ^>=1.8.0
+    , cardano-ledger-conway         ^>=1.11
+    , cardano-ledger-core           ^>=1.8.1
     , cardano-ledger-mary
-    , cardano-ledger-shelley        ^>=1.7.0
+    , cardano-ledger-shelley        ^>=1.8.0
     , cardano-prelude
-    , cardano-protocol-tpraos       ^>=1.0.3.6
+    , cardano-protocol-tpraos       ^>=1.0.3.7
     , cardano-slotting
     , cardano-strict-containers
     , cborg                         ^>=0.2.2
     , containers                    >=0.5      && <0.7
     , cryptonite                    >=0.25     && <0.31
     , deepseq
-    , formatting                    >=6.3      && <7.2
+    , formatting                    >=6.3      && <7.3
     , measures
     , microlens
     , mtl
     , nothunks
     , ouroboros-consensus           ^>=0.13
     , ouroboros-consensus-protocol  ^>=0.6.0.0
-    , ouroboros-network-api         ^>=0.5.1
+    , ouroboros-network-api         ^>=0.6
     , serialise                     ^>=0.2
     , small-steps
     , sop-core                      ^>=0.5
@@ -362,7 +362,7 @@ library unstable-cardano-testlib
     , cardano-ledger-conway-test                                                                 ^>=1.2.1.1
     , cardano-ledger-conway:testlib
     , cardano-ledger-core:{cardano-ledger-core, testlib}
-    , cardano-ledger-shelley                                                                     ^>=1.7
+    , cardano-ledger-shelley
     , cardano-protocol-tpraos
     , cardano-slotting
     , cardano-strict-containers

diff --git a/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal b/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal
@@ -77,10 +77,10 @@ library
     , io-classes                   ^>=1.2
     , mtl
     , ouroboros-consensus          ^>=0.13
-    , ouroboros-network            ^>=0.9.1
-    , ouroboros-network-api        ^>=0.5.1
-    , ouroboros-network-framework  ^>=0.9
-    , ouroboros-network-protocols  ^>=0.5.2
+    , ouroboros-network            ^>=0.10
+    , ouroboros-network-api        ^>=0.6
+    , ouroboros-network-framework  >=0.9    && <0.11
+    , ouroboros-network-protocols  ^>=0.6
     , random
     , serialise                    ^>=0.2
     , si-timers                    ^>=1.2

diff --git a/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs b/ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs
@@ -740,6 +740,7 @@ stdChainSyncTimeout = do
       { canAwaitTimeout  = shortWait
       , intersectTimeout = shortWait
       , mustReplyTimeout
+      , idleTimeout      = Just 3673
       }
 
 stdVersionDataNTN :: NetworkMagic

diff --git a/ouroboros-consensus-diffusion/src/unstable-diffusion-testlib/Test/ThreadNet/Network.hs b/ouroboros-consensus-diffusion/src/unstable-diffusion-testlib/Test/ThreadNet/Network.hs
@@ -1014,6 +1014,7 @@ runThreadNetwork systemTime ThreadNetworkArgs
                      { canAwaitTimeout  = waitForever
                      , intersectTimeout = waitForever
                      , mustReplyTimeout = waitForever
+                     , idleTimeout      = waitForever
                      })
                   nullMetric
                   -- The purpose of this test is not testing protocols, so

diff --git a/ouroboros-consensus/ouroboros-consensus.cabal b/ouroboros-consensus/ouroboros-consensus.cabal
@@ -261,9 +261,9 @@ library
     , measures
     , mtl
     , nothunks                     ^>=0.1.2
-    , ouroboros-network-api        ^>=0.5.1
+    , ouroboros-network-api        ^>=0.6
     , ouroboros-network-mock       ^>=0.1.0.1
-    , ouroboros-network-protocols  ^>=0.5
+    , ouroboros-network-protocols  ^>=0.6
     , psqueues                     ^>=0.2.3
     , quiet                        ^>=0.2
     , semialign                    >=1.1
@@ -280,7 +280,7 @@ library
     , time
     , transformers
     , typed-protocols              ^>=0.1.1
-    , vector                       ^>=0.12
+    , vector                       ^>=0.12    || ^>=0.13
 
 library unstable-consensus-testlib
   import:          common-lib