diff --git a/cabal.project b/cabal.project index b3f83016..766cdcc1 100644 --- a/cabal.project +++ b/cabal.project @@ -15,14 +15,10 @@ repository cardano-haskell-packages -- repeat the index-state for hackage to work around haskell.nix parsing limitation index-state: -- Bump this if you need newer packages from Hackage - , hackage.haskell.org 2026-05-13T07:31:22Z + , hackage.haskell.org 2026-05-18T17:14:36Z -- Bump this if you need newer packages from CHaP - , cardano-haskell-packages 2026-05-11T20:15:43Z - -active-repositories: - , :rest - , cardano-haskell-packages:override + , cardano-haskell-packages 2026-05-26T09:41:58Z packages: ./dmq-node @@ -44,21 +40,60 @@ if impl(ghc >= 9.12.0) -- rejecting: cardano-crypto-class-2.3.1.0 (conflict: cardano-crypto-tests => cardano-crypto-class>=2.2.2 && <2.2.4) -- allow-newer: cardano-crypto-tests:cardano-crypto-class --- ouroboros-network with PR#5376, but without contra-tracer-0.2.1.0 (PR#5368) source-repository-package type: git location: https://github.com/IntersectMBO/ouroboros-network - tag: 5a80699bca834a4de47aca4fe4d322832309e374 - --sha256: sha256-FXp0gIfsUDVEE4ZuEM5y55qx0I7d5+/wQ7AjUz6UDcE= - subdir: network-mux - cardano-diffusion - ouroboros-network + tag: 10e173b21a82f6142261f0f38da0ec14c8b8a91c + --sha256: sha256-l3lpFzcFj2xiKaj54A7Rvhuu3s6EtzIboaHyuGhBhG8= + subdir: + cardano-diffusion + network-mux + ouroboros-network + +source-repository-package + type: git + location: https://github.com/IntersectMBO/ouroboros-consensus.git + tag: 0411b4d50dc62cab07bbbf75805cf585a7a1f8e7 + --sha256: sha256-DNnGHdo+oQDBbHzAl6UZ/VcPoS4TxGrC9eCOiMxgc8A= + subdir: + . source-repository-package type: git - location: https://github.com/IntersectMBO/ouroboros-consensus - tag: ec9df6ee1d7ab918e75219107fc17e1b2cf1a0e9 - --sha256: sha256-c+yGPftvlas2CcnFLUPPqjnitz5yTu/Qud5LaSMyY34= + location: https://github.com/IntersectMBO/cardano-ledger.git + tag: 3f879bb37df4738ed8211e500c7d180443cfcbe4 + --sha256: sha256-uLjiIHiU1SzAmoKs+rynQphc3FUYXKeJLlOnp87uNdg= + subdir: + eras/allegra/impl + eras/alonzo/impl + eras/babbage/impl + eras/byron/chain/executable-spec + eras/byron/crypto + eras/byron/ledger/executable-spec + eras/byron/ledger/impl + eras/conway/impl + eras/dijkstra/impl + eras/mary/impl + eras/shelley-ma/test-suite + eras/shelley/impl + eras/shelley/test-suite + libs/cardano-data + libs/cardano-ledger-api + libs/cardano-ledger-binary + libs/cardano-ledger-core + libs/cardano-protocol-tpraos + libs/non-integral + libs/small-steps + libs/vector-map + +source-repository-package + type: git + location: https://github.com/f-f/kes-agent.git + tag: fdb4f4db05e3744ed413f83477020fdf43cf32a2 + --sha256: sha256-eyQc8Dk7+upSRQvH5eXZuj6asYhOLsH59ABJZDyvQ6I= + subdir: + kes-agent + kes-agent-crypto -- https://github.com/bgamari/monoidal-containers/pull/112 source-repository-package @@ -68,7 +103,6 @@ source-repository-package --sha256: sha256-HkQC2Hb1OAyN8mI2BPcIylcUYF0Mts4DrffJ7Fkkh6Q= constraints: semialign >= 1.4, - validation < 1.2 + validation >= 1.2 && < 2.0 allow-newer: hedgehog-quickcheck:QuickCheck, monoidal-containers:semialign - diff --git a/dmq-node/dmq-node.cabal b/dmq-node/dmq-node.cabal index 1b778aba..abf52952 100644 --- a/dmq-node/dmq-node.cabal +++ b/dmq-node/dmq-node.cabal @@ -125,7 +125,7 @@ library hashable >=1.0 && <1.6, io-classes:{io-classes, si-timers, strict-mvar, strict-stm} ^>=1.8.0.1, iproute ^>=1.7.15, - kes-agent-crypto ^>=1.1.0.0, + kes-agent-crypto ^>=1.2, mmap, mtl, network ^>=3.2.7, diff --git a/dmq-node/src/DMQ/Configuration/Topology.hs b/dmq-node/src/DMQ/Configuration/Topology.hs index 8deb6de3..ccc2f831 100644 --- a/dmq-node/src/DMQ/Configuration/Topology.hs +++ b/dmq-node/src/DMQ/Configuration/Topology.hs @@ -23,16 +23,11 @@ import Ouroboros.Network.OrphanInstances (localRootPeersGroupsFromJSON, networkTopologyFromJSON, networkTopologyToJSON) import System.Exit (die) --- TODO: move `NoExtraConfig` and the `ToJSON NoExtraFlags` to --- `ouroboros-network`. +-- TODO: move `NoExtraConfig` to `ouroboros-network`. data NoExtraConfig = NoExtraConfig deriving Show -instance ToJSON NoExtraFlags where - toJSON _ = Null - omitField _ = True - instance FromJSON (NetworkTopology NoExtraConfig NoExtraFlags) where parseJSON = networkTopologyFromJSON (localRootPeersGroupsFromJSON (\_ -> pure NoExtraFlags)) diff --git a/dmq-node/src/DMQ/NodeToClient.hs b/dmq-node/src/DMQ/NodeToClient.hs index 0d9d2401..a89c6590 100644 --- a/dmq-node/src/DMQ/NodeToClient.hs +++ b/dmq-node/src/DMQ/NodeToClient.hs @@ -51,7 +51,7 @@ import Ouroboros.Network.Handshake.Queryable (Queryable (..)) import Ouroboros.Network.Mux import Ouroboros.Network.OrphanInstances () import Ouroboros.Network.Protocol.Handshake (HandshakeArguments (..)) -import Ouroboros.Network.Protocol.Handshake.Codec (cborTermVersionDataCodec, +import Ouroboros.Network.Protocol.Handshake.Codec (mkVersionedCodecCBORTerm, codecHandshake, noTimeLimitsHandshake) import Ouroboros.Network.TxSubmission.Mempool.Reader import Ouroboros.Network.TxSubmission.Mempool.Simple @@ -71,7 +71,7 @@ ntcHandshakeArguments tracer = , haBearerTracer = nullTracer -- TODO , haHandshakeCodec = codecHandshake nodeToClientVersionCodec , haVersionDataCodec = - cborTermVersionDataCodec + mkVersionedCodecCBORTerm nodeToClientCodecCBORTerm , haAcceptVersion = acceptableVersion , haQueryVersion = queryVersion diff --git a/dmq-node/src/DMQ/NodeToNode.hs b/dmq-node/src/DMQ/NodeToNode.hs index 09be7004..70141ad2 100644 --- a/dmq-node/src/DMQ/NodeToNode.hs +++ b/dmq-node/src/DMQ/NodeToNode.hs @@ -99,7 +99,7 @@ import Ouroboros.Network.TxSubmission.Mempool.Reader import Ouroboros.Network.OrphanInstances () import Ouroboros.Network.Protocol.Handshake (HandshakeArguments (..)) -import Ouroboros.Network.Protocol.Handshake.Codec (cborTermVersionDataCodec, +import Ouroboros.Network.Protocol.Handshake.Codec (mkVersionedCodecCBORTerm, codecHandshake, timeLimitsHandshake) import Ouroboros.Network.Protocol.KeepAlive.Client (keepAliveClientPeer) import Ouroboros.Network.Protocol.KeepAlive.Codec (byteLimitsKeepAlive, @@ -716,7 +716,7 @@ ntnHandshakeArguments tracer = haHandshakeTracer = tracer , haBearerTracer = nullTracer -- TODO , haHandshakeCodec = codecHandshake nodeToNodeVersionCodec - , haVersionDataCodec = cborTermVersionDataCodec nodeToNodeCodecCBORTerm + , haVersionDataCodec = mkVersionedCodecCBORTerm nodeToNodeCodecCBORTerm , haAcceptVersion = acceptableVersion , haQueryVersion = queryVersion , haTimeLimits = timeLimitsHandshake diff --git a/dmq-node/src/DMQ/Tracer.hs b/dmq-node/src/DMQ/Tracer.hs index 585e75b1..9b34fe96 100644 --- a/dmq-node/src/DMQ/Tracer.hs +++ b/dmq-node/src/DMQ/Tracer.hs @@ -247,267 +247,267 @@ mkDMQTracers ekgStore dmqConfigFilePath = do let trForward = mempty mbTrEkg = Just ekgTrace - !dtMuxTracer <- mkTracer traceConfig configReflection + !dtMuxTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Mux", "Remote"] - !dtChannelTracer <- mkTracer + !dtChannelTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Mux", "Remote", "Channel"] - !dtBearerTracer <- mkTracer + !dtBearerTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Mux", "Remote", "Bearer"] - !dtHandshakeTracer <- mkTracer + !dtHandshakeTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Handshake", "Remote"] - !dtLocalMuxTracer <- mkTracer + !dtLocalMuxTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Mux", "Local"] - !dtLocalChannelTracer <- mkTracer + !dtLocalChannelTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Mux", "Local", "Channel"] - !dtLocalBearerTracer <- mkTracer + !dtLocalBearerTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Mux", "Local", "Bearer"] - !dtLocalHandshakeTracer <- mkTracer + !dtLocalHandshakeTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Handshake", "Local"] - !dtDiffusionTracer <- mkTracer + !dtDiffusionTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Startup", "DiffusionInit"] - !dtTraceLocalRootPeersTracer <- mkTracer + !dtTraceLocalRootPeersTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Peers", "LocalRoot"] - !dtTracePublicRootPeersTracer <- mkTracer + !dtTracePublicRootPeersTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Peers", "PublicRoot"] - !dtTraceLedgerPeersTracer <- mkTracer + !dtTraceLedgerPeersTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Peers", "Ledger"] - !dtTracePeerSelectionTracer <- mkTracer + !dtTracePeerSelectionTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "PeerSelection", "Selection"] - !dtDebugPeerSelectionTracer <- mkTracer + !dtDebugPeerSelectionTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "PeerSelection"] - !dtTracePeerSelectionCounters <- mkTracer + !dtTracePeerSelectionCounters <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "PeerSelection"] - !dtPeerSelectionActionsTracer <- mkTracer + !dtPeerSelectionActionsTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "PeerSelection", "Actions"] - !dtConnectionManagerTracer <- mkTracer + !dtConnectionManagerTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "ConnectionManager", "Remote"] - !dtConnectionManagerTransitionTracer <- mkTracer + !dtConnectionManagerTransitionTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "ConnectionManager", "Transition"] - !dtServerTracer <- mkTracer + !dtServerTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Server", "Local"] - !dtInboundGovernorTracer <- mkTracer + !dtInboundGovernorTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "InboundGovernor", "Remote"] - !dtInboundGovernorTransitionTracer <- mkTracer + !dtInboundGovernorTransitionTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "InboundGovernor", "Transition"] - !dtLocalConnectionManagerTracer <- mkTracer + !dtLocalConnectionManagerTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward Nothing -- never conflate metrics of the same name with those originating from `connectionManagerTr` ["Net", "ConnectionManager", "Local"] - !dtLocalServerTracer <- mkTracer + !dtLocalServerTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Server", "Local"] - !dtLocalInboundGovernorTracer <- mkTracer + !dtLocalInboundGovernorTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "InboundGovernor", "Local"] - !dtDnsTracer <- mkTracer + !dtDnsTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "DNS"] let dmqDifussionTracers = Diffusion.Tracers { - Diffusion.dtMuxTracer = Tracer $ Logging.traceWith dtMuxTracer, - Diffusion.dtChannelTracer = Tracer $ Logging.traceWith dtChannelTracer, - Diffusion.dtBearerTracer = Tracer $ Logging.traceWith dtBearerTracer, - Diffusion.dtHandshakeTracer = Tracer $ Logging.traceWith dtHandshakeTracer, - Diffusion.dtLocalMuxTracer = Tracer $ Logging.traceWith dtLocalMuxTracer, - Diffusion.dtLocalChannelTracer = Tracer $ Logging.traceWith dtLocalChannelTracer, - Diffusion.dtLocalBearerTracer = Tracer $ Logging.traceWith dtLocalBearerTracer, - Diffusion.dtLocalHandshakeTracer = Tracer $ Logging.traceWith dtLocalHandshakeTracer, - Diffusion.dtDiffusionTracer = Tracer $ Logging.traceWith dtDiffusionTracer, - Diffusion.dtTraceLocalRootPeersTracer = Tracer $ Logging.traceWith dtTraceLocalRootPeersTracer, - Diffusion.dtTracePublicRootPeersTracer = Tracer $ Logging.traceWith dtTracePublicRootPeersTracer, - Diffusion.dtTraceLedgerPeersTracer = Tracer $ Logging.traceWith dtTraceLedgerPeersTracer, - Diffusion.dtTracePeerSelectionTracer = Tracer $ Logging.traceWith dtTracePeerSelectionTracer, - Diffusion.dtDebugPeerSelectionTracer = Tracer $ Logging.traceWith dtDebugPeerSelectionTracer, - Diffusion.dtTracePeerSelectionCounters = Tracer $ Logging.traceWith dtTracePeerSelectionCounters, - Diffusion.dtPeerSelectionActionsTracer = Tracer $ Logging.traceWith dtPeerSelectionActionsTracer, - Diffusion.dtConnectionManagerTracer = Tracer $ Logging.traceWith dtConnectionManagerTracer, - Diffusion.dtConnectionManagerTransitionTracer = Tracer $ Logging.traceWith dtConnectionManagerTransitionTracer, - Diffusion.dtServerTracer = Tracer $ Logging.traceWith dtServerTracer, - Diffusion.dtInboundGovernorTracer = Tracer $ Logging.traceWith dtInboundGovernorTracer, - Diffusion.dtInboundGovernorTransitionTracer = Tracer $ Logging.traceWith dtInboundGovernorTransitionTracer, - Diffusion.dtLocalConnectionManagerTracer = Tracer $ Logging.traceWith dtLocalConnectionManagerTracer, - Diffusion.dtLocalServerTracer = Tracer $ Logging.traceWith dtLocalServerTracer, - Diffusion.dtLocalInboundGovernorTracer = Tracer $ Logging.traceWith dtLocalInboundGovernorTracer, - Diffusion.dtDnsTracer = Tracer $ Logging.traceWith dtDnsTracer + Diffusion.dtMuxTracer = mkTracer $ Logging.traceWith dtMuxTracer, + Diffusion.dtChannelTracer = mkTracer $ Logging.traceWith dtChannelTracer, + Diffusion.dtBearerTracer = mkTracer $ Logging.traceWith dtBearerTracer, + Diffusion.dtHandshakeTracer = mkTracer $ Logging.traceWith dtHandshakeTracer, + Diffusion.dtLocalMuxTracer = mkTracer $ Logging.traceWith dtLocalMuxTracer, + Diffusion.dtLocalChannelTracer = mkTracer $ Logging.traceWith dtLocalChannelTracer, + Diffusion.dtLocalBearerTracer = mkTracer $ Logging.traceWith dtLocalBearerTracer, + Diffusion.dtLocalHandshakeTracer = mkTracer $ Logging.traceWith dtLocalHandshakeTracer, + Diffusion.dtDiffusionTracer = mkTracer $ Logging.traceWith dtDiffusionTracer, + Diffusion.dtTraceLocalRootPeersTracer = mkTracer $ Logging.traceWith dtTraceLocalRootPeersTracer, + Diffusion.dtTracePublicRootPeersTracer = mkTracer $ Logging.traceWith dtTracePublicRootPeersTracer, + Diffusion.dtTraceLedgerPeersTracer = mkTracer $ Logging.traceWith dtTraceLedgerPeersTracer, + Diffusion.dtTracePeerSelectionTracer = mkTracer $ Logging.traceWith dtTracePeerSelectionTracer, + Diffusion.dtDebugPeerSelectionTracer = mkTracer $ Logging.traceWith dtDebugPeerSelectionTracer, + Diffusion.dtTracePeerSelectionCounters = mkTracer $ Logging.traceWith dtTracePeerSelectionCounters, + Diffusion.dtPeerSelectionActionsTracer = mkTracer $ Logging.traceWith dtPeerSelectionActionsTracer, + Diffusion.dtConnectionManagerTracer = mkTracer $ Logging.traceWith dtConnectionManagerTracer, + Diffusion.dtConnectionManagerTransitionTracer = mkTracer $ Logging.traceWith dtConnectionManagerTransitionTracer, + Diffusion.dtServerTracer = mkTracer $ Logging.traceWith dtServerTracer, + Diffusion.dtInboundGovernorTracer = mkTracer $ Logging.traceWith dtInboundGovernorTracer, + Diffusion.dtInboundGovernorTransitionTracer = mkTracer $ Logging.traceWith dtInboundGovernorTransitionTracer, + Diffusion.dtLocalConnectionManagerTracer = mkTracer $ Logging.traceWith dtLocalConnectionManagerTracer, + Diffusion.dtLocalServerTracer = mkTracer $ Logging.traceWith dtLocalServerTracer, + Diffusion.dtLocalInboundGovernorTracer = mkTracer $ Logging.traceWith dtLocalInboundGovernorTracer, + Diffusion.dtDnsTracer = mkTracer $ Logging.traceWith dtDnsTracer } - !sigSubmissionLogicTracer <- mkTracer + !sigSubmissionLogicTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "SigSubmission", "Logic"] - !sigSubmissionLogicPeerTracer <- mkTracer + !sigSubmissionLogicPeerTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "SigSubmission", "Logic"] - !localMsgSubmissionProtocolTracer <- mkTracer + !localMsgSubmissionProtocolTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Local", "SigSubmission", "Protocol"] - !localMsgSubmissionServerTracer <- mkTracer + !localMsgSubmissionServerTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Local", "SigSubmission", "Server"] - !localMsgNotificationProtocolTracer <- mkTracer + !localMsgNotificationProtocolTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Local", "MsgNotification", "Protocol"] - !localMsgNotificationServerTracer <- mkTracer + !localMsgNotificationServerTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Local", "MsgNotification", "Server"] - !sigSubmissionV2ProtocolTracer <- mkTracer + !sigSubmissionV2ProtocolTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "SigSubmission", "V2", "Protocol"] - !sigSubmissionInboundTracer <- mkTracer + !sigSubmissionInboundTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "SigSubmission", "Inbound"] - !sigSubmissionV1ProtocolTracer <- mkTracer + !sigSubmissionV1ProtocolTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "SigSubmission", "V1", "Protocol"] - !sigSubmissionOutboundV1Tracer <- mkTracer + !sigSubmissionOutboundV1Tracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "SigSubmission", "V1", "Outbound"] - !sigSubmissionOutboundV2Tracer <- mkTracer + !sigSubmissionOutboundV2Tracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "SigSubmission", "V2", "Outbound"] - !keepAliveProtocolTracer <- mkTracer + !keepAliveProtocolTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "KeepAlive", "Protocol"] - !peerSharingProtocolTracer <- mkTracer + !peerSharingProtocolTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "PeerShare", "Protocol"] - !dmqStartupTracer' <- mkTracer + !dmqStartupTracer' <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Startup"] - !localStateQueryClientTracer <- mkTracer + !localStateQueryClientTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Local", "LocalStateQuery"] - !sigValidationTracer <- mkTracer + !sigValidationTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Sig", "Validation"] - !localSigValidationTracer <- mkTracer + !localSigValidationTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Local", "Sig", "Validation"] - !cardanoNodeHandshakeTracer <- mkTracer + !cardanoNodeHandshakeTracer <- mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg ["Net", "Local", "Cardano", "Handshake"] let dmqTracers = DMQTracers { - sigSubmissionLogicTracer = Tracer $ Logging.traceWith sigSubmissionLogicTracer, - sigSubmissionLogicPeerTracer = Tracer $ Logging.traceWith sigSubmissionLogicPeerTracer, - localMsgSubmissionProtocolTracer = Tracer $ Logging.traceWith localMsgSubmissionProtocolTracer, - localMsgSubmissionServerTracer = Tracer $ Logging.traceWith localMsgSubmissionServerTracer, - localMsgNotificationProtocolTracer = Tracer $ Logging.traceWith localMsgNotificationProtocolTracer, - localMsgNotificationServerTracer = Tracer $ Logging.traceWith localMsgNotificationServerTracer, - sigSubmissionV2ProtocolTracer = Tracer $ Logging.traceWith sigSubmissionV2ProtocolTracer, - sigSubmissionInboundTracer = Tracer $ Logging.traceWith sigSubmissionInboundTracer, - sigSubmissionV1ProtocolTracer = Tracer $ Logging.traceWith sigSubmissionV1ProtocolTracer, - sigSubmissionOutboundV1Tracer = Tracer $ Logging.traceWith sigSubmissionOutboundV1Tracer, - sigSubmissionOutboundV2Tracer = Tracer $ Logging.traceWith sigSubmissionOutboundV2Tracer, - keepAliveProtocolTracer = Tracer $ Logging.traceWith keepAliveProtocolTracer, - peerSharingProtocolTracer = Tracer $ Logging.traceWith peerSharingProtocolTracer, - dmqStartupTracer = Tracer $ Logging.traceWith dmqStartupTracer', - localStateQueryClientTracer = Tracer $ Logging.traceWith localStateQueryClientTracer, - sigValidationTracer = Tracer $ Logging.traceWith sigValidationTracer, - localSigValidationTracer = Tracer $ Logging.traceWith localSigValidationTracer, - cardanoNodeHandshakeTracer = Tracer $ Logging.traceWith cardanoNodeHandshakeTracer + sigSubmissionLogicTracer = mkTracer $ Logging.traceWith sigSubmissionLogicTracer, + sigSubmissionLogicPeerTracer = mkTracer $ Logging.traceWith sigSubmissionLogicPeerTracer, + localMsgSubmissionProtocolTracer = mkTracer $ Logging.traceWith localMsgSubmissionProtocolTracer, + localMsgSubmissionServerTracer = mkTracer $ Logging.traceWith localMsgSubmissionServerTracer, + localMsgNotificationProtocolTracer = mkTracer $ Logging.traceWith localMsgNotificationProtocolTracer, + localMsgNotificationServerTracer = mkTracer $ Logging.traceWith localMsgNotificationServerTracer, + sigSubmissionV2ProtocolTracer = mkTracer $ Logging.traceWith sigSubmissionV2ProtocolTracer, + sigSubmissionInboundTracer = mkTracer $ Logging.traceWith sigSubmissionInboundTracer, + sigSubmissionV1ProtocolTracer = mkTracer $ Logging.traceWith sigSubmissionV1ProtocolTracer, + sigSubmissionOutboundV1Tracer = mkTracer $ Logging.traceWith sigSubmissionOutboundV1Tracer, + sigSubmissionOutboundV2Tracer = mkTracer $ Logging.traceWith sigSubmissionOutboundV2Tracer, + keepAliveProtocolTracer = mkTracer $ Logging.traceWith keepAliveProtocolTracer, + peerSharingProtocolTracer = mkTracer $ Logging.traceWith peerSharingProtocolTracer, + dmqStartupTracer = mkTracer $ Logging.traceWith dmqStartupTracer', + localStateQueryClientTracer = mkTracer $ Logging.traceWith localStateQueryClientTracer, + sigValidationTracer = mkTracer $ Logging.traceWith sigValidationTracer, + localSigValidationTracer = mkTracer $ Logging.traceWith localSigValidationTracer, + cardanoNodeHandshakeTracer = mkTracer $ Logging.traceWith cardanoNodeHandshakeTracer } -- This backend can only be used globally, i.e. will always apply to the namespace root. @@ -525,7 +525,7 @@ mkDMQTracers ekgStore dmqConfigFilePath = do -- | Create and configure a tracer. -- -mkTracer :: Logging.LogFormatting a +mkLoggingTracer :: Logging.LogFormatting a => Logging.MetaTrace a => Logging.TraceConfig -> Logging.ConfigReflection @@ -534,7 +534,7 @@ mkTracer :: Logging.LogFormatting a -> Maybe (Logging.Trace IO Logging.FormattedMessage) -> [Text] -> IO (Logging.Trace IO a) -mkTracer traceConfig configReflection stdoutTrace trForward mbTrEkg as = do +mkLoggingTracer traceConfig configReflection stdoutTrace trForward mbTrEkg as = do tracer <- Logging.mkCardanoTracer stdoutTrace trForward mbTrEkg as Logging.configureTracers configReflection traceConfig [tracer] return tracer @@ -1063,11 +1063,8 @@ instance ToJSON (PublicRootPeers (Diffusion.NoExtraPeers RemoteAddress) RemoteAd , "bigLedgerPeers" .= PublicRootPeers.getBigLedgerPeers prp ] --- TODO: move to this instance, `NoExtraChurnArgs` and `NoExtraAPI` to +-- TODO: move `NoExtraChurnArgs` and `NoExtraAPI` to -- `Ouroboros.Network.Diffusion.Types`. -instance ToJSON Diffusion.NoExtraDebugState where - toJSON _ = Null - omitField _ = True data NoExtraChurnArgs = NoExtraChurnArgs data NoExtraAPI = NoExtraAPI diff --git a/dmq-node/test/DMQ/Protocol/LocalMsgNotification/Test.hs b/dmq-node/test/DMQ/Protocol/LocalMsgNotification/Test.hs index df894aeb..c79be4a5 100644 --- a/dmq-node/test/DMQ/Protocol/LocalMsgNotification/Test.hs +++ b/dmq-node/test/DMQ/Protocol/LocalMsgNotification/Test.hs @@ -45,7 +45,7 @@ import Ouroboros.Network.Protocol.Codec.Utils qualified as Utils import Test.Ouroboros.Network.Protocol.Utils import Test.Ouroboros.Network.Utils -testTracer :: ({-Show a,-}Applicative m) => Tracer m a +testTracer :: ({-Show a,-}Monad m) => Tracer m a testTracer = nullTracer -- debugTracer tests :: TestTree diff --git a/dmq-node/test/Test/DMQ/SigSubmission/App.hs b/dmq-node/test/Test/DMQ/SigSubmission/App.hs index 5d70a897..ede2f335 100644 --- a/dmq-node/test/Test/DMQ/SigSubmission/App.hs +++ b/dmq-node/test/Test/DMQ/SigSubmission/App.hs @@ -25,7 +25,7 @@ import Control.Monad.Class.MonadThrow import Control.Monad.Class.MonadTime.SI import Control.Monad.Class.MonadTimer.SI import Control.Monad.IOSim -import Control.Tracer (Tracer (..), contramap) +import Control.Tracer (Tracer (..), contramap, mkTracer) import System.Random (mkStdGen) import Data.ByteString.Lazy qualified as BSL @@ -296,7 +296,7 @@ runSigSubmissionV2 tracer tracerSigLogic st0 sigDecisionPolicy = do let outbounds = (\(addr, (mempool, _, outDelay, _, outChannel, _)) -> do labelThisThread ("outbound-" ++ show addr) let outbound = sigSubmissionOutbound - (Tracer $ say . show) + (mkTracer $ say . show) (NumIdsAck $ getNumTxIdsToReq $ maxUnacknowledgedTxIds sigDecisionPolicy) (getMempoolReader mempool) (maxBound :: TestVersion) @@ -490,7 +490,7 @@ runSigSubmissionV2WithMetric tracer tracerSigLogic config st0 sigDecisionPolicy let outbounds = (\(addr, (mempool, _, outDelay, _, outChannel, _)) -> do labelThisThread ("outbound-" ++ show addr) let outbound = sigSubmissionOutbound - (Tracer $ say . show) + (mkTracer $ say . show) (NumIdsAck $ getNumTxIdsToReq $ maxUnacknowledgedTxIds sigDecisionPolicy) (getMempoolReader mempool) (maxBound :: TestVersion) diff --git a/flake.lock b/flake.lock index 6476700e..10eed9a7 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1779260980, - "narHash": "sha256-5SvJkobPmCtSYKwQWu1M/iFXj3g1PDy2bMJ9g1vm/No=", + "lastModified": 1780293242, + "narHash": "sha256-cK/Rh58qmk3dTDmiVMoM6uEy3hdN/tc7+N28DIjNyWk=", "owner": "IntersectMBO", "repo": "cardano-haskell-packages", - "rev": "4b6a661aa6463529c0ab0207567d62f85a6b899c", + "rev": "bb3c5ceedb1393dd407c816c884fc23171dc2aba", "type": "github" }, "original": { @@ -155,11 +155,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1779358087, - "narHash": "sha256-+tHfNr4EZabb5HaEzHXIOmG6WLkImGfG5DJg/JwKBE4=", + "lastModified": 1780425339, + "narHash": "sha256-yd/SUBUQ9Gf54ds7Trmk9CXFQ+iEBZd0hFpdF01/xYE=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "5ee161948ef9f17ff778d86e03eae8f10e3fd1f1", + "rev": "5037b3c78291afd5f46dce4f14ef29fe0243e2d4", "type": "github" }, "original": {