Merge pull request #2923 from input-output-hk/jpraynaud/2833-add-debug-dmq-msg-id

feat: add debug DMQ message ids

Author: jpraynaud

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "mithril-dmq"
 description = "Mechanisms to publish and consume messages of a 'Decentralized Message Queue network' through a DMQ node"
-version = "0.1.18"
+version = "0.1.19"
 authors.workspace = true
 documentation.workspace = true
 edition.workspace = true
@@ -19,6 +19,7 @@ anyhow = { workspace = true }
 async-trait = { workspace = true }
 bincode = { version = "=2.0.1" }
 blake2 = "0.10.6"
+hex = { workspace = true }
 mithril-cardano-node-chain = { path = "../cardano-node/mithril-cardano-node-chain" }
 mithril-common = { path = "../../mithril-common" }
 pallas-codec = { version = "0.34.0" }

internal/mithril-dmq/Cargo.toml

@@ -116,6 +116,13 @@ impl<M: TryFromBytes + Debug> DmqConsumerClientPallas<M> {
             .0
             .into_iter()
             .map(|dmq_message| {
+                debug!(
+                    self.logger,
+                    "Received DMQ message";
+                    "msg_id" => hex::encode(&dmq_message.msg_payload.msg_id),
+                    "kes_period" => dmq_message.msg_payload.kes_period,
+                    "expires_at" => dmq_message.msg_payload.expires_at,
+                );
                 let opcert_without_verification_key = OpCertWithoutColdVerificationKey::try_new(
                     &dmq_message.operational_certificate.kes_vk,
                     dmq_message.operational_certificate.issue_number,

internal/mithril-dmq/src/consumer/client/pallas.rs

@@ -1,11 +1,12 @@
+use std::fmt::Debug;
 use std::ops::{Deref, DerefMut};
 
 use pallas_codec::minicbor::{Decode, Decoder, Encode, Encoder};
 use pallas_network::miniprotocols::localmsgsubmission::DmqMsg;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 /// Wrapper for a DMQ message which can be serialized and deserialized.
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Clone, PartialEq, Eq)]
 pub struct DmqMessage(DmqMsg);
 
 #[derive(Serialize, Deserialize)]
@@ -70,6 +71,24 @@ impl<'de> Deserialize<'de> for DmqMessage {
     }
 }
 
+impl Debug for DmqMessage {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let is_pretty_printing = f.alternate();
+        let mut debug = f.debug_struct("DmqMessage");
+        debug
+            .field("id", &hex::encode(&self.msg_payload.msg_id))
+            .field("kes_period", &self.msg_payload.kes_period)
+            .field("expires_at", &self.msg_payload.expires_at);
+
+        match is_pretty_printing {
+            true => debug
+                .field("body", &format_args!("{:?}", self.msg_payload.msg_body))
+                .finish(),
+            false => debug.finish_non_exhaustive(),
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use pallas_network::miniprotocols::localmsgsubmission::{

internal/mithril-dmq/src/model/message.rs

@@ -1,2 +1,2 @@
-0.4.19
+0.4.20
 

mithril-test-lab/mithril-devnet/VERSION

@@ -4,21 +4,24 @@ for NODE in ${ALL_NODES}; do
   "NetworkMagic": ${DMQ_NETWORK_MAGIC},
   "CardanoNodeSocket": "${NODE}/ipc/node.sock",
   "CardanoNetworkMagic": ${NETWORK_MAGIC},
+  "PeerSharing": true,
   "LocalMsgSubmissionTracer": true,
   "LocalMsgNotificationTracer": true,
   "ConnectionManagerTracer": true,
-  "DiffusionTracer": false,
-  "InboundGovernorTracer": false,
-  "LocalInboundGovernorTracer": false,
+  "DiffusionTracer": true,
+  "InboundGovernorTracer": true,
+  "LocalInboundGovernorTracer": true,
   "PeerSelectionTracer": true,
-  "PeerSelectionCounters": false,
-  "PeerSharing": false,
+  "PeerSelectionCounters": true,
   "SigSubmissionLogicTracer": true,
   "SigSubmissionClientTracer": true,
   "SigSubmissionServerTracer": true,
+  "SigSubmissionClientProtocolTracer": true,
+  "SigSubmissionServerProtocolTracer": true,
   "MuxTracer": true,
-  "ChannelTracer": true,
-  "DebugPeerSelectionTracer": true
+  "ChannelTracer": false,
+  "DebugPeerSelectionTracer": true,
+  "ValidationTracer": true
 }
 
 EOF