This patch updates cardano-node

with changes in ouroboros-network api.
Changes includes:
- new format for topology files
- new configuration options:
    * RespondersIdleTimeout
    * ProtocolIdleTimeout
    * WaitTimeTimeout
    * TargetNumberOfRootPeers
    * TargetNumberOfKnownPeers
    * TargetNumberOfEstablishedPeers
    * TargetNumberOfActivePeers
- new tracers
    * LocalRootPeers
    * PeerSelection
    * DebugPeerSelection
    * PeerSelectionActons
    * ConnectionManager
    * InboundGovernor (Armando)
    * PeerSelectionCounters (Armando)
- old tracers where removed

ConnectionManager tracer

* it was turned off if ekg direct was defined
* renamed "numberConns" from ConnectionManagerCounters to "prunableConns"  (in ekg)

- leave a thunk in the Mark snapshot
- cardano-node using p2p-governor and connection manager

Inbound Governor Tracers

* Added new constructors
* Removed ekg established counter

- connection-manager: dump state on SIGUSR1
- Fixed trace severity (#3176)
- update ouroboros-network

bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs

@@ -36,7 +36,9 @@ import           Ouroboros.Network.DeltaQ (defaultGSV)
 import           Ouroboros.Network.Driver (runPeerWithLimits)
 import           Ouroboros.Network.KeepAlive
 import           Ouroboros.Network.Magic
-import           Ouroboros.Network.Mux (MuxPeer (..), RunMiniProtocol (..), continueForever)
+import           Ouroboros.Network.Mux (MuxPeer (..), OuroborosApplication (..),
+                                        OuroborosBundle, RunMiniProtocol (..),
+                                        continueForever)
 import           Ouroboros.Network.NodeToClient (chainSyncPeerNull, IOManager)
 import           Ouroboros.Network.NodeToNode (NetworkConnectTracers (..))
 import qualified Ouroboros.Network.NodeToNode as NtN
@@ -80,6 +82,12 @@ benchmarkConnectTxSubmit ioManager handshakeTracer submissionTracer codecConfig
     (addrAddress <$> Nothing)
     (addrAddress remoteAddr)
  where
+  mkApp :: OuroborosBundle      mode addr bs m a b
+        -> OuroborosApplication mode addr bs m a b
+  mkApp bundle =
+    OuroborosApplication $ \connId controlMessageSTM ->
+      foldMap (\p -> p connId controlMessageSTM) bundle
+
   n2nVer :: NodeToNodeVersion
   n2nVer = NodeToNodeV_7
   blkN2nVer :: BlockNodeToNodeVersion blk
@@ -96,6 +104,7 @@ benchmarkConnectTxSubmit ioManager handshakeTracer submissionTracer codecConfig
        { NtN.networkMagic = networkMagic
        , NtN.diffusionMode = NtN.InitiatorOnlyDiffusionMode
        }) $
+      mkApp $
       NtN.nodeToNodeProtocols NtN.defaultMiniProtocolParameters ( \them _ ->
         NtN.NodeToNodeProtocols
           { NtN.chainSyncProtocol = InitiatorProtocolOnly $

cabal.project

@@ -238,8 +238,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 94782e5ca52f234ff8eeddc6322a46cca0b69c0e
-  --sha256: 1da3pka4pn6sjf6w19d957aryjc9ip1a3g0vz7jz66pjri3v2n0j
+  tag: 3a30de37579421530707848609a492bd0b7df5a9
+  --sha256: 12fw25q6wnz2g9a6l9rk7xj2hzyx92n87v3x6i8andnyfn282gv3
   subdir:
     io-sim
     io-classes
@@ -275,8 +275,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ekg-forward
-  tag: d9e8fd302fa6ba41c07183d371e6777286d37bc2
-  --sha256: 0s8cblhq3i528jj7r7yd4v82nqzafj8vrgf0y80l7saxc3a5f2lk
+  tag: fce85450dda8da15a5e0331b00cbb272ff7d09a0
+  --sha256: 0j991km6c0ravr1xlkw17by04mgisda73i71q59903ai0vh0gpqz
 
 -- Drops an instance breaking our code. Should be released to Hackage eventually.
 source-repository-package

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

@@ -22,6 +22,7 @@ import           Prelude (String)
 
 import           Control.Monad (fail)
 import           Data.Aeson
+import           Data.Time.Clock (DiffTime)
 import           Data.Yaml (decodeFileThrow)
 import           Generic.Data (gmappend)
 import           Generic.Data.Orphans ()
@@ -89,6 +90,21 @@ data NodeConfiguration
        , ncTraceConfig    :: !TraceOptions
 
        , ncMaybeMempoolCapacityOverride :: !(Maybe MempoolCapacityBytesOverride)
+
+         -- | Protocol idleness timeout, see
+         -- 'Ouroboros.Network.Diffusion.daProtocolIdleTimeout'.
+         --
+       , ncProtocolIdleTimeout   :: DiffTime
+         -- | Wait time timeout, see
+         -- 'Ouroboros.Netowrk.Diffusion.daTimeWaitTimeout'.
+         --
+       , ncTimeWaitTimeout       :: DiffTime
+
+         -- P2P governor targets
+       , ncTargetNumberOfRootPeers        :: Int
+       , ncTargetNumberOfKnownPeers       :: Int
+       , ncTargetNumberOfEstablishedPeers :: Int
+       , ncTargetNumberOfActivePeers      :: Int
        } deriving (Eq, Show)
 
 
@@ -128,6 +144,16 @@ data PartialNodeConfiguration
 
          -- Configuration for testing purposes
        , pncMaybeMempoolCapacityOverride :: !(Last MempoolCapacityBytesOverride)
+
+         -- Network timeouts
+       , pncProtocolIdleTimeout   :: !(Last DiffTime)
+       , pncTimeWaitTimeout       :: !(Last DiffTime)
+
+         -- P2P governor targets
+       , pncTargetNumberOfRootPeers        :: !(Last Int)
+       , pncTargetNumberOfKnownPeers       :: !(Last Int)
+       , pncTargetNumberOfEstablishedPeers :: !(Last Int)
+       , pncTargetNumberOfActivePeers      :: !(Last Int)
        } deriving (Eq, Generic, Show)
 
 instance AdjustFilePaths PartialNodeConfiguration where
