Added ConsensusMode option and Genesis targets for diffusion governors.

The ConsensusMode configuration option determines whether support for
Genesis syncing is enabled. If this flag is GenesisMode, alternate
targets for active peers (non- big ledger) and all big ledger targets
is used by the peer selection and churn governors in the diffusion
layer. These targets are in effect when ledger state is deemed
`TooOld` by consensus layer. The large active big ledger peer targets
crucially depend on chain skipping to maintain performance
requirements. Otherwise, in PraosMode, the legacy algorithm with
a single set of targets is employed.

Author: crocodile-dentist

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

@@ -36,8 +36,7 @@ import           Ouroboros.Consensus.Mempool (MempoolCapacityBytes (..),
 import qualified Ouroboros.Consensus.Node as Consensus (NetworkP2PMode (..))
 import           Ouroboros.Consensus.Storage.LedgerDB.DiskPolicy (NumOfDiskSnapshots (..),
                    SnapshotInterval (..))
-import           Ouroboros.Network.NodeToNode (AcceptedConnectionsLimit (..), DiffusionMode (..))
-import           Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing (..))
+import           Ouroboros.Network.Diffusion.Configuration as Configuration
 
 import           Control.Monad (when)
 import           Data.Aeson
@@ -149,13 +148,22 @@ data NodeConfiguration
        , ncAcceptedConnectionsLimit :: !AcceptedConnectionsLimit
 
          -- P2P governor targets
-       , ncTargetNumberOfRootPeers        :: Int
-       , ncTargetNumberOfKnownPeers       :: Int
-       , ncTargetNumberOfEstablishedPeers :: Int
-       , ncTargetNumberOfActivePeers      :: Int
-       , ncTargetNumberOfKnownBigLedgerPeers       :: Int
-       , ncTargetNumberOfEstablishedBigLedgerPeers :: Int
-       , ncTargetNumberOfActiveBigLedgerPeers      :: Int
+       , ncDeadlineTargetOfRootPeers        :: !Int
+       , ncDeadlineTargetOfKnownPeers       :: !Int
+       , ncDeadlineTargetOfEstablishedPeers :: !Int
+       , ncDeadlineTargetOfActivePeers      :: !Int
+       , ncDeadlineTargetOfKnownBigLedgerPeers       :: !Int
+       , ncDeadlineTargetOfEstablishedBigLedgerPeers :: !Int
+       , ncDeadlineTargetOfActiveBigLedgerPeers      :: !Int
+       , ncSyncTargetOfActivePeers        :: !Int
+       , ncSyncTargetOfKnownBigLedgerPeers       :: !Int
+       , ncSyncTargetOfEstablishedBigLedgerPeers :: !Int
+       , ncSyncTargetOfActiveBigLedgerPeers      :: !Int
+       , ncSyncMinTrusted :: !MinBigLedgerPeersForTrustedState
+
+         -- Used to determine which set of peer targets to use
+         -- by the diffusion layer when syncing
+       , ncConsensusMode :: !ConsensusMode
 
          -- Enable experimental P2P mode
        , ncEnableP2P :: SomeNetworkP2PMode
@@ -184,7 +192,7 @@ data PartialNodeConfiguration
        , pncProtocolConfig :: !(Last NodeProtocolConfiguration)
 
          -- Node parameters, not protocol-specific:
-       , pncDiffusionMode      :: !(Last DiffusionMode  )
+       , pncDiffusionMode      :: !(Last DiffusionMode)
        , pncNumOfDiskSnapshots :: !(Last NumOfDiskSnapshots)
        , pncSnapshotInterval   :: !(Last SnapshotInterval)
        , pncExperimentalProtocolsEnabled :: !(Last Bool)
@@ -212,13 +220,21 @@ data PartialNodeConfiguration
        , pncAcceptedConnectionsLimit :: !(Last AcceptedConnectionsLimit)
 
          -- P2P governor targets
