Convert EraMarkersVerifierSignature to ProtocolKey

Author: Alenar

mithril-common/src/crypto_helper/era.rs

@@ -13,7 +13,7 @@ pub type EraMarkersVerifierVerificationKey = ProtocolKey<ed25519_dalek::PublicKe
 pub type EraMarkersVerifierSecretKey = ProtocolKey<ed25519_dalek::SecretKey>;
 
 /// Alias of [Ed25519:Signature](https://docs.rs/ed25519-dalek/latest/ed25519_dalek/struct.Signature.html).
-pub type EraMarkersVerifierSignature = ed25519_dalek::Signature;
+pub type EraMarkersVerifierSignature = ProtocolKey<ed25519_dalek::Signature>;
 
 #[derive(Error, Debug)]
 /// [EraMarkersSigner] and [EraMarkersVerifier] related errors.
@@ -80,7 +80,7 @@ impl EraMarkersSigner {
     pub fn sign(&self, message: &[u8]) -> EraMarkersVerifierSignature {
         let expanded_secret_key = self.create_expanded_secret_key();
         let verification_key = self.create_verification_key(&expanded_secret_key);
-        expanded_secret_key.sign(message, &verification_key)
+        expanded_secret_key.sign(message, &verification_key).into()
     }
 }
 

mithril-common/src/era/adapters/cardano_chain.rs

@@ -4,12 +4,10 @@ use crate::{
         key_decode_hex, EraMarkersSigner, EraMarkersVerifier, EraMarkersVerifierSignature,
         EraMarkersVerifierVerificationKey,
     },
-    entities::HexEncodedEraMarkersSignature,
     era::{EraMarker, EraReaderAdapter},
     StdError, StdResult,
 };
 use async_trait::async_trait;
-use hex::{FromHex, ToHex};
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use thiserror::Error;
@@ -45,7 +43,7 @@ pub struct EraMarkersPayload {
     pub markers: Vec<EraMarker>,
 
     /// Era markers signature
-    pub signature: Option<HexEncodedEraMarkersSignature>,
+    pub signature: Option<EraMarkersVerifierSignature>,
 }
 
 impl EraMarkersPayload {
@@ -54,39 +52,28 @@ impl EraMarkersPayload {
             .map_err(|e| EraMarkersPayloadError::SerializeMessage(e.into()))
     }
 
-    fn deserialize_signature(&self) -> Result<EraMarkersVerifierSignature, EraMarkersPayloadError> {
-        EraMarkersVerifierSignature::from_bytes(
-            &Vec::from_hex(
-                self.signature
-                    .as_ref()
-                    .ok_or(EraMarkersPayloadError::MissingSignature)?,
-            )
-            .map_err(|e| EraMarkersPayloadError::DeserializeSignature(e.into()))?,
-        )
-        .map_err(|e| EraMarkersPayloadError::DeserializeSignature(e.into()))
-    }
-
     /// Verify the signature an era markers payload
     pub fn verify_signature(
         &self,
         verification_key: EraMarkersVerifierVerificationKey,
     ) -> Result<(), EraMarkersPayloadError> {
+        let signature = self
+            .signature
+            .ok_or(EraMarkersPayloadError::MissingSignature)?;
         let markers_verifier = EraMarkersVerifier::from_verification_key(verification_key);
 
         markers_verifier
-            .verify(&self.message_to_bytes()?, &self.deserialize_signature()?)
+            .verify(&self.message_to_bytes()?, &signature)
             .map_err(|e| EraMarkersPayloadError::VerifySignature(e.into()))
     }
 
     /// Sign an era markers payload
     pub fn sign(self, signer: &EraMarkersSigner) -> Result<Self, EraMarkersPayloadError> {
-        let signature = signer
-            .sign(
-                &self
-                    .message_to_bytes()
-                    .map_err(|e| EraMarkersPayloadError::CreateSignature(e.into()))?,
-            )
-            .encode_hex::<String>();
+        let signature = signer.sign(
+            &self
+                .message_to_bytes()
+                .map_err(|e| EraMarkersPayloadError::CreateSignature(e.into()))?,
+        );
 
         Ok(Self {
             markers: self.markers,
@@ -155,7 +142,7 @@ mod test {
 
     use super::*;
 
-    const GOLDEN_ERA_MARKERS_PAYLOAD: &str =
+    const GOLDEN_ERA_MARKERS_PAYLOAD_WITH_SIGNATURE: &str =
         "7b226d61726b657273223a5b7b226e616d65223a227468616c6573222c2265706f6368223a317d2c7b226e616d\
         65223a227079746861676f726173222c2265706f6368223a327d5d2c227369676e6174757265223a22633539373\
         9653333663163336234376361306162353239386536353562316264653235656564303866356232653536663361\
@@ -175,8 +162,8 @@ mod test {
     }
 
     #[test]
-    fn golden_markers_payload() {
-        let _: EraMarkersPayload = key_decode_hex(GOLDEN_ERA_MARKERS_PAYLOAD)
+    fn golden_markers_payload_with_signature() {
+        let _: EraMarkersPayload = key_decode_hex(GOLDEN_ERA_MARKERS_PAYLOAD_WITH_SIGNATURE)
             .expect("Decoding golden markers payload should not fail");
     }