CI ONLY (release branch)

.github/workflows/haskell.yml

@@ -38,7 +38,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2024-02-29"
+      CABAL_CACHE_VERSION: "2024-04-08"
 
     concurrency:
       group: >

bench/locli/locli.cabal

@@ -103,7 +103,7 @@ library
                       , bytestring
                       , cardano-git-rev
                       , cardano-ledger-core
-                      , cardano-prelude
+                      , cardano-prelude < 0.2
                       , cardano-slotting
                       , containers
                       , deepseq
@@ -121,7 +121,7 @@ library
                       , optparse-generic
                       , ouroboros-consensus
                       -- for Data.SOP.Strict:
-                      , ouroboros-network ^>= 0.12
+                      , ouroboros-network ^>= 0.15
                       , ouroboros-network-api
                       , process
                       , quiet

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

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

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-02-27T08:06:51Z
-  , cardano-haskell-packages 2024-02-26T17:55:44Z
+  , hackage.haskell.org 2024-03-20T14:55:30Z
+  , cardano-haskell-packages 2024-06-27T10:04:00Z
 
 packages:
   cardano-git-rev

cardano-node/NOTICE

@@ -1,4 +1,4 @@
-Copyright 2019-2023 Input Output Global Inc (IOG).
+Copyright 2019-2023 Input Output Global Inc (IOG), 2023-2024 Intersect.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

cardano-node/cardano-node.cabal

@@ -1,12 +1,12 @@
 cabal-version: 3.0
 
 name:                   cardano-node
-version:                8.9.0
+version:                8.9.4
 synopsis:               The cardano full node
 description:            The cardano full node.
 category:               Cardano,
                         Validator,
-copyright:              2019-2023 Input Output Global Inc (IOG).
+copyright:              2019-2023 Input Output Global Inc (IOG), 2023-2024 Intersect.
 author:                 IOHK
 maintainer:             [email protected]
 license:                Apache-2.0
@@ -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
@@ -183,13 +183,13 @@ library
                       , network-mux >= 0.4
                       , nothunks
                       , optparse-applicative-fork >= 0.18.1
-                      , ouroboros-consensus ^>= 0.16
-                      , ouroboros-consensus-cardano ^>= 0.14
-                      , ouroboros-consensus-diffusion ^>= 0.11
+                      , ouroboros-consensus ^>= 0.16.1
+                      , ouroboros-consensus-cardano ^>= 0.14.3
+                      , ouroboros-consensus-diffusion ^>= 0.14
                       , ouroboros-consensus-protocol
-                      , ouroboros-network-api
-                      , ouroboros-network ^>= 0.12
-                      , ouroboros-network-framework
+                      , ouroboros-network-api ^>= 0.7
+                      , ouroboros-network ^>= 0.15
+                      , ouroboros-network-framework ^>= 0.13
                       , ouroboros-network-protocols ^>= 0.8
                       , prettyprinter
                       , prettyprinter-ansi-terminal

cardano-node/src/Cardano/Node/Run.hs

@@ -374,8 +374,9 @@ handleSimpleNode blockType runP p2pMode tracers nc onKernel = do
 
   dbPath <- canonDbPath nc
 
-  let diffusionArguments :: Diffusion.Arguments Socket      RemoteAddress
-                                                LocalSocket LocalAddress
+  publicPeerSelectionVar <- Diffusion.makePublicPeerSelectionStateVar
+  let diffusionArguments :: Diffusion.Arguments IO Socket      RemoteAddress
+                                                   LocalSocket LocalAddress
       diffusionArguments =
         Diffusion.Arguments {
             Diffusion.daIPv4Address  =
@@ -395,6 +396,7 @@ handleSimpleNode blockType runP p2pMode tracers nc onKernel = do
                 Nothing                         -> Nothing
           , Diffusion.daAcceptedConnectionsLimit = ncAcceptedConnectionsLimit nc
           , Diffusion.daMode = ncDiffusionMode nc
+          , Diffusion.daPublicPeerSelectionVar = publicPeerSelectionVar
           }
 
   ipv4 <- traverse getSocketOrSocketInfoAddr publicIPv4SocketOrAddr

cardano-node/src/Cardano/Node/Tracing/Consistency.hs

@@ -62,7 +62,7 @@ import qualified Ouroboros.Network.NodeToClient as NtC
 import           Ouroboros.Network.NodeToNode (ErrorPolicyTrace (..), RemoteAddress, WithAddr (..))
 import qualified Ouroboros.Network.NodeToNode as NtN
 import           Ouroboros.Network.PeerSelection.Governor (DebugPeerSelection (..),
-                   PeerSelectionCounters (..), TracePeerSelection (..))
+                   PeerSelectionCounters, TracePeerSelection (..))
 import           Ouroboros.Network.PeerSelection.LedgerPeers (TraceLedgerPeers)
 import           Ouroboros.Network.PeerSelection.PeerStateActions (PeerSelectionActionsTrace (..))
 import           Ouroboros.Network.PeerSelection.RootPeersDNS.LocalRootPeers

cardano-node/src/Cardano/Node/Tracing/Documentation.hs

@@ -71,7 +71,7 @@ import qualified Ouroboros.Network.NodeToClient as NtC
 import           Ouroboros.Network.NodeToNode (ErrorPolicyTrace (..), RemoteAddress, WithAddr (..))
 import qualified Ouroboros.Network.NodeToNode as NtN
 import           Ouroboros.Network.PeerSelection.Governor (DebugPeerSelection (..),
-                   PeerSelectionCounters (..), TracePeerSelection (..))
+                   PeerSelectionCounters, TracePeerSelection (..))
 import           Ouroboros.Network.PeerSelection.LedgerPeers (TraceLedgerPeers)
 import           Ouroboros.Network.PeerSelection.PeerStateActions (PeerSelectionActionsTrace (..))
 import           Ouroboros.Network.PeerSelection.RootPeersDNS.LocalRootPeers

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

cardano-node/src/Cardano/Node/Tracing/Tracers.hs

@@ -539,6 +539,11 @@ mkDiffusionTracersExtra configReflection trBase trForward mbTrEKG _trDataPoint t
       ["Net", "PeerSelection"]
     configureTracers configReflection trConfig [peerSelectionCountersTr]
 
+    !churnCountersTr  <-  mkCardanoTracer
+      trBase trForward mbTrEKG
+      ["Net", "Churn"]
+    configureTracers configReflection trConfig [churnCountersTr]
+
     !peerSelectionActionsTr  <-  mkCardanoTracer
       trBase trForward mbTrEKG
       ["Net", "PeerSelection", "Actions"]
@@ -602,6 +607,8 @@ mkDiffusionTracersExtra configReflection trBase trForward mbTrEKG _trDataPoint t
                  traceWith debugPeerSelectionResponderTr
              , P2P.dtTracePeerSelectionCounters = Tracer $
                  traceWith peerSelectionCountersTr
+             , P2P.dtTraceChurnCounters = Tracer $
+                 traceWith churnCountersTr
              , P2P.dtPeerSelectionActionsTracer = Tracer $
                  traceWith peerSelectionActionsTr
              , P2P.dtConnectionManagerTracer = Tracer $