-       , pncTargetNumberOfRootPeers        :: !(Last Int)
-       , pncTargetNumberOfKnownPeers       :: !(Last Int)
-       , pncTargetNumberOfEstablishedPeers :: !(Last Int)
-       , pncTargetNumberOfActivePeers      :: !(Last Int)
-       , pncTargetNumberOfKnownBigLedgerPeers       :: !(Last Int)
-       , pncTargetNumberOfEstablishedBigLedgerPeers :: !(Last Int)
-       , pncTargetNumberOfActiveBigLedgerPeers      :: !(Last Int)
+       , pncDeadlineTargetOfRootPeers        :: !(Last Int)
+       , pncDeadlineTargetOfKnownPeers       :: !(Last Int)
+       , pncDeadlineTargetOfEstablishedPeers :: !(Last Int)
+       , pncDeadlineTargetOfActivePeers      :: !(Last Int)
+       , pncDeadlineTargetOfKnownBigLedgerPeers              :: !(Last Int)
+       , pncDeadlineTargetOfEstablishedBigLedgerPeers        :: !(Last Int)
+       , pncDeadlineTargetOfActiveBigLedgerPeers             :: !(Last Int)
+       , pncSyncTargetOfActivePeers               :: !(Last Int)
+       , pncSyncTargetOfKnownBigLedgerPeers       :: !(Last Int)
+       , pncSyncTargetOfEstablishedBigLedgerPeers :: !(Last Int)
+       , pncSyncTargetOfActiveBigLedgerPeers      :: !(Last Int)
+       , pncSyncMinTrusted :: !(Last MinBigLedgerPeersForTrustedState)
+
+         -- Consensus mode for diffusion layer
+       , pncConsensusMode :: !(Last ConsensusMode)
 
          -- Enable experimental P2P mode
        , pncEnableP2P :: !(Last NetworkP2PMode)
@@ -299,13 +315,20 @@ instance FromJSON PartialNodeConfiguration where
         <- Last <$> v .:? "AcceptedConnectionsLimit"
 
       -- P2P Governor parameters, with conservative defaults.
-      pncTargetNumberOfRootPeers        <- Last <$> v .:? "TargetNumberOfRootPeers"
-      pncTargetNumberOfKnownPeers       <- Last <$> v .:? "TargetNumberOfKnownPeers"
-      pncTargetNumberOfEstablishedPeers <- Last <$> v .:? "TargetNumberOfEstablishedPeers"
-      pncTargetNumberOfActivePeers      <- Last <$> v .:? "TargetNumberOfActivePeers"
-      pncTargetNumberOfKnownBigLedgerPeers       <- Last <$> v .:? "TargetNumberOfKnownBigLedgerPeers"
-      pncTargetNumberOfEstablishedBigLedgerPeers <- Last <$> v .:? "TargetNumberOfEstablishedBigLedgerPeers"
-      pncTargetNumberOfActiveBigLedgerPeers      <- Last <$> v .:? "TargetNumberOfActiveBigLedgerPeers"
+      pncDeadlineTargetOfRootPeers        <- Last <$> v .:? "TargetNumberOfRootPeers"
+      pncDeadlineTargetOfKnownPeers       <- Last <$> v .:? "TargetNumberOfKnownPeers"
+      pncDeadlineTargetOfEstablishedPeers <- Last <$> v .:? "TargetNumberOfEstablishedPeers"
+      pncDeadlineTargetOfActivePeers      <- Last <$> v .:? "TargetNumberOfActivePeers"
+      pncDeadlineTargetOfKnownBigLedgerPeers       <- Last <$> v .:? "TargetNumberOfKnownBigLedgerPeers"
+      pncDeadlineTargetOfEstablishedBigLedgerPeers <- Last <$> v .:? "TargetNumberOfEstablishedBigLedgerPeers"
+      pncDeadlineTargetOfActiveBigLedgerPeers      <- Last <$> v .:? "TargetNumberOfActiveBigLedgerPeers"
+      pncSyncTargetOfActivePeers        <- Last <$> v .:? "SyncTargetNumberOfActivePeers"
+      pncSyncTargetOfKnownBigLedgerPeers       <- Last <$> v .:? "SyncTargetNumberOfKnownBigLedgerPeers"
+      pncSyncTargetOfEstablishedBigLedgerPeers <- Last <$> v .:? "SyncTargetNumberOfEstablishedBigLedgerPeers"
+      pncSyncTargetOfActiveBigLedgerPeers      <- Last <$> v .:? "SyncTargetNumberOfActiveBigLedgerPeers"
+      pncSyncMinTrusted <- Last <$> v .:? "SyncMinNumberOfBigLedgerPeersForTrustedState"
+
+      pncConsensusMode <- Last <$> v .:? "ConsensusMode"
 
       pncChainSyncIdleTimeout      <- Last <$> v .:? "ChainSyncIdleTimeout"
 
@@ -319,7 +342,7 @@ instance FromJSON PartialNodeConfiguration where
 
       -- Peer Sharing
       -- DISABLED BY DEFAULT
