fix: remove uuidv4 and ed25519pubkey type

Signed-off-by: bkioshn <[email protected]>

Author: bkioshn

.config/dictionaries/project.dic

@@ -257,7 +257,6 @@ ureq
 userid
 utimensat
 UTXO
-uuidv
 vitss
 Vkey
 vkeywitness

rust/rbac-registration/Cargo.toml

@@ -31,6 +31,8 @@ bech32 = "0.11.0"
 dashmap = "6.1.0"
 blake2b_simd = "1.0.2"
 tracing = "0.1.40"
+ed25519-dalek = "2.1.1"
+uuid = "1.11.0"
 
 c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git" , tag = "v0.0.3" }
 pallas = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }

rust/rbac-registration/src/cardano/cip509/mod.rs

@@ -16,7 +16,8 @@ use minicbor::{
 };
 use pallas::{crypto::hash::Hash, ledger::traverse::MultiEraTx};
 use strum_macros::FromRepr;
-use types::{tx_input_hash::TxInputHash, uuidv4::UuidV4};
+use types::tx_input_hash::TxInputHash;
+use uuid::Uuid;
 use validation::{
     validate_aux, validate_payment_key, validate_role_singing_key, validate_stake_public_key,
     validate_txn_inputs_hash,
@@ -37,7 +38,7 @@ pub const LABEL: u64 = 509;
 #[derive(Debug, PartialEq, Clone, Default)]
 pub struct Cip509 {
     /// `UUIDv4` Purpose .
-    pub purpose: UuidV4, // (bytes .size 16)
+    pub purpose: Uuid, // (bytes .size 16)
     /// Transaction inputs hash.
     pub txn_inputs_hash: TxInputHash, // bytes .size 16
     /// Optional previous transaction ID.
@@ -101,7 +102,7 @@ impl Decode<'_, ()> for Cip509 {
                 match key {
                     Cip509IntIdentifier::Purpose => {
                         cip509_metadatum.purpose =
-                            UuidV4::try_from(decode_bytes(d, "CIP509 purpose")?).map_err(|_| {
+                            Uuid::try_from(decode_bytes(d, "CIP509 purpose")?).map_err(|_| {
                                 decode::Error::message("Invalid data size of Purpose")
                             })?;
                     },

rust/rbac-registration/src/cardano/cip509/rbac/pub_key.rs

@@ -1,12 +1,10 @@
 //! Public key type for RBAC metadata
 
+use ed25519_dalek::VerifyingKey;
 use minicbor::{decode, Decode, Decoder};
 
 use super::tag::KeyTag;
-use crate::{
-    cardano::cip509::types::ed25519_pubkey::Ed25519PublicKey,
-    utils::decode_helper::{decode_bytes, decode_tag},
-};
+use crate::utils::decode_helper::{decode_bytes, decode_tag};
 
 /// Enum of possible public key type.
 #[derive(Debug, PartialEq, Clone, Default)]
@@ -17,7 +15,7 @@ pub enum SimplePublicKeyType {
     /// Deleted indicates the key is deleted.
     Deleted,
     /// Ed25519 public key.
-    Ed25519(Ed25519PublicKey),
+    Ed25519(VerifyingKey),
 }
 
 impl Decode<'_, ()> for SimplePublicKeyType {
@@ -32,7 +30,10 @@ impl Decode<'_, ()> for SimplePublicKeyType {
                         let mut ed25519 = [0u8; 32];
                         if bytes.len() == 32 {
                             ed25519.copy_from_slice(&bytes);
-                            Ok(Self::Ed25519(ed25519.into()))
+                            let pubkey = VerifyingKey::from_bytes(&ed25519).map_err(|e| {
+                                decode::Error::message(format!("Failed to convert Ed25519 public key in SimplePublicKeyType {e}"))
+                            })?;
+                            Ok(Self::Ed25519(pubkey))
                         } else {
                             Err(decode::Error::message(format!(
                                 "Invalid length for Ed25519 key, got {}",

rust/rbac-registration/src/cardano/cip509/types/ed25519_pubkey.rs

@@ -1,6 +1,4 @@
 //! Types use in CIP-509
 
 pub mod cert_key_hash;
-pub mod ed25519_pubkey;
 pub mod tx_input_hash;
-pub mod uuidv4;

rust/rbac-registration/src/cardano/cip509/types/mod.rs

@@ -8,6 +8,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use anyhow::bail;
 use c509_certificate::c509::C509;
+use ed25519_dalek::VerifyingKey;
 use pallas::{
     crypto::hash::Hash,
     ledger::{
@@ -20,6 +21,7 @@ use payment_history::PaymentHistory;
 use point_tx_idx::PointTxIdx;
 use role_data::RoleData;
 use tracing::error;
+use uuid::Uuid;
 
 use crate::{
     cardano::cip509::{
@@ -28,7 +30,7 @@ use crate::{
             certs::{C509Cert, X509DerCert},
             pub_key::SimplePublicKeyType,
         },
-        types::{cert_key_hash::CertKeyHash, ed25519_pubkey::Ed25519PublicKey, uuidv4::UuidV4},
+        types::cert_key_hash::CertKeyHash,
         Cip509, Cip509Validation,
     },
     utils::general::decremented_index,
@@ -94,7 +96,7 @@ impl RegistrationChain {
 
     /// Get a list of purpose for this registration chain.
     #[must_use]
-    pub fn purpose(&self) -> &[UuidV4] {
+    pub fn purpose(&self) -> &[Uuid] {
         &self.inner.purpose
     }
 
@@ -112,7 +114,7 @@ impl RegistrationChain {
 
     /// Get the map of index in array to point, transaction index, and public key.
     #[must_use]
-    pub fn simple_keys(&self) -> &HashMap<usize, (PointTxIdx, Ed25519PublicKey)> {
+    pub fn simple_keys(&self) -> &HashMap<usize, (PointTxIdx, VerifyingKey)> {
         &self.inner.simple_keys
     }
 
@@ -141,15 +143,15 @@ struct RegistrationChainInner {
     /// The current transaction ID hash (32 bytes)
     current_tx_id_hash: Hash<32>,
     /// List of purpose for this registration chain
-    purpose: Vec<UuidV4>,
+    purpose: Vec<Uuid>,
 
     // RBAC
     /// Map of index in array to point, transaction index, and x509 certificate.
     x509_certs: HashMap<usize, (PointTxIdx, Vec<u8>)>,
     /// Map of index in array to point, transaction index, and c509 certificate.
     c509_certs: HashMap<usize, (PointTxIdx, C509)>,
     /// Map of index in array to point, transaction index, and public key.
-    simple_keys: HashMap<usize, (PointTxIdx, Ed25519PublicKey)>,
+    simple_keys: HashMap<usize, (PointTxIdx, VerifyingKey)>,
     /// List of point, transaction index, and certificate key hash.
     revocations: Vec<(PointTxIdx, CertKeyHash)>,
 
@@ -389,13 +391,13 @@ fn update_c509_certs(
 /// Process public keys for chain root.
 fn chain_root_public_keys(
     pub_keys: Option<Vec<SimplePublicKeyType>>, point_tx_idx: &PointTxIdx,
-) -> HashMap<usize, (PointTxIdx, Ed25519PublicKey)> {
+) -> HashMap<usize, (PointTxIdx, VerifyingKey)> {
     let mut map = HashMap::new();
     if let Some(key_list) = pub_keys {
         for (idx, key) in key_list.iter().enumerate() {
             // Chain root, expect only the public key not undefined or delete
             if let cip509::rbac::pub_key::SimplePublicKeyType::Ed25519(key) = key {
-                map.insert(idx, (point_tx_idx.clone(), key.clone()));
+                map.insert(idx, (point_tx_idx.clone(), *key));
             }
         }
     }
@@ -420,7 +422,7 @@ fn update_public_keys(
                 cip509::rbac::pub_key::SimplePublicKeyType::Ed25519(key) => {
                     new_inner
                         .simple_keys
-                        .insert(idx, (point_tx_idx.clone(), key.clone()));
+                        .insert(idx, (point_tx_idx.clone(), *key));
                 },
             }
         }