chore(dmq): update 'DmqMsg' with new layout

Author: jpraynaud

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

@@ -115,11 +115,13 @@ impl<M: TryFromBytes + Debug> DmqConsumerClientPallas<M> {
             .0
             .into_iter()
             .map(|dmq_message| {
-                let opcert_without_verification_key =
-                    OpCertWithoutColdVerificationKey::try_from_bytes(
-                        &dmq_message.operational_certificate,
-                    )
-                    .with_context(|| "Failed to parse operational certificate")?;
+                let opcert_without_verification_key = OpCertWithoutColdVerificationKey::try_new(
+                    &dmq_message.operational_certificate.kes_vk,
+                    dmq_message.operational_certificate.issue_number,
+                    dmq_message.operational_certificate.start_kes_period,
+                    &dmq_message.operational_certificate.cert_sig,
+                )
+                .with_context(|| "Failed to parse operational certificate")?;
                 let cold_verification_key =
                     Ed25519VerificationKey::from_bytes(&dmq_message.cold_verification_key)
                         .with_context(|| "Failed to parse cold verification key")?
@@ -171,7 +173,7 @@ mod tests {
         facades::DmqServer,
         miniprotocols::{
             localmsgnotification,
-            localmsgsubmission::{DmqMsg, DmqMsgPayload},
+            localmsgsubmission::{DmqMsg, DmqMsgOperationalCertificate, DmqMsgPayload},
         },
     };
     use tokio::{net::UnixListener, task::JoinHandle, time::sleep};
@@ -194,14 +196,20 @@ mod tests {
                     expires_at: 100,
                 },
                 kes_signature: vec![0, 1, 2, 3],
-                operational_certificate: vec![
-                    132, 88, 32, 230, 80, 215, 83, 21, 9, 187, 108, 255, 215, 153, 140, 40, 198,
-                    142, 78, 200, 250, 98, 26, 9, 82, 32, 110, 161, 30, 176, 63, 205, 125, 203, 41,
-                    0, 0, 88, 64, 212, 171, 206, 39, 218, 5, 255, 3, 193, 52, 44, 198, 171, 83, 19,
-                    80, 114, 225, 186, 191, 156, 192, 84, 146, 245, 159, 31, 240, 9, 247, 4, 87,
-                    170, 168, 98, 199, 21, 139, 19, 190, 12, 251, 65, 215, 169, 26, 86, 37, 137,
-                    188, 17, 14, 178, 205, 175, 93, 39, 86, 4, 138, 187, 234, 95, 5,
-                ],
+                operational_certificate: DmqMsgOperationalCertificate {
+                    kes_vk: vec![
+                        50, 45, 160, 42, 80, 78, 184, 20, 210, 77, 140, 152, 63, 49, 165, 168, 5,
+                        131, 101, 152, 110, 242, 144, 157, 176, 210, 5, 10, 166, 91, 196, 168,
+                    ],
+                    issue_number: 0,
+                    start_kes_period: 0,
+                    cert_sig: vec![
+                        207, 135, 144, 168, 238, 41, 179, 216, 245, 74, 164, 231, 4, 158, 234, 141,
+                        5, 19, 166, 11, 78, 34, 210, 211, 183, 72, 127, 83, 185, 156, 107, 55, 160,
+                        190, 73, 251, 204, 47, 197, 86, 174, 231, 13, 49, 7, 83, 173, 177, 27, 53,
+                        209, 66, 24, 203, 226, 152, 3, 91, 66, 56, 244, 206, 79, 0,
+                    ],
+                },
                 cold_verification_key: vec![
                     32, 253, 186, 201, 177, 11, 117, 135, 187, 167, 181, 188, 22, 59, 206, 105,
                     231, 150, 215, 30, 78, 212, 76, 16, 252, 180, 72, 134, 137, 247, 161, 68,
@@ -215,14 +223,20 @@ mod tests {
                     expires_at: 101,
                 },
                 kes_signature: vec![1, 2, 3, 4],
-                operational_certificate: vec![
-                    132, 88, 32, 230, 80, 215, 83, 21, 9, 187, 108, 255, 215, 153, 140, 40, 198,
-                    142, 78, 200, 250, 98, 26, 9, 82, 32, 110, 161, 30, 176, 63, 205, 125, 203, 41,
-                    0, 0, 88, 64, 212, 171, 206, 39, 218, 5, 255, 3, 193, 52, 44, 198, 171, 83, 19,
-                    80, 114, 225, 186, 191, 156, 192, 84, 146, 245, 159, 31, 240, 9, 247, 4, 87,
-                    170, 168, 98, 199, 21, 139, 19, 190, 12, 251, 65, 215, 169, 26, 86, 37, 137,
-                    188, 17, 14, 178, 205, 175, 93, 39, 86, 4, 138, 187, 234, 95, 5,
-                ],
+                operational_certificate: DmqMsgOperationalCertificate {
+                    kes_vk: vec![
+                        50, 45, 160, 42, 80, 78, 184, 20, 210, 77, 140, 152, 63, 49, 165, 168, 5,
+                        131, 101, 152, 110, 242, 144, 157, 176, 210, 5, 10, 166, 91, 196, 168,
+                    ],
+                    issue_number: 0,
+                    start_kes_period: 0,
+                    cert_sig: vec![
+                        207, 135, 144, 168, 238, 41, 179, 216, 245, 74, 164, 231, 4, 158, 234, 141,
+                        5, 19, 166, 11, 78, 34, 210, 211, 183, 72, 127, 83, 185, 156, 107, 55, 160,
+                        190, 73, 251, 204, 47, 197, 86, 174, 231, 13, 49, 7, 83, 173, 177, 27, 53,
+                        209, 66, 24, 203, 226, 152, 3, 91, 66, 56, 244, 206, 79, 0,
+                    ],
+                },
                 cold_verification_key: vec![
                     77, 75, 24, 6, 47, 133, 2, 89, 141, 224, 69, 202, 123, 105, 240, 103, 245, 159,
                     147, 177, 110, 58, 248, 115, 58, 152, 138, 220, 35, 65, 245, 200,

internal/mithril-dmq/src/consumer/server/queue.rs

@@ -122,7 +122,9 @@ mod tests {
     use std::{ops::RangeInclusive, time::Duration};
 
     use anyhow::anyhow;
-    use pallas_network::miniprotocols::localmsgsubmission::{DmqMsg, DmqMsgPayload};
+    use pallas_network::miniprotocols::localmsgsubmission::{
+        DmqMsg, DmqMsgOperationalCertificate, DmqMsgPayload,
+    };
     use tokio::time::sleep;
 
     use crate::model::MockUnixTimestampProvider;
@@ -138,7 +140,12 @@ mod tests {
                 expires_at: 100,
             },
             kes_signature: vec![0, 1, 2, 3],
-            operational_certificate: vec![0, 1, 2, 3, 4],
+            operational_certificate: DmqMsgOperationalCertificate {
+                kes_vk: vec![12, 13, 14],
+                issue_number: 15,
+                start_kes_period: 16,
+                cert_sig: vec![17],
+            },
             cold_verification_key: vec![0, 1, 2, 3, 4, 5],
         }
     }

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

@@ -2,12 +2,14 @@ use std::sync::Arc;
 
 use anyhow::Context;
 use blake2::{Blake2b, Digest, digest::consts::U64};
-use pallas_network::miniprotocols::localmsgsubmission::{DmqMsg, DmqMsgPayload};
+use pallas_network::miniprotocols::localmsgsubmission::{
+    DmqMsg, DmqMsgOperationalCertificate, DmqMsgPayload,
+};
 
 use mithril_cardano_node_chain::chain_observer::ChainObserver;
 use mithril_common::{
     StdResult,
-    crypto_helper::{KesSigner, SerDeShelleyFileFormat, TryToBytes},
+    crypto_helper::{KesSigner, TryToBytes},
 };
 
 use crate::model::{DmqMessage, SystemUnixTimestampProvider, UnixTimestampProvider};
@@ -99,8 +101,19 @@ impl DmqMessageBuilder {
         let dmq_message = DmqMsg {
             msg_payload: dmq_message_payload,
             kes_signature: kes_signature.to_bytes_vec()?,
-            operational_certificate: operational_certificate_without_cold_verification_key
-                .to_cbor_bytes()?,
+            operational_certificate: DmqMsgOperationalCertificate {
+                kes_vk: operational_certificate_without_cold_verification_key
+                    .kes_vk()
+                    .as_bytes()
+                    .to_vec(),
+                issue_number: operational_certificate_without_cold_verification_key.issue_number(),
+                start_kes_period: operational_certificate_without_cold_verification_key
+                    .start_kes_period(),
+                cert_sig: operational_certificate_without_cold_verification_key
+                    .cert_sig()
+                    .to_bytes()
+                    .to_vec(),
+            },
             cold_verification_key: cold_verification_key.to_bytes().to_vec(),
         };
 
@@ -177,10 +190,24 @@ mod tests {
             DmqMsg {
                 msg_payload: expected_msg_payload.clone(),
                 kes_signature: kes_signature.to_bytes_vec().unwrap(),
-                operational_certificate: operational_certificate
-                    .get_opcert_without_cold_verification_key()
-                    .to_cbor_bytes()
-                    .unwrap(),
+                operational_certificate: DmqMsgOperationalCertificate {
+                    kes_vk: operational_certificate
+                        .get_opcert_without_cold_verification_key()
+                        .kes_vk()
+                        .as_bytes()
+                        .to_vec(),
+                    issue_number: operational_certificate
+                        .get_opcert_without_cold_verification_key()
+                        .issue_number(),
+                    start_kes_period: operational_certificate
+                        .get_opcert_without_cold_verification_key()
+                        .start_kes_period(),
+                    cert_sig: operational_certificate
+                        .get_opcert_without_cold_verification_key()
+                        .cert_sig()
+                        .to_bytes()
+                        .to_vec(),
+                },
                 cold_verification_key: operational_certificate
                     .get_cold_verification_key()
                     .to_bytes()

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

@@ -72,7 +72,9 @@ impl<'de> Deserialize<'de> for DmqMessage {
 
 #[cfg(test)]
 mod tests {
-    use pallas_network::miniprotocols::localmsgsubmission::DmqMsgPayload;
+    use pallas_network::miniprotocols::localmsgsubmission::{
+        DmqMsgOperationalCertificate, DmqMsgPayload,
+    };
 
     use super::*;
 
@@ -86,7 +88,12 @@ mod tests {
                 expires_at: 100,
             },
             kes_signature: vec![0, 1, 2, 3],
-            operational_certificate: vec![0, 1, 2, 3, 4],
+            operational_certificate: DmqMsgOperationalCertificate {
+                kes_vk: vec![12, 13, 14],
+                issue_number: 15,
+                start_kes_period: 16,
+                cert_sig: vec![17],
+            },
             cold_verification_key: vec![0, 1, 2, 3, 4, 5],
         };
 

internal/mithril-dmq/src/publisher/server/pallas.rs

@@ -243,7 +243,7 @@ mod tests {
     use pallas_network::{
         facades::DmqClient,
         miniprotocols::{
-            localmsgsubmission::{DmqMsg, DmqMsgPayload},
+            localmsgsubmission::{DmqMsg, DmqMsgOperationalCertificate, DmqMsgPayload},
             localtxsubmission,
         },
     };
@@ -268,7 +268,12 @@ mod tests {
                 expires_at: 100,
             },
             kes_signature: vec![0, 1, 2, 3],
-            operational_certificate: vec![0, 1, 2, 3, 4],
+            operational_certificate: DmqMsgOperationalCertificate {
+                kes_vk: vec![12, 13, 14],
+                issue_number: 15,
+                start_kes_period: 16,
+                cert_sig: vec![17],
+            },
             cold_verification_key: vec![0, 1, 2, 3, 4, 5],
         }
     }

mithril-common/src/crypto_helper/cardano/opcert.rs

@@ -1,9 +1,6 @@
 //! Module to (de)serialise, OpCert using the same structure as used in Cardano.  
 
-use super::SerDeShelleyFileFormat;
-use crate::crypto_helper::cardano::ProtocolRegistrationErrorWrapper;
-use crate::crypto_helper::{ProtocolPartyId, encode_bech32};
-
+use anyhow::anyhow;
 use blake2::{Blake2b, Digest, digest::consts::U28};
 use ed25519_dalek::{
     Signature as EdSignature, Signer, SigningKey as EdSecretKey, Verifier,
@@ -16,6 +13,12 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use sha2::Sha256;
 use thiserror::Error;
 
+use crate::StdResult;
+use crate::crypto_helper::cardano::ProtocolRegistrationErrorWrapper;
+use crate::crypto_helper::{ProtocolPartyId, encode_bech32};
+
+use super::SerDeShelleyFileFormat;
+
 /// Operational certificate error
 #[derive(Error, Debug, PartialEq, Eq)]
 pub enum OpCertError {
@@ -47,6 +50,45 @@ pub struct OpCertWithoutColdVerificationKey {
     pub(crate) cert_sig: EdSignature,
 }
 
+impl OpCertWithoutColdVerificationKey {
+    /// OpCertWithoutColdVerificationKey factory
+    pub fn try_new(
+        kes_vk: &[u8],
+        issue_number: u64,
+        start_kes_period: u64,
+        cert_sig: &[u8],
+    ) -> StdResult<Self> {
+        Ok(Self {
+            kes_vk: KesPublicKey::from_bytes(kes_vk)
+                .map_err(|_| anyhow!("KES vk serialisation error"))?,
+            issue_number,
+            start_kes_period,
+            cert_sig: EdSignature::from_slice(cert_sig)
+                .map_err(|_| anyhow!("ed25519 signature serialisation error"))?,
+        })
+    }
+
+    /// Get the KES verification key
+    pub fn kes_vk(&self) -> KesPublicKey {
+        self.kes_vk
+    }
+
+    /// Get the issue number
+    pub fn issue_number(&self) -> u64 {
+        self.issue_number
+    }
+
+    /// Get the start KES period
+    pub fn start_kes_period(&self) -> u64 {
+        self.start_kes_period
+    }
+
+    /// Get the certificate signature
+    pub fn cert_sig(&self) -> EdSignature {
+        self.cert_sig
+    }
+}
+
 impl SerDeShelleyFileFormat for OpCertWithoutColdVerificationKey {
     const TYPE: &'static str = "NodeOperationalCertificateWithoutColdVerificationKey";
     const DESCRIPTION: &'static str = "";