-      pncPeerSharing <- Last <$> v .:? "PeerSharing" .!= Just PeerSharingDisabled
+      pncPeerSharing <- Last <$> v .:? "PeerSharing" .!= Just Configuration.PeerSharingDisabled
 
       pure PartialNodeConfiguration {
              pncProtocolConfig
@@ -346,13 +369,19 @@ instance FromJSON PartialNodeConfiguration where
            , pncTimeWaitTimeout
            , pncChainSyncIdleTimeout
            , pncAcceptedConnectionsLimit
-           , pncTargetNumberOfRootPeers
-           , pncTargetNumberOfKnownPeers
-           , pncTargetNumberOfEstablishedPeers
-           , pncTargetNumberOfActivePeers
-           , pncTargetNumberOfKnownBigLedgerPeers
-           , pncTargetNumberOfEstablishedBigLedgerPeers
-           , pncTargetNumberOfActiveBigLedgerPeers
+           , pncDeadlineTargetOfRootPeers
+           , pncDeadlineTargetOfKnownPeers
+           , pncDeadlineTargetOfEstablishedPeers
+           , pncDeadlineTargetOfActivePeers
+           , pncDeadlineTargetOfKnownBigLedgerPeers
+           , pncDeadlineTargetOfEstablishedBigLedgerPeers
+           , pncDeadlineTargetOfActiveBigLedgerPeers
+           , pncSyncTargetOfActivePeers
+           , pncSyncTargetOfKnownBigLedgerPeers
+           , pncSyncTargetOfEstablishedBigLedgerPeers
+           , pncSyncTargetOfActiveBigLedgerPeers
+           , pncSyncMinTrusted
+           , pncConsensusMode
            , pncEnableP2P
            , pncPeerSharing
            }
@@ -521,17 +550,37 @@ defaultPartialNodeConfiguration =
         , acceptedConnectionsSoftLimit = 384
         , acceptedConnectionsDelay     = 5
         }
-    , pncTargetNumberOfRootPeers        = Last (Just 85)
-    , pncTargetNumberOfKnownPeers       = Last (Just 85)
-    , pncTargetNumberOfEstablishedPeers = Last (Just 40)
-    , pncTargetNumberOfActivePeers      = Last (Just 15)
+    , pncDeadlineTargetOfRootPeers        = Last (Just deadlineRoots)
+    , pncDeadlineTargetOfKnownPeers       = Last (Just deadlineKnown)
+    , pncDeadlineTargetOfEstablishedPeers = Last (Just deadlineEstablished)
+    , pncDeadlineTargetOfActivePeers      = Last (Just deadlineActive)
     , pncChainSyncIdleTimeout           = mempty
-    , pncTargetNumberOfKnownBigLedgerPeers       = Last (Just 15)
-    , pncTargetNumberOfEstablishedBigLedgerPeers = Last (Just 10)
-    , pncTargetNumberOfActiveBigLedgerPeers      = Last (Just 5)
-    , pncEnableP2P                      = Last (Just EnabledP2PMode)
-    , pncPeerSharing                    = Last (Just PeerSharingDisabled)
+    , pncDeadlineTargetOfKnownBigLedgerPeers       = Last (Just deadlineBigKnown)
+    , pncDeadlineTargetOfEstablishedBigLedgerPeers = Last (Just deadlineBigEst)
+    , pncDeadlineTargetOfActiveBigLedgerPeers      = Last (Just deadlineBigAct)
+    , pncSyncTargetOfActivePeers        = Last (Just syncActive)
+    , pncSyncTargetOfKnownBigLedgerPeers       = Last (Just syncBigKnown)
+    , pncSyncTargetOfEstablishedBigLedgerPeers = Last (Just syncBigEst)
+    , pncSyncTargetOfActiveBigLedgerPeers      = Last (Just syncBigAct)
+    , pncSyncMinTrusted = Last (Just defaultMinBigLedgerPeersForTrustedState)
+    , pncConsensusMode = mempty
+    , pncEnableP2P     = Last (Just EnabledP2PMode)
+    , pncPeerSharing   = Last (Just Configuration.PeerSharingDisabled)
     }