@@ -178,6 +204,16 @@ instance FromJSON PartialNodeConfiguration where
                                                                <*> parseHardForkProtocol v)
       pncMaybeMempoolCapacityOverride <- Last <$> parseMempoolCapacityBytesOverride v
 
+      -- Network timeouts
+      pncProtocolIdleTimeout   <- Last <$> v .:? "ProtocolIdleTimeout"
+      pncTimeWaitTimeout       <- Last <$> v .:? "TimeWaitTimeout"
+
+      -- P2P Governor parameters, with conservative defaults.
+      pncTargetNumberOfRootPeers        <- Last <$> v .:? "TargetNumberOfRootPeers"
+      pncTargetNumberOfKnownPeers       <- Last <$> v .:? "TargetNumberOfKnownPeers"
+      pncTargetNumberOfEstablishedPeers <- Last <$> v .:? "TargetNumberOfEstablishedPeers"
+      pncTargetNumberOfActivePeers      <- Last <$> v .:? "TargetNumberOfActivePeers"
+
       pure PartialNodeConfiguration {
              pncProtocolConfig
            , pncSocketPath
@@ -200,6 +236,12 @@ instance FromJSON PartialNodeConfiguration where
            , pncShutdownIPC = mempty
            , pncShutdownOnSlotSynced = mempty
            , pncMaybeMempoolCapacityOverride
+           , pncProtocolIdleTimeout
+           , pncTimeWaitTimeout
+           , pncTargetNumberOfRootPeers
+           , pncTargetNumberOfKnownPeers
+           , pncTargetNumberOfEstablishedPeers
+           , pncTargetNumberOfActivePeers
            }
     where
       parseMempoolCapacityBytesOverride v = parseNoOverride <|> parseOverride
@@ -334,6 +376,12 @@ defaultPartialNodeConfiguration =
     , pncLogMetrics = mempty
     , pncTraceConfig = mempty
     , pncMaybeMempoolCapacityOverride = mempty
+    , pncProtocolIdleTimeout   = Last (Just 5)
+    , pncTimeWaitTimeout       = Last (Just 60)
+    , pncTargetNumberOfRootPeers        = Last (Just 5)
+    , pncTargetNumberOfKnownPeers       = Last (Just 5)
+    , pncTargetNumberOfEstablishedPeers = Last (Just 2)
+    , pncTargetNumberOfActivePeers      = Last (Just 1)
     }
 
 lastOption :: Parser a -> Parser (Last a)
@@ -357,6 +405,24 @@ makeNodeConfiguration pnc = do
   traceConfig <- lastToEither "Missing TraceConfig" $ pncTraceConfig pnc
   diffusionMode <- lastToEither "Missing DiffusionMode" $ pncDiffusionMode pnc
   snapshotInterval <- lastToEither "Missing SnapshotInterval" $ pncSnapshotInterval pnc
