Integrate ouroboros-network

cabal.project

@@ -47,3 +47,22 @@ if(os(windows))
 
 -- https://github.com/ulidtko/cabal-doctest/issues/85
 constraints: Cabal < 3.13
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/ouroboros-network.git
+  tag: 4920b7a8e1a639e6b6a85611bef6d541e21d012a
+  --sha256: sha256-mrGXtC/mStln5KqoXlruKYl2vHYZhgw3biRlZm82h7A=
+  subdir:
+    cardano-client
+    cardano-ping
+    monoidal-synchronisation
+    network-mux
+    ntp-client
+    ouroboros-network
+    ouroboros-network-api
+    ouroboros-network-framework
+    ouroboros-network-mock
+    ouroboros-network-protocols
+    ouroboros-network-testing
+    quickcheck-monoids

ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal

@@ -549,6 +549,7 @@ library unstable-cardano-tools
     microlens,
     mtl,
     network,
+    network-mux,
     nothunks,
     ouroboros-consensus ^>=0.21,
     ouroboros-consensus-cardano,

ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs

@@ -519,14 +519,7 @@ instance CardanoHardForkConstraints c
       ]
 
   supportedNodeToClientVersions _ = Map.fromList $
-      [ (NodeToClientV_9 , CardanoNodeToClientVersion7)
-      , (NodeToClientV_10, CardanoNodeToClientVersion7)
-      , (NodeToClientV_11, CardanoNodeToClientVersion8)
-      , (NodeToClientV_12, CardanoNodeToClientVersion8)
-      , (NodeToClientV_13, CardanoNodeToClientVersion9)
-      , (NodeToClientV_14, CardanoNodeToClientVersion10)
-      , (NodeToClientV_15, CardanoNodeToClientVersion11)
-      , (NodeToClientV_16, CardanoNodeToClientVersion12)
+      [ (NodeToClientV_16, CardanoNodeToClientVersion12)
       , (NodeToClientV_17, CardanoNodeToClientVersion13)
       , (NodeToClientV_18, CardanoNodeToClientVersion14)
       , (NodeToClientV_19, CardanoNodeToClientVersion15)

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs

@@ -59,14 +59,7 @@ instance SupportedNetworkProtocolVersion (ShelleyBlock proto era) where
       , (NodeToNodeV_14, ShelleyNodeToNodeVersion1)
       ]
   supportedNodeToClientVersions _ = Map.fromList [
-        (NodeToClientV_9,  ShelleyNodeToClientVersion5)
-      , (NodeToClientV_10, ShelleyNodeToClientVersion5)
-      , (NodeToClientV_11, ShelleyNodeToClientVersion5)
-      , (NodeToClientV_12, ShelleyNodeToClientVersion5)
-      , (NodeToClientV_13, ShelleyNodeToClientVersion5)
-      , (NodeToClientV_14, ShelleyNodeToClientVersion6)
-      , (NodeToClientV_15, ShelleyNodeToClientVersion7)
-      , (NodeToClientV_16, ShelleyNodeToClientVersion8)
+        (NodeToClientV_16, ShelleyNodeToClientVersion8)
       , (NodeToClientV_17, ShelleyNodeToClientVersion9)
       , (NodeToClientV_18, ShelleyNodeToClientVersion10)
       , (NodeToClientV_19, ShelleyNodeToClientVersion11)

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/ImmDBServer/Diffusion.hs

@@ -11,6 +11,7 @@ import           Control.Tracer
 import qualified Data.ByteString.Lazy as BL
 import           Data.Functor.Contravariant ((>$<))
 import           Data.Void (Void)
+import qualified Network.Mux as Mux
 import           Network.Socket (SockAddr (..))
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Config
@@ -40,7 +41,7 @@ import           System.FS.IO (ioHasFS)
 serve ::
      SockAddr
   -> N2N.Versions N2N.NodeToNodeVersion N2N.NodeToNodeVersionData
-       (OuroborosApplicationWithMinimalCtx 'ResponderMode SockAddr BL.ByteString IO Void ())
+       (OuroborosApplicationWithMinimalCtx 'Mux.ResponderMode SockAddr BL.ByteString IO Void ())
   -> IO Void
 serve sockAddr application = withIOManager \iocp -> do
     let sn     = Snocket.socketSnocket iocp

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/ImmDBServer/MiniProtocols.hs

@@ -26,6 +26,7 @@ import qualified Data.Map.Strict as Map
 import           Data.Typeable (Typeable)
 import           Data.Void (Void)
 import           GHC.Generics (Generic)
+import qualified Network.Mux as Mux
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.MiniProtocol.BlockFetch.Server
                      (blockFetchServer')
@@ -48,7 +49,7 @@ import           Ouroboros.Network.Driver (runPeer)
 import           Ouroboros.Network.KeepAlive (keepAliveServer)
 import           Ouroboros.Network.Magic (NetworkMagic)
 import           Ouroboros.Network.Mux (MiniProtocol (..), MiniProtocolCb (..),
-                     MuxMode (..), OuroborosApplication (..),
+                     OuroborosApplication (..),
                      OuroborosApplicationWithMinimalCtx, RunMiniProtocol (..))
 import           Ouroboros.Network.NodeToNode (NodeToNodeVersionData (..),
                      Versions (..))
@@ -74,7 +75,7 @@ immDBServer ::
   -> ImmutableDB m blk
   -> NetworkMagic
   -> Versions NodeToNodeVersion NodeToNodeVersionData
-       (OuroborosApplicationWithMinimalCtx 'ResponderMode addr BL.ByteString m Void ())
+       (OuroborosApplicationWithMinimalCtx 'Mux.ResponderMode addr BL.ByteString m Void ())
 immDBServer codecCfg encAddr decAddr immDB networkMagic = do
     forAllVersions application
   where
@@ -98,7 +99,7 @@ immDBServer codecCfg encAddr decAddr immDB networkMagic = do
     application ::
          NodeToNodeVersion
       -> BlockNodeToNodeVersion blk
-      -> OuroborosApplicationWithMinimalCtx 'ResponderMode addr BL.ByteString m Void ()
+      -> OuroborosApplicationWithMinimalCtx 'Mux.ResponderMode addr BL.ByteString m Void ()
     application version blockVersion =
         OuroborosApplication miniprotocols
       where

ouroboros-consensus-diffusion/changelog.d/20240807_100458_alexander.esgen_milestone_1.md

@@ -0,0 +1,3 @@
+### Breaking
+
+- Adapted to Genesis-related changes in `ouroboros-consensus` ([#1179](https://github.com/IntersectMBO/ouroboros-consensus/pull/1179)).

ouroboros-consensus-diffusion/changelog.d/20241120_160052_neilmayhew_release_srp.md

@@ -0,0 +1,3 @@
+### Patch
+
+- Depend on `network-mux` from `ouroboros-network` and use its types.

ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal

@@ -89,6 +89,7 @@ library
     hashable,
     io-classes ^>=1.5,
     mtl,
+    network-mux ^>=0.5,
     ouroboros-consensus ^>=0.21,
     ouroboros-network ^>=0.18,
     ouroboros-network-api ^>=0.11,

ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToClient.hs

@@ -42,6 +42,7 @@ import           Control.ResourceRegistry
 import           Control.Tracer
 import           Data.ByteString.Lazy (ByteString)
 import           Data.Void (Void)
+import qualified Network.Mux as Mux
 import           Network.TypedProtocol.Codec
 import qualified Network.TypedProtocol.Stateful.Codec as Stateful
 import           Ouroboros.Consensus.Block
@@ -465,7 +466,7 @@ mkApps kernel Tracers {..} Codecs {..} Handlers {..} =
 responder ::
      N.NodeToClientVersion
   -> Apps m (ConnectionId peer) b b b b a
-  -> OuroborosApplicationWithMinimalCtx 'ResponderMode peer b m Void a
+  -> OuroborosApplicationWithMinimalCtx 'Mux.ResponderMode peer b m Void a
 responder version Apps {..} =
     nodeToClientProtocols
       (NodeToClientProtocols {

ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs

@@ -52,6 +52,7 @@ import           Data.Hashable (Hashable)
 import           Data.Int (Int64)
 import           Data.Map.Strict (Map)
 import           Data.Void (Void)
+import qualified Network.Mux as Mux
 import           Network.TypedProtocol.Codec
 import           Ouroboros.Consensus.Block
 import           Ouroboros.Consensus.Config (DiffusionPipeliningSupport (..))
@@ -810,7 +811,7 @@ initiator ::
   -> NodeToNodeVersion
   -> PSTypes.PeerSharing
   -> Apps m addr b b b b b a c
-  -> OuroborosBundleWithExpandedCtx 'InitiatorMode addr b m a Void
+  -> OuroborosBundleWithExpandedCtx 'Mux.InitiatorMode addr b m a Void
 initiator miniProtocolParameters version ownPeerSharing Apps {..} =
     nodeToNodeProtocols
       miniProtocolParameters
@@ -845,7 +846,7 @@ initiatorAndResponder ::
   -> NodeToNodeVersion
   -> PSTypes.PeerSharing
   -> Apps m addr b b b b b a c
-  -> OuroborosBundleWithExpandedCtx 'InitiatorResponderMode addr b m a c
+  -> OuroborosBundleWithExpandedCtx 'Mux.InitiatorResponderMode addr b m a c
 initiatorAndResponder miniProtocolParameters version ownPeerSharing Apps {..} =
     nodeToNodeProtocols
       miniProtocolParameters