+  where
+    Configuration.PeerSelectionTargets {
+      targetNumberOfRootPeers = deadlineRoots,
+      targetNumberOfKnownPeers = deadlineKnown,
+      targetNumberOfEstablishedPeers = deadlineEstablished,
+      targetNumberOfActivePeers = deadlineActive,
+      targetNumberOfKnownBigLedgerPeers = deadlineBigKnown,
+      targetNumberOfEstablishedBigLedgerPeers = deadlineBigEst,
+      targetNumberOfActiveBigLedgerPeers = deadlineBigAct } = defaultDeadlineTargets
+    Configuration.PeerSelectionTargets {
+      targetNumberOfActivePeers = syncActive,
+      targetNumberOfKnownBigLedgerPeers = syncBigKnown,
+      targetNumberOfEstablishedBigLedgerPeers = syncBigEst,
+      targetNumberOfActiveBigLedgerPeers = syncBigAct } = defaultSyncTargets
 
 lastOption :: Parser a -> Parser (Last a)
 lastOption = fmap Last . optional
@@ -553,27 +602,45 @@ makeNodeConfiguration pnc = do
   shutdownConfig <- lastToEither "Missing ShutdownConfig" $ pncShutdownConfig pnc
   socketConfig <- lastToEither "Missing SocketConfig" $ pncSocketConfig pnc
 
-  ncTargetNumberOfRootPeers <-
+  ncDeadlineTargetOfRootPeers <-
     lastToEither "Missing TargetNumberOfRootPeers"
-    $ pncTargetNumberOfRootPeers pnc
-  ncTargetNumberOfKnownPeers <-
+    $ pncDeadlineTargetOfRootPeers pnc
+  ncDeadlineTargetOfKnownPeers <-
     lastToEither "Missing TargetNumberOfKnownPeers"
-    $ pncTargetNumberOfKnownPeers pnc
-  ncTargetNumberOfEstablishedPeers <-
+    $ pncDeadlineTargetOfKnownPeers pnc
+  ncDeadlineTargetOfEstablishedPeers <-
     lastToEither "Missing TargetNumberOfEstablishedPeers"
-    $ pncTargetNumberOfEstablishedPeers pnc
-  ncTargetNumberOfActivePeers <-
+    $ pncDeadlineTargetOfEstablishedPeers pnc
+  ncDeadlineTargetOfActivePeers <-
     lastToEither "Missing TargetNumberOfActivePeers"
-    $ pncTargetNumberOfActivePeers pnc
-  ncTargetNumberOfKnownBigLedgerPeers <-
+    $ pncDeadlineTargetOfActivePeers pnc
+  ncDeadlineTargetOfKnownBigLedgerPeers <-
     lastToEither "Missing TargetNumberOfKnownBigLedgerPeers"
-    $ pncTargetNumberOfKnownBigLedgerPeers pnc
-  ncTargetNumberOfEstablishedBigLedgerPeers <-
+    $ pncDeadlineTargetOfKnownBigLedgerPeers pnc
+  ncDeadlineTargetOfEstablishedBigLedgerPeers <-
     lastToEither "Missing TargetNumberOfEstablishedBigLedgerPeers"
-    $ pncTargetNumberOfEstablishedBigLedgerPeers pnc
-  ncTargetNumberOfActiveBigLedgerPeers <-
+    $ pncDeadlineTargetOfEstablishedBigLedgerPeers pnc
+  ncDeadlineTargetOfActiveBigLedgerPeers <-
     lastToEither "Missing TargetNumberOfActiveBigLedgerPeers"
-    $ pncTargetNumberOfActiveBigLedgerPeers pnc
+    $ pncDeadlineTargetOfActiveBigLedgerPeers pnc
+  ncSyncTargetOfActivePeers <-
+    lastToEither "Missing SyncTargetNumberOfActivePeers"
+    $ pncSyncTargetOfActivePeers pnc
+  ncSyncTargetOfKnownBigLedgerPeers <-
+    lastToEither "Missing SyncTargetNumberOfKnownBigLedgerPeers"
+    $ pncSyncTargetOfKnownBigLedgerPeers pnc
+  ncSyncTargetOfEstablishedBigLedgerPeers <-
+    lastToEither "Missing SyncTargetNumberOfEstablishedBigLedgerPeers"
+    $ pncSyncTargetOfEstablishedBigLedgerPeers pnc
+  ncSyncTargetOfActiveBigLedgerPeers <-
+    lastToEither "Missing SyncTargetNumberOfActiveBigLedgerPeers"
+    $ pncSyncTargetOfActiveBigLedgerPeers pnc
+  ncSyncMinTrusted <-
+    lastToEither "Missing SyncMinNumberOfBigLedgerPeersForTrustedState"
+    $ pncSyncMinTrusted pnc
+  ncConsensusMode <-
+    lastToEither "Missing ConsensusMode"
+    $ pncConsensusMode pnc
   ncProtocolIdleTimeout <-
     lastToEither "Missing ProtocolIdleTimeout"
     $ pncProtocolIdleTimeout pnc