+  ncTargetNumberOfRootPeers <-
+    lastToEither "Missing TargetNumberOfRootPeers"
+    $ pncTargetNumberOfRootPeers pnc
+  ncTargetNumberOfKnownPeers <-
+    lastToEither "Missing TargetNumberOfKnownPeers"
+    $ pncTargetNumberOfKnownPeers pnc
+  ncTargetNumberOfEstablishedPeers <-
+    lastToEither "Missing TargetNumberOfEstablishedPeers"
+    $ pncTargetNumberOfEstablishedPeers pnc
+  ncTargetNumberOfActivePeers <-
+    lastToEither "Missing TargetNumberOfActivePeers"
+    $ pncTargetNumberOfActivePeers pnc
+  ncProtocolIdleTimeout <-
+    lastToEither "Missing ProtocolIdleTimeout"
+    $ pncProtocolIdleTimeout pnc
+  ncTimeWaitTimeout <-
+    lastToEither "Missing TimeWaitTimeout"
+    $ pncTimeWaitTimeout pnc
 
   testEnableDevelopmentNetworkProtocols <-
     lastToEither "Missing TestEnableDevelopmentNetworkProtocols" $
@@ -384,6 +450,12 @@ makeNodeConfiguration pnc = do
              , ncTraceConfig = if loggingSwitch then traceConfig
                                                 else TracingOff
              , ncMaybeMempoolCapacityOverride = getLast $ pncMaybeMempoolCapacityOverride pnc
+             , ncProtocolIdleTimeout
+             , ncTimeWaitTimeout
+             , ncTargetNumberOfRootPeers
+             , ncTargetNumberOfKnownPeers
+             , ncTargetNumberOfEstablishedPeers
+             , ncTargetNumberOfActivePeers
              }
 
 ncProtocol :: NodeConfiguration -> Protocol

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

@@ -1,3 +1,4 @@
+{-# LANGUAGE NamedFieldPuns    #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module Cardano.Node.Configuration.Topology
@@ -8,6 +9,8 @@ module Cardano.Node.Configuration.Topology
   , NodeHostIPv6Address(..)
   , NodeSetup(..)
   , RemoteAddress(..)
+  , PeerAdvertise(..)
+  , UseLedger(..)
   , nodeAddressToSockAddr
   , readTopologyFile
   , remoteAddressToNodeAddress
@@ -24,8 +27,11 @@ import qualified Data.ByteString.Lazy.Char8 as LBS
 import qualified Data.Text as Text
 
 import           Cardano.Node.Configuration.POM (NodeConfiguration (..))
+import           Cardano.Slotting.Slot (SlotNo (..))
 import           Cardano.Node.Types
 
+import           Ouroboros.Network.NodeToNode (PeerAdvertise (..))
+import           Ouroboros.Network.PeerSelection.LedgerPeers (UseLedgerAfter (..))
 import           Ouroboros.Consensus.Util.Condense (Condense (..))
 
 
@@ -40,29 +46,25 @@ data RemoteAddress = RemoteAddress
   -- ^ Either a dns address or an ip address.
   , raPort      :: !PortNumber
   -- ^ Port number of the destination.
-  , raValency :: !Int
+  , raAdvertise :: !PeerAdvertise
+  -- ^ Advertise the peer through gossip protocol.
   -- ^ If a DNS address is given valency governs
-  -- to how many resolved IP addresses
-  -- should we maintain active (hot) connection;
-  -- if an IP address is given valency is used as
-  -- a Boolean value, @0@ means to ignore the address;
-  } deriving (Eq, Ord, Show)
+  } deriving (Eq, Show)
 
 
 -- | Parse 'raAddress' field as an IP address; if it parses and the valency is
 -- non zero return corresponding NodeAddress.
 --
 remoteAddressToNodeAddress
   :: RemoteAddress
-  -> Maybe (Either NodeIPAddress
-                   (NodeDnsAddress, Int))
-remoteAddressToNodeAddress (RemoteAddress _addrText _port 0) =
-    Nothing
-remoteAddressToNodeAddress (RemoteAddress addrText port valency) =
-    case readMaybe (Text.unpack addrText) of
-      Nothing   -> Just $ Right (NodeAddress (NodeHostDnsAddress addrText) port
-                                , valency)
-      Just addr -> Just $ Left  (NodeAddress (NodeHostIPAddress addr) port)
+  -> Either (NodeIPAddress,  PeerAdvertise)
+            (NodeDnsAddress, PeerAdvertise)
+remoteAddressToNodeAddress RemoteAddress { raAddress, raPort, raAdvertise } =
+    case readMaybe (Text.unpack raAddress) of
+      Nothing   -> Right ( NodeAddress (NodeHostDnsAddress raAddress) raPort
+                         , raAdvertise )
+      Just addr -> Left  ( NodeAddress (NodeHostIPAddress addr) raPort
+                         , raAdvertise )
 
 
 instance Condense RemoteAddress where
