fix: get addresses

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

Author: bkioshn

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

@@ -275,15 +275,15 @@ impl Cip509 {
         self.catalyst_id.as_ref()
     }
 
-    /// Returns a list of addresses extract from certificate URIs.
+    /// Returns a list of addresses extracted from certificate URIs of a specific role.
     #[must_use]
     pub fn certificate_addresses(
         &self,
-        index: usize,
+        role: usize,
     ) -> HashSet<Address> {
         self.metadata
             .as_ref()
-            .map(|m| m.certificate_uris.addresses(index))
+            .map(|m| m.certificate_uris.role_addresses(role))
             .unwrap_or_default()
     }
 

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

@@ -10,7 +10,7 @@ use c509_certificate::{
     general_names::general_name::{GeneralNameTypeRegistry, GeneralNameValue},
     C509ExtensionType,
 };
-use cardano_blockchain_types::{pallas_addresses::Address, Cip0134Uri};
+use cardano_blockchain_types::{pallas_addresses::Address, Cip0134Uri, StakeAddress};
 use catalyst_types::problem_report::ProblemReport;
 use der_parser::der::parse_der_sequence;
 use tracing::debug;
@@ -72,33 +72,55 @@ impl Cip0134UriSet {
         self.x_uris().is_empty() && self.c_uris().is_empty()
     }
 
-    /// Returns a list of addresses by the given index.
+    /// Returns a list of addresses by the given role.
     #[must_use]
-    pub fn addresses(
+    pub fn role_addresses(
         &self,
-        index: usize,
+        role: usize,
     ) -> HashSet<Address> {
         let mut result = HashSet::new();
 
-        if let Some(uris) = self.x_uris().get(&index) {
+        if let Some(uris) = self.x_uris().get(&role) {
             result.extend(uris.iter().map(|uri| uri.address().clone()));
         }
-        if let Some(uris) = self.c_uris().get(&index) {
+        if let Some(uris) = self.c_uris().get(&role) {
             result.extend(uris.iter().map(|uri| uri.address().clone()));
         }
 
         result
     }
 
-    /// Return true if the given index contains at least one stake address.
+    /// Returns a list of stake addresses by the given role.
     #[must_use]
-    pub fn contain_stake_address(
+    pub fn role_stake_addresses(
         &self,
-        index: usize,
-    ) -> bool {
-        self.addresses(index)
+        role: usize,
+    ) -> HashSet<StakeAddress> {
+        self.role_addresses(role)
             .iter()
-            .any(|address| matches!(address, Address::Stake(_)))
+            .filter_map(|address| {
+                match address {
+                    Address::Stake(a) => Some(a.clone().into()),
+                    _ => None,
+                }
+            })
+            .collect()
+    }
+
+    /// Returns a list of all stake addresses.
+    #[must_use]
+    pub fn stake_addresses(&self) -> HashSet<StakeAddress> {
+        self.x_uris()
+            .values()
+            .chain(self.c_uris().values())
+            .flat_map(|uris| uris.iter())
+            .filter_map(|uri| {
+                match uri.address() {
+                    Address::Stake(a) => Some(a.clone().into()),
+                    _ => None,
+                }
+            })
+            .collect()
     }
 
     /// Return the updated URIs set.

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

@@ -389,7 +389,7 @@ pub fn validate_role_data(
 
             // Can contain different kind of address URIs, but for role 0
             // there should be at least 1 stake address
-            if !metadata.certificate_uris.contain_stake_address(0) {
+            if metadata.certificate_uris.role_stake_addresses(0).is_empty() {
                 report.missing_field(
                     "The role 0 certificate must have at least one stake address",
                     context,

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

@@ -2,11 +2,14 @@
 
 mod update_rbac;
 
-use std::{collections::HashMap, sync::Arc};
+use std::{
+    collections::{HashMap, HashSet},
+    sync::Arc,
+};
 
 use anyhow::Context;
 use c509_certificate::c509::C509;
-use cardano_blockchain_types::{hashes::TransactionId, Point, TxnIndex};
+use cardano_blockchain_types::{hashes::TransactionId, Point, StakeAddress, TxnIndex};
 use catalyst_types::{
     catalyst_id::{key_rotation::KeyRotation, role_index::RoleId, CatalystId},
     conversion::zero_out_last_n_bytes,
@@ -246,12 +249,11 @@ impl RegistrationChain {
             .and_then(|rdr| rdr.encryption_key_from_rotation(rotation))
     }
 
-    // FIXME
-    // /// Returns a set of role 0 stake addresses.
-    // #[must_use]
-    // pub fn role_0_stake_addresses(&self) -> HashSet<StakeAddress> {
-    //     self.inner.certificate_uris.stake_addresses(0)
-    // }
+    /// Returns all stake addresses associated to this registration.
+    #[must_use]
+    pub fn stake_addresses(&self) -> HashSet<StakeAddress> {
+        self.inner.certificate_uris.stake_addresses()
+    }
 }
 
 /// Inner structure of registration chain.