Use Blake2b256Hash type

Author: stanislav-tkach

rust/rbac-registration/Cargo.toml

@@ -34,3 +34,4 @@ 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" }
+cardano-blockchain-types = { version = "0.0.1", path = "../cardano-blockchain-types" }

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

@@ -10,11 +10,12 @@ pub mod utils;
 pub(crate) mod validation;
 pub mod x509_chunks;
 
+use cardano_blockchain_types::hashes::Blake2b256Hash;
 use minicbor::{
     decode::{self},
     Decode, Decoder,
 };
-use pallas::{crypto::hash::Hash, ledger::traverse::MultiEraTx};
+use pallas::ledger::traverse::MultiEraTx;
 use strum_macros::FromRepr;
 use types::tx_input_hash::TxInputHash;
 use uuid::Uuid;
@@ -54,8 +55,7 @@ pub struct Cip509 {
     /// An optional hash of the previous transaction.
     ///
     /// The hash must always be present except for the first registration transaction.
-    // TODO: Use the `Blake2b256Hash` type from the `cardano-blockchain-types` crate.
-    pub prv_tx_id: Option<Hash<32>>,
+    pub prv_tx_id: Option<Blake2b256Hash>,
     /// Metadata.
     ///
     /// This field encoded in chunks. See [`X509Chunks`] for more details.
@@ -141,7 +141,7 @@ impl Decode<'_, ()> for Cip509 {
                             .map_err(|_| {
                             decode::Error::message("Invalid data size of PreviousTxId")
                         })?;
-                        prv_tx_id = Some(Hash::from(hash));
+                        prv_tx_id = Some(hash.into());
                     },
                     Cip509IntIdentifier::ValidationSignature => {
                         let signature = decode_bytes(d, "CIP509 validation signature")?;

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

@@ -8,9 +8,9 @@ use std::{collections::HashMap, sync::Arc};
 
 use anyhow::bail;
 use c509_certificate::c509::C509;
+use cardano_blockchain_types::hashes::Blake2b256Hash;
 use ed25519_dalek::VerifyingKey;
 use pallas::{
-    crypto::hash::Hash,
     ledger::{
         addresses::{Address, ShelleyAddress},
         traverse::MultiEraTx,
@@ -92,7 +92,7 @@ impl RegistrationChain {
 
     /// Get the current transaction ID hash.
     #[must_use]
-    pub fn current_tx_id_hash(&self) -> Hash<32> {
+    pub fn current_tx_id_hash(&self) -> Blake2b256Hash {
         self.inner.current_tx_id_hash
     }
 
@@ -143,7 +143,7 @@ impl RegistrationChain {
 #[derive(Clone)]
 struct RegistrationChainInner {
     /// The current transaction ID hash (32 bytes)
-    current_tx_id_hash: Hash<32>,
+    current_tx_id_hash: Blake2b256Hash,
     /// List of purpose for this registration chain
     purpose: Vec<Uuid>,
 
@@ -222,7 +222,7 @@ impl RegistrationChainInner {
 
         Ok(Self {
             purpose,
-            current_tx_id_hash: txn.hash(),
+            current_tx_id_hash: txn.hash().into(),
             x509_certs: x509_cert_map,
             c509_certs: c509_cert_map,
             certificate_uris,