@@ -632,17 +699,23 @@ makeNodeConfiguration pnc = do
              , ncTimeWaitTimeout
              , ncChainSyncIdleTimeout
              , ncAcceptedConnectionsLimit
-             , ncTargetNumberOfRootPeers
-             , ncTargetNumberOfKnownPeers
-             , ncTargetNumberOfEstablishedPeers
-             , ncTargetNumberOfActivePeers
-             , ncTargetNumberOfKnownBigLedgerPeers
-             , ncTargetNumberOfEstablishedBigLedgerPeers
-             , ncTargetNumberOfActiveBigLedgerPeers
+             , ncDeadlineTargetOfRootPeers
+             , ncDeadlineTargetOfKnownPeers
+             , ncDeadlineTargetOfEstablishedPeers
+             , ncDeadlineTargetOfActivePeers
+             , ncDeadlineTargetOfKnownBigLedgerPeers
+             , ncDeadlineTargetOfEstablishedBigLedgerPeers
+             , ncDeadlineTargetOfActiveBigLedgerPeers
+             , ncSyncTargetOfActivePeers
+             , ncSyncTargetOfKnownBigLedgerPeers
+             , ncSyncTargetOfEstablishedBigLedgerPeers
+             , ncSyncTargetOfActiveBigLedgerPeers
+             , ncSyncMinTrusted
              , ncEnableP2P = case enableP2P of
                  EnabledP2PMode  -> SomeNetworkP2PMode Consensus.EnabledP2PMode
                  DisabledP2PMode -> SomeNetworkP2PMode Consensus.DisabledP2PMode
              , ncPeerSharing
+             , ncConsensusMode
              }
 
 ncProtocol :: NodeConfiguration -> Protocol

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

@@ -117,13 +117,19 @@ nodeRunParser = do
            , pncTimeWaitTimeout = mempty
            , pncChainSyncIdleTimeout = mempty
            , pncAcceptedConnectionsLimit = mempty
-           , pncTargetNumberOfRootPeers = mempty
-           , pncTargetNumberOfKnownPeers = mempty
-           , pncTargetNumberOfEstablishedPeers = mempty
-           , pncTargetNumberOfActivePeers = mempty
-           , pncTargetNumberOfKnownBigLedgerPeers = mempty
-           , pncTargetNumberOfEstablishedBigLedgerPeers = mempty
-           , pncTargetNumberOfActiveBigLedgerPeers = mempty
+           , pncDeadlineTargetOfRootPeers = mempty
+           , pncDeadlineTargetOfKnownPeers = mempty
+           , pncDeadlineTargetOfEstablishedPeers = mempty
+           , pncDeadlineTargetOfActivePeers = mempty
+           , pncDeadlineTargetOfKnownBigLedgerPeers = mempty
+           , pncDeadlineTargetOfEstablishedBigLedgerPeers = mempty
+           , pncDeadlineTargetOfActiveBigLedgerPeers = mempty
+           , pncSyncTargetOfActivePeers = mempty
+           , pncSyncTargetOfKnownBigLedgerPeers = mempty
+           , pncSyncTargetOfEstablishedBigLedgerPeers = mempty
+           , pncSyncTargetOfActiveBigLedgerPeers = mempty
+           , pncSyncMinTrusted = mempty
+           , pncConsensusMode = mempty
            , pncEnableP2P = mempty
            , pncPeerSharing = mempty
            }

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