@@ -74,30 +76,46 @@ instance FromJSON RemoteAddress where
     RemoteAddress
       <$> v .: "addr"
       <*> ((fromIntegral :: Int -> PortNumber) <$> v .: "port")
-      <*> v .: "valency"
+      <*> (bool DoNotAdvertisePeer DoAdvertisePeer <$> v .: "advertise")
 
 instance ToJSON RemoteAddress where
   toJSON ra =
     object
       [ "addr" .= raAddress ra
       , "port" .= (fromIntegral (raPort ra) :: Int)
-      , "valency" .= raValency ra
+      , "advertise" .= case raAdvertise ra of
+                          DoNotAdvertisePeer -> False
+                          DoAdvertisePeer    -> True
       ]
 
+newtype UseLedger = UseLedger UseLedgerAfter deriving (Eq, Show)
+
+instance FromJSON UseLedger where
+  parseJSON (Data.Aeson.Number n) =
+    if n >= 0 then return $ UseLedger $ UseLedgerAfter $ SlotNo $ floor n
+              else return $ UseLedger   DontUseLedger
+  parseJSON _ = mzero
+
+instance ToJSON UseLedger where
+  toJSON (UseLedger (UseLedgerAfter (SlotNo n))) = Number $ fromIntegral n
+  toJSON (UseLedger DontUseLedger)               = Number (-1)
+
 data NodeSetup = NodeSetup
   { nodeId :: !Word64
   , nodeIPv4Address :: !(Maybe NodeIPv4Address)
   , nodeIPv6Address :: !(Maybe NodeIPv6Address)
   , producers :: ![RemoteAddress]
+  , useLedger :: !UseLedger
   } deriving (Eq, Show)
 
 instance FromJSON NodeSetup where
   parseJSON = withObject "NodeSetup" $ \o ->
                 NodeSetup
-                  <$> o .: "nodeId"
-                  <*> o .: "nodeIPv4Address"
-                  <*> o .: "nodeIPv6Address"
-                  <*> o .: "producers"
+                  <$> o .:  "nodeId"
+                  <*> o .:  "nodeIPv4Address"
+                  <*> o .:  "nodeIPv6Address"
+                  <*> o .:  "producers"
+                  <*> o .:? "useLedgerAfterSlot" .!= UseLedger DontUseLedger
 
 instance ToJSON NodeSetup where
   toJSON ns =
@@ -106,23 +124,27 @@ instance ToJSON NodeSetup where
       , "nodeIPv4Address" .= nodeIPv4Address ns
       , "nodeIPv6Address" .= nodeIPv6Address ns
       , "producers" .= producers ns
+      , "useLedgerAfterSlot" .= useLedger ns
       ]
 
 data NetworkTopology = MockNodeTopology ![NodeSetup]
-                     | RealNodeTopology ![RemoteAddress]
+                     | RealNodeTopology ![RemoteAddress] !UseLedger
   deriving (Eq, Show)
 
 instance FromJSON NetworkTopology where
   parseJSON = withObject "NetworkTopology" $ \o -> asum
-                [ MockNodeTopology <$> o .: "MockProducers"
-                , RealNodeTopology <$> o .: "Producers"
+                [ MockNodeTopology <$> o .:  "MockProducers"
+                , RealNodeTopology <$> o .:  "Producers"
+                                   <*> o .:? "useLedgerAfterSlot" .!= UseLedger DontUseLedger
                 ]
 
 instance ToJSON NetworkTopology where
   toJSON top =
     case top of
       MockNodeTopology nss -> object [ "MockProducers" .= toJSON nss ]
-      RealNodeTopology ras -> object [ "Producers" .= toJSON ras ]
+      RealNodeTopology ras ul -> object [ "Producers" .= toJSON ras
+                                        ,  "useLedgerAfterSlot" .= toJSON ul
+                                        ]
 
 -- | Read the `NetworkTopology` configuration from the specified file.
 -- While running a real protocol, this gives your node its own address and

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

@@ -95,6 +95,12 @@ nodeRunParser = do
            , pncLogMetrics = mempty
            , pncTraceConfig = mempty
            , pncMaybeMempoolCapacityOverride = maybeMempoolCapacityOverride
+           , pncProtocolIdleTimeout = mempty
+           , pncTimeWaitTimeout = mempty
+           , pncTargetNumberOfRootPeers = mempty
+           , pncTargetNumberOfKnownPeers = mempty
+           , pncTargetNumberOfEstablishedPeers = mempty
+           , pncTargetNumberOfActivePeers = mempty
            }
 
 parseSocketPath :: Text -> Parser SocketPath