cleanup

Author: Mr-Leshiy

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

@@ -319,18 +319,6 @@ impl Cip509 {
         self.catalyst_id.as_ref()
     }
 
-    /// Returns a list of addresses extracted from certificate URIs of a specific role.
-    #[must_use]
-    pub fn certificate_addresses(
-        &self,
-        role: usize,
-    ) -> HashSet<Address> {
-        self.metadata
-            .as_ref()
-            .map(|m| m.certificate_uris.role_addresses(role))
-            .unwrap_or_default()
-    }
-
     /// Return validation signature.
     #[must_use]
     pub fn validation_signature(&self) -> Option<&ValidationSignature> {
@@ -349,6 +337,14 @@ impl Cip509 {
         self.metadata.as_ref()
     }
 
+    /// Returns a set of addresses.
+    #[must_use]
+    pub fn addresses(&self) -> HashSet<Address> {
+        self.certificate_uris()
+            .map(Cip0134UriSet::addresses)
+            .unwrap_or_default()
+    }
+
     /// Returns a set of stake addresses.
     #[must_use]
     pub fn stake_addresses(&self) -> HashSet<StakeAddress> {

rust/rbac-registration/src/cardano/cip509/utils/cip134_uri_set.rs

@@ -63,13 +63,13 @@ impl Cip0134UriSet {
 
     /// Returns a mapping from the x509 certificate index to URIs contained within.
     #[must_use]
-    pub fn x_uris(&self) -> &UrisMap {
+    pub(crate) fn x_uris(&self) -> &UrisMap {
         &self.0.x_uris
     }
 
     /// Returns a mapping from the c509 certificate index to URIs contained within.
     #[must_use]
-    pub fn c_uris(&self) -> &UrisMap {
+    pub(crate) fn c_uris(&self) -> &UrisMap {
         &self.0.c_uris
     }
 
@@ -88,42 +88,48 @@ impl Cip0134UriSet {
         self.x_uris().is_empty() && self.c_uris().is_empty()
     }
 
-    /// Returns a list of addresses by the given role.
+    /// Returns a list of active (without taken) URIs by the given role.
     #[must_use]
-    pub fn role_addresses(
+    pub(crate) fn role_uris(
         &self,
         role: usize,
-    ) -> HashSet<Address> {
+    ) -> HashSet<Cip0134Uri> {
         let mut result = HashSet::new();
 
         if let Some(uris) = self.x_uris().get(&role) {
-            result.extend(uris.iter().map(|uri| uri.address().clone()));
+            result.extend(uris.iter().filter(|v| !self.0.taken.contains(v)).cloned());
         }
         if let Some(uris) = self.c_uris().get(&role) {
-            result.extend(uris.iter().map(|uri| uri.address().clone()));
+            result.extend(uris.iter().filter(|v| !self.0.taken.contains(v)).cloned());
         }
 
         result
     }
 
-    /// Returns a set of stake addresses by the given role.
+    /// Returns a set of active (without taken) stake addresses by the given role.
     #[must_use]
-    pub fn role_stake_addresses(
+    pub(crate) fn role_stake_addresses(
         &self,
         role: usize,
     ) -> HashSet<StakeAddress> {
-        self.role_addresses(role)
+        self.role_uris(role)
             .iter()
-            .filter_map(|address| {
-                match address {
+            .filter_map(|uri| {
+                match uri.address() {
                     Address::Stake(a) => Some(a.clone().into()),
                     _ => None,
                 }
             })
             .collect()
     }
 
-    /// Returns a set of all stake addresses.
+    /// Returns a set of all active (without taken) addresses.
+    #[must_use]
+    pub fn addresses(&self) -> HashSet<Address> {
+        self.values().map(Cip0134Uri::address).cloned().collect()
+    }
+
+    /// Returns a set of all active (without taken) stake addresses.
     #[must_use]
     pub fn stake_addresses(&self) -> HashSet<StakeAddress> {
         self.values()
@@ -401,7 +407,7 @@ mod tests {
         let set = cip509.certificate_uris().unwrap();
         assert!(!set.is_empty());
         assert!(set.c_uris().is_empty());
-        assert_eq!(set.role_addresses(0).len(), 1);
+        assert_eq!(set.role_uris(0).len(), 1);
         assert_eq!(set.role_stake_addresses(0).len(), 1);
         assert_eq!(set.stake_addresses().len(), 1);
 

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

@@ -3,7 +3,7 @@
 
 use std::future::Future;
 
-use cardano_blockchain_types::StakeAddress;
+use cardano_blockchain_types::pallas_addresses::Address;
 use catalyst_types::catalyst_id::CatalystId;
 use ed25519_dalek::VerifyingKey;
 
@@ -23,12 +23,11 @@ pub trait RbacChainsState {
         id: &CatalystId,
     ) -> impl Future<Output = anyhow::Result<bool>> + Send;
 
-    /// Returns a current valid RBAC chain Catalyst ID corresponding to the given stake
-    /// address.
-    fn chain_catalyst_id_from_stake_address(
+    /// Returns `true` if a provided address already used by any RBAC chain.
+    fn is_addressed_used(
         &self,
-        address: &StakeAddress,
-    ) -> impl Future<Output = anyhow::Result<Option<CatalystId>>> + Send;
+        address: &Address,
+    ) -> impl Future<Output = anyhow::Result<bool>> + Send;
 
     /// Returns a corresponding to the RBAC chain's Catalyst ID corresponding by the given
     /// signing public key.
@@ -37,11 +36,10 @@ pub trait RbacChainsState {
         key: &VerifyingKey,
     ) -> impl Future<Output = anyhow::Result<Option<CatalystId>>> + Send;
 
-    /// Update the chain by "taking" the given `StakeAddress` for the corresponding
+    /// Update the chain by "taking" the given `Address` for the corresponding
     /// RBAC chain's by the given `CatalystId`.
-    fn take_stake_address_from_chain(
+    fn take_address_from_chains(
         &mut self,
-        id: &CatalystId,
-        address: &StakeAddress,
+        addresses: impl Iterator<Item = Address>,
     ) -> impl Future<Output = anyhow::Result<()>> + Send;
 }

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

@@ -9,7 +9,9 @@ use std::{
 
 use anyhow::Context;
 use c509_certificate::c509::C509;
-use cardano_blockchain_types::{hashes::TransactionId, Point, StakeAddress, TxnIndex};
+use cardano_blockchain_types::{
+    hashes::TransactionId, pallas_addresses::Address, Point, StakeAddress, TxnIndex,
+};
 use catalyst_types::{
     catalyst_id::{key_rotation::KeyRotation, role_index::RoleId, CatalystId},
     conversion::zero_out_last_n_bytes,
@@ -75,11 +77,9 @@ impl RegistrationChain {
             return Ok(None);
         }
 
-        for address in &cip509.stake_addresses() {
-            if let Some(id) = state.chain_catalyst_id_from_stake_address(address).await? {
-                state.take_stake_address_from_chain(&id, address).await?;
-            }
-        }
+        state
+            .take_address_from_chains(cip509.addresses().into_iter())
+            .await?;
 
         Ok(Some(new_chain))
     }
@@ -114,18 +114,14 @@ impl RegistrationChain {
         };
 
         // Check that addresses from the new registration aren't used in other chains.
-        let previous_addresses = self.stake_addresses();
-        let reg_addresses = cip509.stake_addresses();
+        let previous_addresses = self.addresses();
+        let reg_addresses = cip509.addresses();
         let new_addresses: Vec<_> = reg_addresses.difference(&previous_addresses).collect();
         for address in &new_addresses {
-            if state
-                .chain_catalyst_id_from_stake_address(address)
-                .await?
-                .is_some()
-            {
+            if state.is_addressed_used(address).await? {
                 cip509.report().functional_validation(
-                        &format!("{address} stake addresses is already used"),
-                        "It isn't allowed to use same stake address in multiple registration chains, if its not a new chain",
+                        &format!("{address} addresses is already used"),
+                        "It isn't allowed to use same address in multiple registration chains, if its not a new chain",
                     );
             }
         }
@@ -317,6 +313,12 @@ impl RegistrationChain {
             .and_then(|rdr| rdr.encryption_key_from_rotation(rotation))
     }
 
+    /// Returns all addresses associated to this chain.
+    #[must_use]
+    pub fn addresses(&self) -> HashSet<Address> {
+        self.inner.certificate_uris.addresses()
+    }
+
     /// Returns all stake addresses associated to this chain.
     #[must_use]
     pub fn stake_addresses(&self) -> HashSet<StakeAddress> {