Merge pull request #6111 from IntersectMBO/nm/10.2.1

10.2.1 release preparation
IntersectMBO · Feb 12, 2025 · 52b708f · 52b708f
2 parents dad33d9 + 1e58567
commit 52b708f
Show file tree

Hide file tree

Showing 18 changed files with 106 additions and 72 deletions.
diff --git a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal
@@ -82,7 +82,7 @@ library
   -- IOG dependencies
   --------------------------
   build-depends:
-    , cardano-api             ^>=10.6
+    , cardano-api             ^>=10.8
     , plutus-ledger-api       ^>=1.37
     , plutus-tx               ^>=1.37
     , plutus-tx-plugin        ^>=1.37

diff --git a/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs b/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs
@@ -133,38 +133,40 @@ benchmarkConnectTxSubmit EnvConsts { .. } handshakeTracer submissionTracer codec
        , NtN.peerSharing = ownPeerSharing
        , NtN.query = False
        }) $
-      mkApp $
-      NtN.nodeToNodeProtocols NtN.defaultMiniProtocolParameters
-        NtN.NodeToNodeProtocols
-          { NtN.chainSyncProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
-                                      runPeer
-                                        mempty
-                                        (cChainSyncCodec myCodecs)
-                                        channel
-                                        chainSyncPeerNull
-          , NtN.blockFetchProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
-                                       runPeer
-                                         mempty
-                                         (cBlockFetchCodec myCodecs)
-                                         channel
-                                         (blockFetchClientPeer blockFetchClientNull)
-          , NtN.keepAliveProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \ctx channel ->
-                                        kaClient n2nVer (remoteAddress $ micConnectionId ctx) channel
-          , NtN.txSubmissionProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
-                                        runPeer
-                                           submissionTracer
-                                           (cTxSubmission2Codec myCodecs)
-                                           channel
-                                           (txSubmissionClientPeer myTxSubClient)
-          , NtN.peerSharingProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
+      \n2nData ->
+        mkApp $
+        NtN.nodeToNodeProtocols NtN.defaultMiniProtocolParameters
+          NtN.NodeToNodeProtocols
+            { NtN.chainSyncProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
                                         runPeer
+                                          mempty
+                                          (cChainSyncCodec myCodecs)
+                                          channel
+                                          chainSyncPeerNull
+            , NtN.blockFetchProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
+                                         runPeer
                                            mempty
-                                           (cPeerSharingCodec myCodecs)
+                                           (cBlockFetchCodec myCodecs)
                                            channel
-                                           (peerSharingClientPeer peerSharingClientNull)
-          }
-        n2nVer
-        ownPeerSharing
+                                           (blockFetchClientPeer blockFetchClientNull)
+            , NtN.keepAliveProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \ctx channel ->
+                                          kaClient n2nVer (remoteAddress $ micConnectionId ctx) channel
+            , NtN.txSubmissionProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
+                                          runPeer
+                                             submissionTracer
+                                             (cTxSubmission2Codec myCodecs)
+                                             channel
+                                             (txSubmissionClientPeer myTxSubClient)
+            , NtN.peerSharingProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel ->
+                                          runPeer
+                                             mempty
+                                             (cPeerSharingCodec myCodecs)
+                                             channel
+                                             (peerSharingClientPeer peerSharingClientNull)
+            }
+          n2nVer
+          n2nData
+
   -- Stolen from: Ouroboros/Consensus/Network/NodeToNode.hs
   kaClient
     :: Ord remotePeer

diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal
@@ -106,9 +106,9 @@ library
                       , attoparsec-aeson
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 10.6
+                      , cardano-api ^>= 10.8
                       , cardano-binary
-                      , cardano-cli ^>= 10.3
+                      , cardano-cli ^>= 10.4
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-data

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 2025-01-01T23:24:19Z
-  , cardano-haskell-packages 2025-01-22T16:50:05Z
+  , cardano-haskell-packages 2025-02-11T21:18:23Z
 
 packages:
   cardano-node

diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal
@@ -89,5 +89,5 @@ test-suite chairman-tests
   ghc-options:          -threaded -rtsopts "-with-rtsopts=-N -T"
 
   build-tool-depends:   cardano-node:cardano-node
