Integration of ouroboros-network:cardano-diffusion

Author: coot

cabal.project

@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- update either of these.
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2025-06-03T21:29:34Z
+  , hackage.haskell.org 2025-06-17T07:53:04Z
   -- Bump this if you need newer packages from CHaP
   , cardano-haskell-packages 2025-06-03T13:42:38Z
 
@@ -57,14 +57,6 @@ if impl (ghc >= 9.12)
     -- https://github.com/kapralVV/Unique/issues/11
     , Unique:hashable
 
-source-repository-package
-   type: git
-   location: https://github.com/IntersectMBO/ouroboros-network
-   tag: 3e8d3b4b8c87ead794876c62d7fe25f32efb5142
-   --sha256: 08fpkx3iagj83nn413h9a865zjcj3lrf7017a756qd2wg2jg3amq
-   subdir:
-     ouroboros-network-api
-
 source-repository-package
    type: git
    location: https://github.com/IntersectMBO/cardano-ledger
@@ -97,3 +89,25 @@ source-repository-package
       libs/set-algebra
       libs/small-steps
       libs/vector-map
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/ouroboros-network
+  tag: dd45510b6c5a935e0f330d7b180800a27ebe2fd8
+  --sha256: sha256-Xk+DbtqQwadtmRoZNVzDUWM8tnV+RECXYRe74IOkL0s=
+  subdir: 
+          network-mux
+          ouroboros-network
+          ouroboros-network-api
+          ouroboros-network-framework
+          ouroboros-network-mock
+          ouroboros-network-protocols
+          ouroboros-network-testing
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/fs-sim
+  tag: ee0b75bee5bcd426cfc5433b6c69c67fe6319c1b
+  --sha256: 0ss4n302khl13fj5f4l6cxfj5vn558s2wk533ikmxhgigf9qas0q
+  subdir: fs-api
+          fs-sim

flake.lock

@@ -498,7 +498,7 @@ test-suite cardano-test
     tasty-hunit,
     tasty-quickcheck,
     temporary,
-    typed-protocols ^>=0.3,
+    typed-protocols ^>=1.0,
     unstable-byron-testlib,
     unstable-cardano-testlib,
     unstable-shelley-testlib,
@@ -580,7 +580,7 @@ library unstable-cardano-tools
     directory,
     dot,
     filepath,
-    fs-api ^>=0.3,
+    fs-api ^>=0.4,
     githash,
     microlens,
     mtl,

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

@@ -25,16 +25,18 @@ import Ouroboros.Consensus.Storage.ImmutableDB (ImmutableDbArgs (..))
 import qualified Ouroboros.Consensus.Storage.ImmutableDB as ImmutableDB
 import Ouroboros.Consensus.Util
 import Ouroboros.Consensus.Util.IOLike
-import Ouroboros.Network.ErrorPolicy (nullErrorPolicies)
 import Ouroboros.Network.IOManager (withIOManager)
 import Ouroboros.Network.Mux
 import qualified Ouroboros.Network.NodeToNode as N2N
 import Ouroboros.Network.PeerSelection.PeerSharing.Codec
   ( decodeRemoteAddress
   , encodeRemoteAddress
   )
+import Ouroboros.Network.Protocol.Handshake (HandshakeArguments (..))
+import qualified Ouroboros.Network.Protocol.Handshake as Handshake
+import qualified Ouroboros.Network.Server.Simple as Server
 import qualified Ouroboros.Network.Snocket as Snocket
-import Ouroboros.Network.Socket (configureSocket)
+import Ouroboros.Network.Socket (SomeResponderApplication (..), configureSocket)
 import System.FS.API (SomeHasFS (..))
 import System.FS.API.Types (MountPoint (MountPoint))
 import System.FS.IO (ioHasFS)
