Merge pull request #5203 from IntersectMBO/coot/dmq-ntc-socket

dmq-node: various dmq improvements for a mithril e2e test

Author: coot

acts-generic/CHANGELOG.md

@@ -1,5 +1,6 @@
 # acts-generic changelog
 
+<!-- scriv-insert-here -->
 <!-- scriv-end-here -->
 
 ## 0.1.0.0 -- YYYY-mm-dd

acts-generic/changelog.d/scriv.ini

@@ -4,6 +4,7 @@ insert_marker = Changelog entries
 md_header_level = 2
 version = literal: acts-generic.cabal: version
 categories = Breaking, Non-Breaking
+start_marker = scriv-insert-here
 end_marker = scriv-end-here
 fragment_directory = changelog.d
 ghrel_template = {{body}}

cabal.project

@@ -64,6 +64,6 @@ allow-newer: quickcheck-instances:QuickCheck
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/kes-agent
-  tag: ebf8c0e480adf7b3ccd68bc7dd5b57f781f369ea
-  --sha256: sha256-QIb6qgcwtO7aB9PUhZTHyKw50GV3ViXOakQvnR3HFIY=
+  tag: 6d0f51fba415d3c641a8a8da37130e7adfc3ea01
+  --sha256: sha256-qM8RgmKOGBMlizPtXw2YOboYIzM6T3kvG9/Rp1F+bYQ=
   subdir: kes-agent-crypto

cardano-client/CHANGELOG.md

@@ -1,5 +1,6 @@
 # cardano-client changelog
 
+<!-- scriv-insert-here -->
 <!-- scriv-end-here -->
 
 ## 0.6.1.0 -- 2025-09-10

cardano-client/changelog.d/scriv.ini

@@ -4,6 +4,7 @@ insert_marker = Changelog entries
 md_header_level = 2
 version = literal: cardano-client.cabal: version
 categories = Breaking, Non-Breaking
+start_marker = scriv-insert-here
 end_marker = scriv-end-here
 fragment_directory = changelog.d
 ghrel_template = {{body}}

cardano-ping/CHANGELOG.md

@@ -1,5 +1,6 @@
 # cardano-ping changelog
 
+<!-- scriv-insert-here -->
 <!-- scriv-end-here -->
 
 ## 0.9.0.0 -- 2026-06-28

cardano-ping/changelog.d/scriv.ini

@@ -4,6 +4,7 @@ insert_marker = Changelog entries
 md_header_level = 2
 version = literal: cardano-ping.cabal: version
 categories = Breaking, Non-Breaking
+start_marker = scriv-insert-here
 end_marker = scriv-end-here
 fragment_directory = changelog.d
 ghrel_template = {{body}}

dmq-node/CHANGELOG.md

@@ -1,5 +1,15 @@
 # dmq-node changelog
 
+<!-- scriv-insert-here -->
+
+<a id='changelog-0.2.0.0'></a>
+## 0.2.0.0 -- 2025-09-29
+
+### Breaking
+
+- Added a way to configure a unix socket for node to client communication.  It
+  can either be specified in the configuration file or a the command line switch
+  `--local-address`.
 <!-- scriv-end-here -->
 
 ## 0.1.0.0 -- YYYY-mm-dd

dmq-node/app/Main.hs