-                      , cardano-cli:cardano-cli ^>= 10.3
+                      , cardano-cli:cardano-cli ^>= 10.4
                       , cardano-node-chairman:cardano-node-chairman
diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.0
 
 name:                   cardano-node
-version:                10.2
+version:                10.2.1
 synopsis:               The cardano full node
 description:            The cardano full node.
 category:               Cardano,
@@ -145,7 +145,7 @@ library
                       , async
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 10.6
+                      , cardano-api ^>= 10.8
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-git-rev ^>=0.2.2
@@ -188,10 +188,10 @@ library
                       , optparse-applicative-fork >= 0.18.1
                       , ouroboros-consensus ^>= 0.22
                       , ouroboros-consensus-cardano ^>= 0.21
-                      , ouroboros-consensus-diffusion ^>= 0.19
+                      , ouroboros-consensus-diffusion ^>= 0.20
                       , ouroboros-consensus-protocol
                       , ouroboros-network-api ^>= 0.12
-                      , ouroboros-network ^>= 0.19
+                      , ouroboros-network ^>= 0.19.0.3
                       , ouroboros-network-framework
                       , ouroboros-network-protocols ^>= 0.13
                       , prettyprinter

diff --git a/cardano-node/src/Cardano/Node/Configuration/POM.hs b/cardano-node/src/Cardano/Node/Configuration/POM.hs
@@ -42,8 +42,9 @@ import           Ouroboros.Consensus.Node.Genesis (GenesisConfig, GenesisConfigF
 import           Ouroboros.Consensus.Storage.LedgerDB.DiskPolicy (Flag, NumOfDiskSnapshots (..),
                    SnapshotInterval (..))
 import           Ouroboros.Network.Diffusion.Configuration as Configuration
+import qualified Ouroboros.Network.PeerSelection.Governor as PeerSelection
 
-import           Control.Monad (when)
+import           Control.Monad (when, unless)
 import           Data.Aeson
 import qualified Data.Aeson.Types as Aeson
 import           Data.Bifunctor (Bifunctor (..))
@@ -702,6 +703,32 @@ makeNodeConfiguration pnc = do
       $ pncGenesisConfigFlags pnc
   let ncGenesisConfig = mkGenesisConfig mGenesisConfigFlags
 
+  let deadlineTargets =
+        PeerSelectionTargets {
+          targetNumberOfRootPeers = ncDeadlineTargetOfRootPeers,
+          targetNumberOfKnownPeers = ncDeadlineTargetOfKnownPeers,
+          targetNumberOfEstablishedPeers = ncDeadlineTargetOfEstablishedPeers,
+          targetNumberOfActivePeers = ncDeadlineTargetOfActivePeers,
+          targetNumberOfKnownBigLedgerPeers = ncDeadlineTargetOfKnownBigLedgerPeers,
+          targetNumberOfEstablishedBigLedgerPeers = ncDeadlineTargetOfEstablishedBigLedgerPeers,
+          targetNumberOfActiveBigLedgerPeers = ncDeadlineTargetOfActiveBigLedgerPeers }
+      syncTargets = deadlineTargets {
+        targetNumberOfActivePeers = ncSyncTargetOfActivePeers,
+        targetNumberOfKnownBigLedgerPeers = ncSyncTargetOfKnownBigLedgerPeers,
+        targetNumberOfEstablishedBigLedgerPeers = ncSyncTargetOfEstablishedBigLedgerPeers,
+        targetNumberOfActiveBigLedgerPeers = ncSyncTargetOfActiveBigLedgerPeers  }
+
+  unless (PeerSelection.sanePeerSelectionTargets deadlineTargets
+          && PeerSelection.sanePeerSelectionTargets syncTargets) $
+    Left $ "Invalid peer selection targets. Ensure that targets satisfy the "
+           <> "inequalities of known >= established >= active >= 0"
+           <> "for both deadline and sync target groups. The deadline groups start with "
+           <> "TargetNumber... while the sync group starts with SyncTarget... "
+           <> "Additionally, TargetNumberOfEstablishedPeers >= SyncTargetNumberOfActivePeers. "
+           <> "Within each group, the category of big ledger peers is treated independently, "
+           <> "but it too must satisfy the same inequality. Refer to cardano-node wiki page "
+           <> "'understanding config files' for details."
+
   -- TODO: This is not mandatory
   experimentalProtocols <-
     lastToEither "Missing ExperimentalProtocolsEnabled" $

diff --git a/cardano-node/src/Cardano/Node/Run.hs b/cardano-node/src/Cardano/Node/Run.hs
@@ -939,10 +939,7 @@ mkP2PArguments NodeConfiguration {
         targetNumberOfEstablishedBigLedgerPeers = ncDeadlineTargetOfEstablishedBigLedgerPeers,
         targetNumberOfActiveBigLedgerPeers      = ncDeadlineTargetOfActiveBigLedgerPeers
     }
-    syncTargets = PeerSelectionTargets {
-      targetNumberOfRootPeers        = 0,
-      targetNumberOfKnownPeers       = 0,
-      targetNumberOfEstablishedPeers = 0,
+    syncTargets = deadlineTargets {
       targetNumberOfActivePeers               = ncSyncTargetOfActivePeers,
       targetNumberOfKnownBigLedgerPeers       = ncSyncTargetOfKnownBigLedgerPeers,
       targetNumberOfEstablishedBigLedgerPeers = ncSyncTargetOfEstablishedBigLedgerPeers,

diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs
@@ -1754,19 +1754,19 @@ instance (Aeson.ToJSONKey peerAddr, ToJSON peerAddr, Ord peerAddr, Show peerAddr
 
 instance ToJSON PeerSelectionTargets where
   toJSON (PeerSelectionTargets
-            nRootLedgerPeers
-            nKnownLedgerPeers
-            nEstablishedLedgerPeers
-            nActiveLedgerPeers
+            nRootPeers
+            nKnownPeers
+            nEstablishedPeers
+            nActivePeers
             nKnownBigLedgerPeers
             nEstablishedBigLedgerPeers
             nActiveBigLedgerPeers
          ) =
     Aeson.object [ "kind" .= String "PeerSelectionTargets"
-                 , "targetRootLedgerPeers" .= nRootLedgerPeers
-                 , "targetKnownLedgerPeers" .= nKnownLedgerPeers
-                 , "targetEstablishedLedgerPeers" .= nEstablishedLedgerPeers
-                 , "targetActiveLedgerPeers" .= nActiveLedgerPeers
+                 , "targetRootPeers" .= nRootPeers
+                 , "targetKnownPeers" .= nKnownPeers
+                 , "targetEstablishedPeers" .= nEstablishedPeers
+                 , "targetActivePeers" .= nActivePeers
 
                  , "targetKnownBigLedgerPeers" .= nKnownBigLedgerPeers
                  , "targetEstablishedBigLedgerPeers" .= nEstablishedBigLedgerPeers

diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal
@@ -39,9 +39,9 @@ library
                       , aeson
                       , async
                       , bytestring
-                      , cardano-api ^>= 10.6
+                      , cardano-api ^>= 10.8
                       , cardano-binary
-                      , cardano-cli ^>= 10.3
+                      , cardano-cli ^>= 10.4
                       , cardano-crypto-class ^>= 2.1.2
                       , http-media
                       , iohk-monitoring

diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal
@@ -35,8 +35,8 @@ library
                       , aeson-pretty
                       , ansi-terminal
                       , bytestring
-                      , cardano-api ^>= 10.6
-                      , cardano-cli:{cardano-cli, cardano-cli-test-lib} ^>= 10.3
+                      , cardano-api ^>= 10.8
+                      , cardano-cli:{cardano-cli, cardano-cli-test-lib} ^>= 10.4
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-git-rev ^>= 0.2.2

diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs
@@ -447,6 +447,14 @@ hprop_cli_queries = integrationWorkspace "cli-queries" $ \tempAbsBasePath' -> H.
       -- TODO @cardano-cli team
       pure ()
 
+    TestQueryRatifyStateCmd -> do
+      -- TODO @cardano-cli team
+      pure ()
+
+    TestQueryFuturePParamsCmd -> do
+      -- TODO @cardano-cli team
+      pure ()
+
   where
   -- | Wait for the part of the epoch when futurePParams are known
   waitForFuturePParamsToStabilise

diff --git a/cardano-tracer/src/Cardano/Tracer/Acceptors/Client.hs b/cardano-tracer/src/Cardano/Tracer/Acceptors/Client.hs
@@ -109,7 +109,7 @@ doConnectToForwarder snocket address netMagic timeLimits app = do
     (simpleSingletonVersions
        ForwardingV_1
        (ForwardingVersionData $ NetworkMagic netMagic)
-       app
+       (const app)
     )
     Nothing
     address

diff --git a/cardano-tracer/src/Cardano/Tracer/Acceptors/Server.hs b/cardano-tracer/src/Cardano/Tracer/Acceptors/Server.hs
@@ -123,7 +123,7 @@ doListenToForwarder snocket address netMagic timeLimits app = do
       (simpleSingletonVersions
         ForwardingV_1
         (ForwardingVersionData $ NetworkMagic netMagic)
-        (SomeResponderApplication app)
+        (\_ -> SomeResponderApplication app)
       )
       nullErrorPolicies
       $ \_ serverAsync -> wait serverAsync -- Block until async exception.

diff --git a/cardano-tracer/test/Cardano/Tracer/Test/Forwarder.hs b/cardano-tracer/test/Cardano/Tracer/Test/Forwarder.hs
@@ -167,10 +167,10 @@ doConnectToAcceptor TestSetup{..} snocket muxBearer address timeLimits (ekgConfi
       (simpleSingletonVersions
          ForwardingV_1
          (ForwardingVersionData $ unI tsNetworkMagic)
-         (forwarderApp [ (forwardEKGMetrics ekgConfig store,       1)
-                       , (forwardTraceObjectsInit tfConfig sink,   2)
-                       , (forwardDataPointsInit dpfConfig dpStore, 3)
-                       ]
+         (const $ forwarderApp [ (forwardEKGMetrics ekgConfig store,       1)
+                               , (forwardTraceObjectsInit tfConfig sink,   2)
+                               , (forwardDataPointsInit dpfConfig dpStore, 3)
+                               ]
          )
       )
       Nothing
@@ -238,8 +238,8 @@ doListenToAcceptor TestSetup{..}
               (HandshakeCallbacks acceptableVersion queryVersion)
               (simpleSingletonVersions
                  ForwardingV_1
-                 (ForwardingVersionData $ unI tsNetworkMagic) -- Taken from mainnet shelley genesis file.
-                 (SomeResponderApplication $
+                 (ForwardingVersionData $ unI tsNetworkMagic)
+                 (const $ SomeResponderApplication $
                     forwarderApp [ (forwardEKGMetricsResp ekgConfig store,   1)
                                  , (forwardTraceObjectsResp tfConfig sink,   2)
                                  , (forwardDataPointsResp dpfConfig dpStore, 3)

diff --git a/flake.lock b/flake.lock
diff --git a/trace-dispatcher/src/Cardano/Logging/Forwarding.hs b/trace-dispatcher/src/Cardano/Logging/Forwarding.hs
@@ -222,10 +222,10 @@ doConnectToAcceptor magic snocket makeBearer configureSocket address timeLimits
     (simpleSingletonVersions
        ForwardingV_1
        (ForwardingVersionData magic)
-       (forwarderApp [ (forwardEKGMetricsRun,                      1)
-                     , (forwardTraceObjectsInit tfConfig  sink,    2)
-                     , (forwardDataPointsInit   dpfConfig dpStore, 3)
-                     ]
+       (const $ forwarderApp [ (forwardEKGMetricsRun,                      1)
+                             , (forwardTraceObjectsInit tfConfig  sink,    2)
+                             , (forwardDataPointsInit   dpfConfig dpStore, 3)
+                             ]
        )
     )
     Nothing
@@ -294,7 +294,7 @@ doListenToAcceptor magic snocket makeBearer configureSocket address timeLimits
             (simpleSingletonVersions
                ForwardingV_1
                (ForwardingVersionData magic)
-               (SomeResponderApplication $
+               (const $ SomeResponderApplication $
                  forwarderApp [ (forwardEKGMetricsRespRun,                  1)
                               , (forwardTraceObjectsResp tfConfig  sink,    2)
                               , (forwardDataPointsResp   dpfConfig dpStore, 3)

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.15
+                      , ouroboros-network-framework ^>= 0.16
                       , serialise
                       , stm
                       , text