@@ -48,32 +50,22 @@ serve ::
     N2N.NodeToNodeVersionData
     (OuroborosApplicationWithMinimalCtx 'Mux.ResponderMode SockAddr BL.ByteString IO Void ()) ->
   IO Void
-serve sockAddr application = withIOManager \iocp -> do
-  let sn = Snocket.socketSnocket iocp
-      family = Snocket.addrFamily sn sockAddr
-  bracket (Snocket.open sn family) (Snocket.close sn) \socket -> do
-    networkMutableState <- N2N.newNetworkMutableState
-    configureSocket socket (Just sockAddr)
-    Snocket.bind sn socket sockAddr
-    Snocket.listen sn socket
-    N2N.withServer
-      sn
-      N2N.nullNetworkServerTracers
-        { N2N.nstHandshakeTracer = show >$< stdoutTracer
-        , N2N.nstErrorPolicyTracer = show >$< stdoutTracer
-        }
-      networkMutableState
-      acceptedConnectionsLimit
-      socket
-      application
-      nullErrorPolicies
- where
-  acceptedConnectionsLimit =
-    N2N.AcceptedConnectionsLimit
-      { N2N.acceptedConnectionsHardLimit = maxBound
-      , N2N.acceptedConnectionsSoftLimit = maxBound
-      , N2N.acceptedConnectionsDelay = 0
+serve sockAddr application = withIOManager \iocp ->
+  Server.with
+    (Snocket.socketSnocket iocp)
+    Snocket.makeSocketBearer
+    (\sock addr -> configureSocket sock (Just addr))
+    sockAddr
+    HandshakeArguments
+      { haHandshakeTracer = show >$< stdoutTracer
+      , haHandshakeCodec = Handshake.nodeToNodeHandshakeCodec
+      , haVersionDataCodec = Handshake.cborTermVersionDataCodec N2N.nodeToNodeCodecCBORTerm
+      , haAcceptVersion = Handshake.acceptableVersion
+      , haQueryVersion = Handshake.queryVersion
+      , haTimeLimits = Handshake.timeLimitsHandshake
       }
+    (SomeResponderApplication <$> application)
+    (\_ serverAsync -> wait serverAsync)
 
 run ::
   forall blk.

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

@@ -60,7 +60,6 @@ library
     Ouroboros.Consensus.Node
     Ouroboros.Consensus.Node.DbLock
     Ouroboros.Consensus.Node.DbMarker
-    Ouroboros.Consensus.Node.ErrorPolicy
     Ouroboros.Consensus.Node.Exit
     Ouroboros.Consensus.Node.ExitPolicy
     Ouroboros.Consensus.Node.GSM
@@ -83,29 +82,25 @@ library
     containers >=0.5 && <0.8,
     contra-tracer,
     deepseq,
-    dns,
     filepath,
-    fs-api ^>=0.3,
+    fs-api ^>=0.4,
     hashable,
-    io-classes ^>=1.5,
+    io-classes:{io-classes, si-timers, strict-stm} ^>=1.8,
     mtl,
     network-mux ^>=0.8,
     ouroboros-consensus ^>=0.27,
-    ouroboros-network ^>=0.21,
+    ouroboros-network:{ouroboros-network, cardano-diffusion} ^>=0.21,
     ouroboros-network-api ^>=0.14,
     ouroboros-network-framework ^>=0.18,
     ouroboros-network-protocols ^>=0.14,
     random,
     resource-registry ^>=0.1,
     safe-wild-cards ^>=1.0,
     serialise ^>=0.2,
-    si-timers ^>=1.5,
-    strict-stm ^>=1.5,
     text,
     time,
     transformers,
-    typed-protocols,
-    typed-protocols-stateful,
+    typed-protocols:{typed-protocols, stateful},
 
 library unstable-diffusion-testlib
   import: common-lib
@@ -135,9 +130,9 @@ library unstable-diffusion-testlib
     containers,
     contra-tracer,
     fgl,
-    fs-sim ^>=0.3,
+    fs-sim ^>=0.4,
     graphviz >=2999.20.1.0,
-    io-classes,
+    io-classes:{io-classes, si-timers, strict-stm},
     io-sim,
     mtl,
     ouroboros-consensus:{ouroboros-consensus, unstable-consensus-testlib},
@@ -150,11 +145,9 @@ library unstable-diffusion-testlib
     quiet ^>=0.2,
     random,
     resource-registry,
-    si-timers,
     sop-core ^>=0.5,
     sop-extras ^>=0.4,
     strict-sop-core ^>=0.1,
-    strict-stm,
     text,
     typed-protocols,
 
@@ -289,10 +282,10 @@ test-suite consensus-test
     containers,
     contra-tracer,
     directory,
-    fs-api ^>=0.3,
-    fs-sim ^>=0.3,
+    fs-api ^>=0.4,
+    fs-sim ^>=0.4,
     hashable,
-    io-classes,
+    io-classes:{io-classes, si-timers, strict-stm},
     io-sim,
     mempack,
     mtl,
@@ -310,12 +303,10 @@ test-suite consensus-test
     random,
     resource-registry,
     serialise,
-    si-timers,
     sop-core,
     sop-extras,
     strict-checked-vars,
     strict-sop-core,
-    strict-stm,
     tasty,
     tasty-hunit,
     tasty-quickcheck,