Implement ProtocolKey for Genesis Verification Key

Author: Damien LACHAUME / PALO-IT

mithril-aggregator/src/configuration.rs

@@ -1,5 +1,5 @@
 use config::{ConfigError, Map, Source, Value, ValueKind};
-use mithril_common::crypto_helper::{key_encode_hex, ProtocolGenesisSigner};
+use mithril_common::crypto_helper::ProtocolGenesisSigner;
 use mithril_common::era::adapters::EraReaderAdapterType;
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
@@ -143,7 +143,7 @@ impl Configuration {
             db_directory: PathBuf::new(),
             snapshot_directory: PathBuf::new(),
             data_stores_directory: PathBuf::from(":memory:"),
-            genesis_verification_key: key_encode_hex(genesis_verification_key).unwrap(),
+            genesis_verification_key: genesis_verification_key.to_json_hex().unwrap(),
             reset_digests_cache: false,
             disable_digests_cache: false,
             store_retention_limit: None,

mithril-aggregator/src/dependency_injection/builder.rs

@@ -4,7 +4,9 @@ use mithril_common::{
     api_version::APIVersionProvider,
     certificate_chain::{CertificateVerifier, MithrilCertificateVerifier},
     chain_observer::{CardanoCliChainObserver, CardanoCliRunner, ChainObserver, FakeObserver},
-    crypto_helper::{key_decode_hex, ProtocolGenesisSigner, ProtocolGenesisVerifier},
+    crypto_helper::{
+        ProtocolGenesisSigner, ProtocolGenesisVerificationKey, ProtocolGenesisVerifier,
+    },
     database::{ApplicationNodeType, DatabaseVersionChecker},
     digesters::{
         cache::{ImmutableFileDigestCacheProvider, JsonImmutableFileDigestCacheProviderBuilder},
@@ -617,14 +619,15 @@ impl DependenciesBuilder {
     async fn build_genesis_verifier(&mut self) -> Result<Arc<ProtocolGenesisVerifier>> {
         let genesis_verifier: ProtocolGenesisVerifier = match self.configuration.environment {
             ExecutionEnvironment::Production => ProtocolGenesisVerifier::from_verification_key(
-                key_decode_hex(&self.configuration.genesis_verification_key).map_err(|e| {
-                    DependenciesBuilderError::Initialization {
-                        message: format!(
-                            "Could not decode hex key to build genesis verifier: '{}' Error: {e}.",
-                            self.configuration.genesis_verification_key
-                        ),
-                        error: None,
-                    }
+                ProtocolGenesisVerificationKey::from_json_hex(
+                    &self.configuration.genesis_verification_key,
+                )
+                .map_err(|e| DependenciesBuilderError::Initialization {
+                    message: format!(
+                        "Could not decode hex key to build genesis verifier: '{}'",
+                        self.configuration.genesis_verification_key
+                    ),
+                    error: Some(e),
                 })?,
             ),
             _ => ProtocolGenesisSigner::create_deterministic_genesis_signer()

mithril-common/src/crypto_helper/genesis.rs

@@ -64,8 +64,7 @@ impl ProtocolGenesisSigner {
         &self,
         expanded_secret_key: &ExpandedSecretKey,
     ) -> ProtocolGenesisVerificationKey {
-        let verification_key: ProtocolGenesisVerificationKey = expanded_secret_key.into();
-        verification_key
+        ProtocolGenesisVerificationKey::new(expanded_secret_key.into())
     }
 
     /// Create a ProtocolGenesisVerifier
@@ -111,7 +110,7 @@ impl ProtocolGenesisVerifier {
 
     /// ProtocolGenesisVerifier to ProtocolGenesisVerificationKey
     pub fn to_verification_key(&self) -> ProtocolGenesisVerificationKey {
-        self.verification_key
+        self.verification_key.clone()
     }
 
     /// Verifies the signature of a message

mithril-common/src/crypto_helper/types/alias.rs

@@ -51,9 +51,6 @@ pub type ProtocolClosedKeyRegistration = ClosedKeyReg<D>;
 /// Alias of [MithrilStm:StmAggrVerificationKey](struct@mithril_stm::stm::StmAggrVerificationKey).
 pub type ProtocolAggregateVerificationKey = StmAggrVerificationKey<D>;
 
-/// Alias of [Ed25519:PublicKey](https://docs.rs/ed25519-dalek/latest/ed25519_dalek/struct.PublicKey.html).
-pub type ProtocolGenesisVerificationKey = ed25519_dalek::PublicKey;
-
 /// Alias of [Ed25519:SecretKey](https://docs.rs/ed25519-dalek/latest/ed25519_dalek/struct.SecretKey.html).
 pub type ProtocolGenesisSecretKey = ed25519_dalek::SecretKey;
 

mithril-common/src/crypto_helper/types/wrappers.rs

@@ -26,6 +26,9 @@ pub type ProtocolGenesisSignature = ProtocolKey<ed25519_dalek::Signature>;
 /// Wrapper of [OpCert] to add serialization utilities.
 pub type ProtocolOpCert = ProtocolKey<OpCert>;
 
+/// Alias of [Ed25519:PublicKey](https://docs.rs/ed25519-dalek/latest/ed25519_dalek/struct.PublicKey.html).
+pub type ProtocolGenesisVerificationKey = ProtocolKey<ed25519_dalek::PublicKey>;
+
 impl ProtocolGenesisSignature {
     /// Create an instance from a bytes hex representation
     pub fn from_bytes_hex(hex_string: &str) -> StdResult<Self> {
@@ -70,6 +73,6 @@ impl ProtocolKeyCodec<ed25519_dalek::Signature> for ed25519_dalek::Signature {
 }
 
 impl_codec_and_type_conversions_for_protocol_key!(
-    json_hex_codec => StmVerificationKeyPoP, Sum6KesSig, StmSig, StmAggrSig<D>, OpCert
+    json_hex_codec => StmVerificationKeyPoP, Sum6KesSig, StmSig, StmAggrSig<D>, OpCert, ed25519_dalek::PublicKey
 );
 impl_codec_and_type_conversions_for_protocol_key!(no_default_codec => ed25519_dalek::Signature);