@@ -884,45 +884,60 @@ mkP2PArguments
   -> STM IO (Maybe LedgerPeerSnapshot)
   -> Diffusion.ExtraArguments 'Diffusion.P2P IO
 mkP2PArguments NodeConfiguration {
-                 ncTargetNumberOfRootPeers,
-                 ncTargetNumberOfKnownPeers,
-                 ncTargetNumberOfEstablishedPeers,
-                 ncTargetNumberOfActivePeers,
-                 ncTargetNumberOfKnownBigLedgerPeers,
-                 ncTargetNumberOfEstablishedBigLedgerPeers,
-                 ncTargetNumberOfActiveBigLedgerPeers,
+                 ncDeadlineTargetOfRootPeers,
+                 ncDeadlineTargetOfKnownPeers,
+                 ncDeadlineTargetOfEstablishedPeers,
+                 ncDeadlineTargetOfActivePeers,
+                 ncDeadlineTargetOfKnownBigLedgerPeers,
+                 ncDeadlineTargetOfEstablishedBigLedgerPeers,
+                 ncDeadlineTargetOfActiveBigLedgerPeers,
+                 ncSyncTargetOfActivePeers,
+                 ncSyncTargetOfKnownBigLedgerPeers,
+                 ncSyncTargetOfEstablishedBigLedgerPeers,
+                 ncSyncTargetOfActiveBigLedgerPeers,
+                 ncSyncMinTrusted,
                  ncProtocolIdleTimeout,
                  ncTimeWaitTimeout,
-                 ncPeerSharing
+                 ncPeerSharing,
+                 ncConsensusMode
                }
                daReadLocalRootPeers
                daReadPublicRootPeers
                daReadUseLedgerPeers
                daReadUseBootstrapPeers
                daReadLedgerPeerSnapshot =
     Diffusion.P2PArguments P2P.ArgumentsExtra
-      { P2P.daPeerSelectionTargets
+      { P2P.daPeerTargets = Configuration.ConsensusModePeerTargets {
+          Configuration.deadlineTargets,
+          Configuration.syncTargets }
       , P2P.daReadLocalRootPeers
       , P2P.daReadPublicRootPeers
       , P2P.daReadUseLedgerPeers
       , P2P.daReadUseBootstrapPeers
       , P2P.daReadLedgerPeerSnapshot
       , P2P.daProtocolIdleTimeout   = ncProtocolIdleTimeout
       , P2P.daTimeWaitTimeout       = ncTimeWaitTimeout
-      , P2P.daDeadlineChurnInterval = 3300
-      , P2P.daBulkChurnInterval     = 900
+      , P2P.daDeadlineChurnInterval = Configuration.defaultDeadlineChurnInterval
+      , P2P.daBulkChurnInterval     = Configuration.defaultBulkChurnInterval
       , P2P.daOwnPeerSharing        = ncPeerSharing
+      , P2P.daConsensusMode         = ncConsensusMode
+      , P2P.daMinBigLedgerPeersForTrustedState = ncSyncMinTrusted
       }
   where
-    daPeerSelectionTargets = PeerSelectionTargets {
-        targetNumberOfRootPeers        = ncTargetNumberOfRootPeers,
-        targetNumberOfKnownPeers       = ncTargetNumberOfKnownPeers,
-        targetNumberOfEstablishedPeers = ncTargetNumberOfEstablishedPeers,
-        targetNumberOfActivePeers      = ncTargetNumberOfActivePeers,
-        targetNumberOfKnownBigLedgerPeers       = ncTargetNumberOfKnownBigLedgerPeers,
-        targetNumberOfEstablishedBigLedgerPeers = ncTargetNumberOfEstablishedBigLedgerPeers,
-        targetNumberOfActiveBigLedgerPeers      = ncTargetNumberOfActiveBigLedgerPeers
+    deadlineTargets = Configuration.defaultDeadlineTargets {
+        targetNumberOfRootPeers        = ncDeadlineTargetOfRootPeers,
+        targetNumberOfKnownPeers       = ncDeadlineTargetOfKnownPeers,
+        targetNumberOfEstablishedPeers = ncDeadlineTargetOfEstablishedPeers,
+        targetNumberOfActivePeers      = ncDeadlineTargetOfActivePeers,
+        targetNumberOfKnownBigLedgerPeers       = ncDeadlineTargetOfKnownBigLedgerPeers,
+        targetNumberOfEstablishedBigLedgerPeers = ncDeadlineTargetOfEstablishedBigLedgerPeers,
+        targetNumberOfActiveBigLedgerPeers      = ncDeadlineTargetOfActiveBigLedgerPeers
     }
+    syncTargets = Configuration.defaultSyncTargets {
+      targetNumberOfActivePeers               = ncSyncTargetOfActivePeers,
+      targetNumberOfKnownBigLedgerPeers       = ncSyncTargetOfKnownBigLedgerPeers,
+      targetNumberOfEstablishedBigLedgerPeers = ncSyncTargetOfEstablishedBigLedgerPeers,
+      targetNumberOfActiveBigLedgerPeers      = ncSyncTargetOfActiveBigLedgerPeers }
 
 mkNonP2PArguments
   :: IPSubscriptionTarget