Merge pull request #6218 from IntersectMBO/jordan/bump-dependencies-20250515

Bump consensus and network dependencies in preparation for node 10.5

Author: Jimbo4350

bench/locli/locli.cabal

@@ -126,7 +126,7 @@ library
                       , hashable
                       , optparse-applicative-fork >= 0.18.1
                       , ouroboros-consensus
-                      , ouroboros-network-api ^>= 0.13
+                      , ouroboros-network-api ^>= 0.14
                       , sop-core
                       , split
                       , sqlite-easy >= 1.1.0.1

cabal.project

@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2025-04-16T18:30:40Z
-  , cardano-haskell-packages 2025-05-15T08:36:14Z
+  , cardano-haskell-packages 2025-05-16T20:03:45Z
 
 packages:
   cardano-node
@@ -59,6 +59,7 @@ package plutus-scripts-bench
 
 allow-newer:
   , katip:Win32
+  , ekg-forward:ouroboros-network-framework
   , ekg-wai:time
 
 -- IMPORTANT
@@ -90,3 +91,10 @@ if impl (ghc >= 9.12)
     -- https://github.com/haskell-servant/servant/pull/1810
     , servant:base
     , servant-server:base
+
+    , cardano-ping:base
+    , network-mux:base
+    , ouroboros-network:base
+    , ouroboros-network-api:base
+    , ouroboros-network-framework:base
+    , ouroboros-network-protocols:base

cardano-node/ChangeLog.md

@@ -9,6 +9,8 @@
 
 - Lower the log severity from Error to Info for TracePromoteWarmBigLedgerPeerAborted and ResponderStartFailure
 
+- Change to exit with 0 rather than 1 when a SIGTERM is caught.
+
 - Add a new configuration field for fork-policy.
 
 - Optionally support lightweight checkpointing.

cardano-node/cardano-node.cabal

@@ -1,4 +1,4 @@
-cabal-version: 3.0
+cabal-version: 3.8
 
 name:                   cardano-node
 version:                10.4.1
@@ -192,12 +192,12 @@ library
                       , network-mux >= 0.5
                       , nothunks
                       , optparse-applicative-fork >= 0.18.1
-                      , ouroboros-consensus ^>= 0.26.0.1
+                      , ouroboros-consensus ^>= 0.27
                       , ouroboros-consensus-cardano ^>= 0.25
-                      , ouroboros-consensus-diffusion ^>= 0.22
+                      , ouroboros-consensus-diffusion ^>= 0.23
                       , ouroboros-consensus-protocol
-                      , ouroboros-network-api ^>= 0.13
-                      , ouroboros-network ^>= 0.20
+                      , ouroboros-network-api ^>= 0.14
+                      , ouroboros-network
                       , ouroboros-network-framework
                       , ouroboros-network-protocols ^>= 0.14
                       , prettyprinter

cardano-node/src/Cardano/Node/Configuration/POM.hs

@@ -160,6 +160,8 @@ data NodeConfiguration
          --
        , ncTimeWaitTimeout       :: DiffTime
 
+       , ncEgressPollInterval    :: DiffTime
+
          -- | Timeout override for ChainSync, see
          -- 'Ouroboros.Network.Protocol.ChainSync.Codec.ChainSyncTimeout'
        , ncChainSyncIdleTimeout :: TimeoutOverride
@@ -254,6 +256,7 @@ data PartialNodeConfiguration
          -- Network timeouts
        , pncProtocolIdleTimeout   :: !(Last DiffTime)
        , pncTimeWaitTimeout       :: !(Last DiffTime)
+       , pncEgressPollInterval    :: !(Last DiffTime)
 
        , pncChainSyncIdleTimeout      :: !(Last DiffTime)
 
@@ -357,6 +360,7 @@ instance FromJSON PartialNodeConfiguration where
       -- Network timeouts
       pncProtocolIdleTimeout   <- Last <$> v .:? "ProtocolIdleTimeout"
       pncTimeWaitTimeout       <- Last <$> v .:? "TimeWaitTimeout"
+      pncEgressPollInterval    <- Last <$> v .:? "EgressPollInterval"
 
 
       -- AcceptedConnectionsLimit
@@ -423,6 +427,7 @@ instance FromJSON PartialNodeConfiguration where
            , pncProtocolIdleTimeout
            , pncTimeWaitTimeout
            , pncChainSyncIdleTimeout
+           , pncEgressPollInterval
            , pncAcceptedConnectionsLimit
            , pncDeadlineTargetOfRootPeers
            , pncDeadlineTargetOfKnownPeers
@@ -651,6 +656,7 @@ defaultPartialNodeConfiguration =
             noDeprecatedOptions
     , pncProtocolIdleTimeout   = Last (Just 5)
     , pncTimeWaitTimeout       = Last (Just 60)
+    , pncEgressPollInterval    = Last (Just 0)
     , pncAcceptedConnectionsLimit =
         Last
       $ Just
