wip

Author: Mr-Leshiy

rust/rbac-registration/Cargo.toml

@@ -34,5 +34,5 @@ thiserror = "2.0.11"
 
 c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "c509-certificate-v0.0.3" }
 cbork-utils = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cbork-utils-v0.0.2" }
-cardano-blockchain-types = { version = "0.0.8", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cardano-blockchain-types/v0.0.8" }
+cardano-blockchain-types = { version = "0.0.9", git = "https://github.com/input-output-hk/catalyst-libs.git", branch = "feat/cip-134-uri-hash" }
 catalyst-types = { version = "0.0.10", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.10" }

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

@@ -179,7 +179,9 @@ impl Cip0134UriSet {
                 },
                 X509DerCert::X509Cert(_) => {
                     if let Some(uris) = metadata.certificate_uris.x_uris().get(&index) {
-                        taken_uris.remove(&uris);
+                        uris.iter().for_each(|v| {
+                            taken_uris.remove(v);
+                        });
                         x_uris.insert(index, uris.clone());
                     }
                 },
@@ -199,7 +201,9 @@ impl Cip0134UriSet {
                 },
                 C509Cert::C509Certificate(_) => {
                     if let Some(uris) = metadata.certificate_uris.c_uris().get(&index) {
-                        taken_uris.remove(&uris);
+                        uris.iter().for_each(|v| {
+                            taken_uris.remove(v);
+                        });
                         c_uris.insert(index, uris.clone());
                     }
                 },
@@ -224,10 +228,16 @@ impl Cip0134UriSet {
     ) -> Self {
         let taken_uri_set = metadata.certificate_uris.values().collect::<HashSet<_>>();
         let current_uris_set = self.values().collect::<HashSet<_>>();
-        let taken_uris = current_uris_set.intersection(&taken_uri_set);
+        let latest_taken_uris = current_uris_set.intersection(&taken_uri_set);
+        let latest_taken_uris = latest_taken_uris.cloned().cloned().collect::<Vec<_>>();
 
-        let Cip0134UriSetInner { x_uris, c_uris, .. } = Arc::unwrap_or_clone(self.0);
-        let taken_uris = taken_uris.cloned().cloned().collect();
+        let Cip0134UriSetInner {
+            x_uris,
+            c_uris,
+            mut taken_uris,
+        } = Arc::unwrap_or_clone(self.0);
+
+        taken_uris.extend(latest_taken_uris);
 
         Self(Arc::new(Cip0134UriSetInner {
             x_uris,

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

@@ -347,7 +347,7 @@ impl RegistrationChain {
     /// Returns all stake addresses associated to this chain.
     #[must_use]
     pub fn stake_addresses(&self) -> HashSet<StakeAddress> {
-        self.inner.certificate_uris.stake_addresses();
+        self.inner.certificate_uris.stake_addresses()
     }
 
     /// Returns the latest know applied registration's `PointTxnIdx`.
@@ -548,7 +548,7 @@ impl RegistrationChainInner {
                     return None;
                 }
 
-                return new_inner.update_cause_another_chain(cip509);
+                return Some(new_inner.update_cause_another_chain(cip509));
             } else {
                 cip509
                     .report()