Update to ouroboros-network-0.19.0.3

(cherry picked from commit 70b809f)

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

cardano-node/cardano-node.cabal

@@ -191,7 +191,7 @@ library
                       , ouroboros-consensus-diffusion ^>= 0.19
                       , 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

cardano-tracer/src/Cardano/Tracer/Acceptors/Client.hs

@@ -74,7 +74,7 @@ runAcceptorsClient tracerEnv tracerEnvRTView p (ekgConfig, tfConfig, dpfConfig)
       , (runDataPointsAcceptorInit   tracerEnv dpfConfig errorHandler, 3)
       ]
  where
-  appInitiator protocolsWithNums =
+  appInitiator protocolsWithNums _ =
     OuroborosApplication
       [ MiniProtocol
          { miniProtocolNum    = MiniProtocolNum num
@@ -95,10 +95,12 @@ doConnectToForwarder
   -> LocalAddress
   -> Word32
   -> ProtocolTimeLimits (Handshake ForwardingVersion Term)
-  -> OuroborosApplication 'Mux.InitiatorMode
+  -> (    ForwardingVersionData
+       -> OuroborosApplication 'Mux.InitiatorMode
                           (MinimalInitiatorContext LocalAddress)
                           (ResponderContext LocalAddress)
                           LBS.ByteString IO () Void
+     )
   -> IO ()
 doConnectToForwarder snocket address netMagic timeLimits app = do
   done <- connectToNode

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.

cardano-tracer/test/Cardano/Tracer/Test/Forwarder.hs

@@ -190,8 +190,9 @@ doConnectToAcceptor TestSetup{..} snocket muxBearer address timeLimits (ekgConfi
 
   forwarderApp
     :: [(RunMiniProtocol 'Mux.InitiatorMode initCtx respCtx LBS.ByteString IO () Void, Word16)]
+    -> ForwardingVersionData
     -> OuroborosApplication 'Mux.InitiatorMode initCtx respCtx LBS.ByteString IO () Void
-  forwarderApp protocols =
+  forwarderApp protocols _ =
     OuroborosApplication
       [ MiniProtocol
          { miniProtocolNum    = MiniProtocolNum num
@@ -239,7 +240,7 @@ doListenToAcceptor TestSetup{..}
               (simpleSingletonVersions
                  ForwardingV_1
                  (ForwardingVersionData $ unI tsNetworkMagic) -- Taken from mainnet shelley genesis file.
-                 (SomeResponderApplication $
+                 (\_ -> SomeResponderApplication $
                     forwarderApp [ (forwardEKGMetricsResp ekgConfig store,   1)
                                  , (forwardTraceObjectsResp tfConfig sink,   2)
                                  , (forwardDataPointsResp dpfConfig dpStore, 3)

trace-dispatcher/src/Cardano/Logging/Forwarding.hs

@@ -244,8 +244,9 @@ doConnectToAcceptor magic snocket makeBearer configureSocket address timeLimits
     ctaHandshakeCallbacks = HandshakeCallbacks acceptableVersion queryVersion }
   forwarderApp
     :: [(RunMiniProtocol 'Mux.InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void, Word16)]
+    -> ForwardingVersionData
     -> OuroborosApplication 'Mux.InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void
-  forwarderApp protocols =
+  forwarderApp protocols _ =
     OuroborosApplication
       [ MiniProtocol
          { miniProtocolNum    = MiniProtocolNum num
@@ -294,7 +295,7 @@ doListenToAcceptor magic snocket makeBearer configureSocket address timeLimits
             (simpleSingletonVersions
                ForwardingV_1
                (ForwardingVersionData magic)
-               (SomeResponderApplication $
+               (SomeResponderApplication .
                  forwarderApp [ (forwardEKGMetricsRespRun,                  1)
                               , (forwardTraceObjectsResp tfConfig  sink,    2)
                               , (forwardDataPointsResp   dpfConfig dpStore, 3)
@@ -307,8 +308,9 @@ doListenToAcceptor magic snocket makeBearer configureSocket address timeLimits
  where
   forwarderApp
     :: [(RunMiniProtocol 'Mux.ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void (), Word16)]
+    -> ForwardingVersionData
     -> OuroborosApplication 'Mux.ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void ()
-  forwarderApp protocols =
+  forwarderApp protocols _ =
     OuroborosApplication
       [ MiniProtocol
          { miniProtocolNum    = MiniProtocolNum num

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