@@ -661,15 +667,15 @@ defaultPartialNodeConfiguration =
         }
     , pncDeadlineTargetOfRootPeers        = Last (Just deadlineRoots)
     , pncDeadlineTargetOfKnownPeers       = Last (Just deadlineKnown)
-    , pncDeadlineTargetOfEstablishedPeers = Last (Just deadlineEstablished)
+    , pncDeadlineTargetOfEstablishedPeers = Last (Just 30) -- ^ TODO reset to deadlineEstablished for next o-n-release
     , pncDeadlineTargetOfActivePeers      = Last (Just deadlineActive)
     , pncChainSyncIdleTimeout           = mempty
     , pncDeadlineTargetOfKnownBigLedgerPeers       = Last (Just deadlineBigKnown)
     , pncDeadlineTargetOfEstablishedBigLedgerPeers = Last (Just deadlineBigEst)
     , pncDeadlineTargetOfActiveBigLedgerPeers      = Last (Just deadlineBigAct)
     , pncSyncTargetOfActivePeers        = Last (Just syncActive)
     , pncSyncTargetOfKnownBigLedgerPeers       = Last (Just syncBigKnown)
-    , pncSyncTargetOfEstablishedBigLedgerPeers = Last (Just syncBigEst)
+    , pncSyncTargetOfEstablishedBigLedgerPeers = Last (Just 40) -- ^ TODO reset to syncBigEst for next o-n-release
     , pncSyncTargetOfActiveBigLedgerPeers      = Last (Just syncBigAct)
     , pncMinBigLedgerPeersForTrustedState = Last (Just Cardano.defaultNumberOfBigLedgerPeers)
     , pncConsensusMode = Last (Just Ouroboros.defaultConsensusMode)
@@ -682,15 +688,15 @@ defaultPartialNodeConfiguration =
     PeerSelectionTargets {
       targetNumberOfRootPeers = deadlineRoots,
       targetNumberOfKnownPeers = deadlineKnown,
-      targetNumberOfEstablishedPeers = deadlineEstablished,
+      targetNumberOfEstablishedPeers = _deadlineEstablished,
       targetNumberOfActivePeers = deadlineActive,
       targetNumberOfKnownBigLedgerPeers = deadlineBigKnown,
       targetNumberOfEstablishedBigLedgerPeers = deadlineBigEst,
       targetNumberOfActiveBigLedgerPeers = deadlineBigAct } = Ouroboros.defaultDeadlineTargets
     PeerSelectionTargets {
       targetNumberOfActivePeers = syncActive,
       targetNumberOfKnownBigLedgerPeers = syncBigKnown,
-      targetNumberOfEstablishedBigLedgerPeers = syncBigEst,
+      targetNumberOfEstablishedBigLedgerPeers = _syncBigEst,
       targetNumberOfActiveBigLedgerPeers = syncBigAct } = Cardano.defaultSyncTargets
 
 lastOption :: Parser a -> Parser (Last a)
@@ -759,6 +765,9 @@ makeNodeConfiguration pnc = do
   ncTimeWaitTimeout <-
     lastToEither "Missing TimeWaitTimeout"
     $ pncTimeWaitTimeout pnc
+  ncEgressPollInterval <-
+    lastToEither "Missing EgressPollInterval"
+    $ pncEgressPollInterval pnc
   ncAcceptedConnectionsLimit <-
     lastToEither "Missing AcceptedConnectionsLimit" $
       pncAcceptedConnectionsLimit pnc
@@ -845,6 +854,7 @@ makeNodeConfiguration pnc = do
              , ncProtocolIdleTimeout
              , ncTimeWaitTimeout
              , ncChainSyncIdleTimeout
+             , ncEgressPollInterval
              , ncAcceptedConnectionsLimit
              , ncDeadlineTargetOfRootPeers
              , ncDeadlineTargetOfKnownPeers

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

@@ -109,6 +109,7 @@ nodeRunParser = do
            , pncLedgerDbConfig = mempty
            , pncProtocolIdleTimeout = mempty
            , pncTimeWaitTimeout = mempty
+           , pncEgressPollInterval = mempty
            , pncChainSyncIdleTimeout = mempty
            , pncAcceptedConnectionsLimit = mempty
            , pncDeadlineTargetOfRootPeers = mempty

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

@@ -59,7 +59,7 @@ import           Cardano.Node.Tracing.StateRep (NodeState (NodeKernelOnline))
 import           Cardano.Node.Tracing.Tracers.NodeVersion (getNodeVersion)
 import           Cardano.Node.Tracing.Tracers.Startup (getStartupInfo)
 import           Cardano.Node.Types
-import           Cardano.Prelude (FatalError (..), bool, (:~:) (..), stderr, )
+import           Cardano.Prelude (ExitCode (..), FatalError (..), bool, (:~:) (..))
 import           Cardano.Tracing.Config (TraceOptions (..), TraceSelection (..))
 import           Cardano.Tracing.Tracers
 