@@ -1,18 +1,27 @@
+{-# LANGUAGE MultiWayIf          #-}
+{-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TemplateHaskell     #-}
 {-# LANGUAGE TypeApplications    #-}
 
 module Main where
 
-import Control.Monad (void)
+import Control.Monad (void, when)
 import Control.Tracer (Tracer (..), nullTracer, traceWith)
 
 import Data.Act
 import Data.Aeson (ToJSON)
 import Data.Functor.Contravariant ((>$<))
+import Data.Maybe (maybeToList)
+import Data.Text qualified as Text
+import Data.Text.IO qualified as Text
+import Data.Version (showVersion)
 import Data.Void (Void)
 import Options.Applicative
+import System.Exit (exitSuccess)
 import System.Random (newStdGen, split)
 
+import Cardano.Git.Rev (gitRev)
 import Cardano.KESAgent.Protocols.StandardCrypto (StandardCrypto)
 
 import DMQ.Configuration
@@ -21,6 +30,7 @@ import DMQ.Configuration.Topology (readTopologyFileOrError)
 import DMQ.Diffusion.Applications (diffusionApplications)
 import DMQ.Diffusion.Arguments
 import DMQ.Diffusion.NodeKernel (mempool, withNodeKernel)
+import DMQ.Handlers.TopLevel (toplevelExceptionHandler)
 import DMQ.NodeToClient qualified as NtC
 import DMQ.NodeToNode (dmqCodecs, dmqLimitsAndTimeouts, ntnApps)
 import DMQ.Protocol.LocalMsgSubmission.Codec
@@ -33,8 +43,10 @@ import Ouroboros.Network.PeerSelection.PeerSharing.Codec (decodeRemoteAddress,
            encodeRemoteAddress)
 import Ouroboros.Network.TxSubmission.Mempool.Simple qualified as Mempool
 
+import Paths_dmq_node qualified as Meta
+
 main :: IO ()
-main = void . runDMQ =<< execParser opts
+main = toplevelExceptionHandler $ void . runDMQ =<< execParser opts
   where
     opts = info (parseCLIOptions <**> helper)
                 ( fullDesc
@@ -56,21 +68,40 @@ runDMQ commandLineConfig = do
           dmqcPrettyLog            = I prettyLog,
           dmqcTopologyFile         = I topologyFile,
           dmqcHandshakeTracer      = I handshakeTracer,
-          dmqcLocalHandshakeTracer = I localHandshakeTracer
+          dmqcLocalHandshakeTracer = I localHandshakeTracer,
+          dmqcVersion              = I version
         } = config' <> commandLineConfig
             `act`
             defaultConfiguration
     let tracer :: ToJSON ev => Tracer IO (WithEventType ev)
         tracer = dmqTracer prettyLog
 
+    when version $ do
+      let gitrev = $(gitRev)
+          cleanGitRev = if | Text.take 6 (Text.drop 7 gitrev) == "-dirty"
+                           -- short dirty revision
+                           -> Just $ Text.take (6 + 7) gitrev
+                           | Text.all (== '0') gitrev
+                           -- no git revision available
+                           -> Nothing
+                           | otherwise
+                           -> Just gitrev
+      Text.putStr $ Text.unlines $
+        [ "dmq-node version: " <> Text.pack (showVersion Meta.version) ]
+        ++
+        [ "git revision: " <> rev
+        | rev <- maybeToList cleanGitRev
+        ]
+      exitSuccess
+
     traceWith tracer (WithEventType "Configuration" dmqConfig)
     nt <- readTopologyFileOrError topologyFile
     traceWith tracer (WithEventType "NetworkTopology" nt)
 
     stdGen <- newStdGen
     let (psRng, policyRng) = split stdGen
 
-    withNodeKernel @StandardCrypto psRng $ \nodeKernel -> do
+    withNodeKernel @StandardCrypto tracer dmqConfig psRng $ \nodeKernel -> do
       dmqDiffusionConfiguration <- mkDiffusionConfiguration dmqConfig nt
 
       let dmqNtNApps =
@@ -92,7 +123,8 @@ runDMQ commandLineConfig = do
                                                         (\_ _ -> Right () :: Either Void ())
                                                         (\_ -> True)
                                                         (mempool nodeKernel)
-             in NtC.ntcApps mempoolReader mempoolWriter maxMsgs
+             in NtC.ntcApps tracer dmqConfig
+                            mempoolReader mempoolWriter maxMsgs
                             (NtC.dmqCodecs encodeReject decodeReject)
           dmqDiffusionArguments =
             diffusionArguments (if handshakeTracer