@@ -218,7 +218,7 @@ installSigTermHandler = do
     Signals.sigTERM
     (Signals.CatchOnce $ do
       runThreadIdMay <- deRefWeak runThreadIdWk
-      forM_ runThreadIdMay $ \runThreadId -> killThread runThreadId
+      forM_ runThreadIdMay $ \runThreadId -> Exception.throwTo runThreadId ExitSuccess
     )
     Nothing
 #endif
@@ -450,6 +450,7 @@ handleSimpleNode blockType runP p2pMode tracers nc onKernel = do
           , Diffusion.daAcceptedConnectionsLimit = ncAcceptedConnectionsLimit nc
           , Diffusion.daMode                     = ncDiffusionMode nc
           , Diffusion.daPublicPeerSelectionVar   = publicPeerSelectionVar
+          , Diffusion.daEgressPollInterval       = ncEgressPollInterval nc
           }
 
   ipv4 <- traverse getSocketOrSocketInfoAddr publicIPv4SocketOrAddr
@@ -1049,7 +1050,7 @@ mkP2PArguments nForkPolicy cForkPolicy NodeConfiguration {
       Cardano.Churn.ExtraArguments {
         Cardano.Churn.modeVar            = churnModeVar
       , Cardano.Churn.readFetchMode      = getFetchMode
-      , Cardano.Churn.genesisPeerTargets = peerSelectionTargets
+      , Cardano.Churn.genesisPeerTargets = genesisSelectionTargets
       , Cardano.Churn.readUseBootstrap   = daReadUseBootstrapPeers
       , Cardano.Churn.consensusMode      = ncConsensusMode
       }

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

@@ -97,6 +97,11 @@ instance LogFormatting Mux.Trace where
       , "msg"  .= String "Bearer Receive Start"
       , "length" .= String (showT len)
       ]
+    forMachine _dtal (Mux.TraceRecvRaw len) = mconcat
+      [ "kind" .= String "Mux.TraceRecvRaw"
+      , "msg"  .= String "Bearer Receive Raw"
+      , "length" .= String (showT len)
+      ]
     forMachine _dtal (Mux.TraceRecvEnd len) = mconcat
       [ "kind" .= String "Mux.TraceRecvEnd"
       , "msg"  .= String "Bearer Receive End"
@@ -268,6 +273,8 @@ instance LogFormatting Mux.Trace where
         d sp so dqs dqvm dqvs estR sdud
     forHuman (Mux.TraceRecvStart len) =
       sformat ("Bearer Receive Start: length " % int) len
+    forHuman (Mux.TraceRecvRaw len) =
+      sformat ("Bearer Receive Raw: length " % int) len
     forHuman (Mux.TraceRecvEnd len) =
       sformat ("Bearer Receive End: length " % int) len
     forHuman (Mux.TraceSendStart SDUHeader { mhTimestamp, mhNum, mhDir, mhLength }) =
@@ -343,6 +350,8 @@ instance MetaTrace Mux.Trace where
       Namespace [] ["RecvHeaderEnd"]
     namespaceFor Mux.TraceRecvStart {}             =
       Namespace [] ["RecvStart"]
+    namespaceFor Mux.TraceRecvRaw {}             =
+      Namespace [] ["RecvRaw"]
     namespaceFor Mux.TraceRecvEnd {}               =
       Namespace [] ["RecvEnd"]
     namespaceFor Mux.TraceSendStart {}             =
@@ -399,6 +408,7 @@ instance MetaTrace Mux.Trace where
       Namespace [] ["TCPInfo"]
 
     severityFor (Namespace _ ["RecvHeaderStart"]) _       = Just Debug
+    severityFor (Namespace _ ["RecvRaw"]) _               = Just Debug
     severityFor (Namespace _ ["RecvHeaderEnd"]) _         = Just Debug
     severityFor (Namespace _ ["RecvStart"]) _             = Just Debug
     severityFor (Namespace _ ["RecvEnd"]) _               = Just Debug
@@ -433,6 +443,8 @@ instance MetaTrace Mux.Trace where
 
     documentFor (Namespace _ ["RecvHeaderStart"])       = Just
       "Bearer receive header start."
+    documentFor (Namespace _ ["RecvRaw"])               = Just
+      "Bearer receive raw."
     documentFor (Namespace _ ["RecvHeaderEnd"])         = Just
       "Bearer receive header end."
     documentFor (Namespace _ ["RecvStart"])             = Just
@@ -497,6 +509,7 @@ instance MetaTrace Mux.Trace where
 
     allNamespaces = [
         Namespace [] ["RecvHeaderStart"]
+      , Namespace [] ["RecvRaw"]
       , Namespace [] ["RecvHeaderEnd"]
       , Namespace [] ["RecvStart"]
       , Namespace [] ["RecvEnd"]