Move Cip0134Uri to the cardano-blockchain-types crate

Author: stanislav-tkach

rust/rbac-registration/src/cardano/cip509/utils/cip134/uri.rs renamed to rust/cardano-blockchain-types/src/cip134_uri.rs

@@ -8,8 +8,6 @@ use std::fmt::{Display, Formatter};
 use anyhow::{anyhow, Context, Error, Result};
 use pallas::ledger::addresses::Address;
 
-use crate::utils::general::decode_utf8;
-
 /// An URI in the CIP-0134 format.
 ///
 /// See the [proposal] for more details.
@@ -33,7 +31,7 @@ impl Cip0134Uri {
     /// # Examples
     ///
     /// ```
-    /// use rbac_registration::cardano::cip509::utils::Cip0134Uri;
+    /// use cardano_blockchain_types::Cip0134Uri;
     ///
     /// let uri = "web+cardano://addr/stake1uyehkck0lajq8gr28t9uxnuvgcqrc6070x3k9r8048z8y5gh6ffgw";
     /// let cip0134_uri = Cip0134Uri::parse(uri).unwrap();
@@ -55,7 +53,7 @@ impl Cip0134Uri {
     /// # Examples
     ///
     /// ```
-    /// use rbac_registration::cardano::cip509::utils::Cip0134Uri;
+    /// use cardano_blockchain_types::Cip0134Uri;
     ///
     /// let uri = "web+cardano://addr/stake1uyehkck0lajq8gr28t9uxnuvgcqrc6070x3k9r8048z8y5gh6ffgw";
     /// let cip0134_uri = Cip0134Uri::parse(uri).unwrap();
@@ -71,8 +69,8 @@ impl Cip0134Uri {
     /// # Examples
     ///
     /// ```
+    /// use cardano_blockchain_types::Cip0134Uri;
     /// use pallas::ledger::addresses::{Address, Network};
-    /// use rbac_registration::cardano::cip509::utils::Cip0134Uri;
     ///
     /// let uri = "web+cardano://addr/stake1uyehkck0lajq8gr28t9uxnuvgcqrc6070x3k9r8048z8y5gh6ffgw";
     /// let cip0134_uri = Cip0134Uri::parse(uri).unwrap();
@@ -97,8 +95,9 @@ impl TryFrom<&[u8]> for Cip0134Uri {
     type Error = Error;
 
     fn try_from(value: &[u8]) -> Result<Self> {
-        let address = decode_utf8(value).context("Unable to convert bytes to string")?;
-        Self::parse(&address)
+        let address = std::str::from_utf8(value)
+            .with_context(|| format!("Invalid utf8 string: '{value:?}'"))?;
+        Self::parse(address)
     }
 }
 

rust/cardano-blockchain-types/src/lib.rs

@@ -4,6 +4,7 @@ pub mod conversion;
 pub mod hashes;
 
 mod auxdata;
+mod cip134_uri;
 mod fork;
 mod multi_era_block_data;
 mod network;
@@ -20,6 +21,7 @@ pub use auxdata::{
     metadatum_value::MetadatumValue,
     scripts::{Script, ScriptArray, ScriptType, TransactionScripts},
 };
+pub use cip134_uri::Cip0134Uri;
 pub use fork::Fork;
 pub use multi_era_block_data::MultiEraBlock;
 pub use network::Network;

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

@@ -168,23 +168,30 @@ impl Cip509 {
         }
     }
 
-    /// Returns a registration purpose.
-    #[must_use]
-    pub fn purpose(&self) -> Option<Uuid> {
-        self.purpose
-    }
-
-    /// Returns an identifier of the previous transaction.
-    #[must_use]
-    pub fn previous_transaction(&self) -> Option<&Blake2b256Hash> {
-        self.prv_tx_id.as_ref()
-    }
-
-    /// Returns CIP509 metadata.
-    #[must_use]
-    pub fn metadata(&self) -> Option<&Cip509RbacMetadata> {
-        self.metadata.as_ref()
-    }
+    // TODO: FIXME: Consume fields in the registration chain, use methods everywhere else.
+    // /// Returns a registration purpose.
+    // #[must_use]
+    // pub fn purpose(&self) -> Option<Uuid> {
+    //     self.purpose
+    // }
+    //
+    // // TODO: FIXME:
+    // // txn_inputs_hash?
+    //
+    // /// Returns an identifier of the previous transaction.
+    // #[must_use]
+    // pub fn previous_transaction(&self) -> Option<&Blake2b256Hash> {
+    //     self.prv_tx_id.as_ref()
+    // }
+    //
+    // /// Returns CIP509 metadata.
+    // #[must_use]
+    // pub fn metadata(&self) -> Option<&Cip509RbacMetadata> {
+    //     self.metadata.as_ref()
+    // }
+    //
+    // // TODO: FIXME:
+    // // validation_signature?
 }
 
 impl Decode<'_, ProblemReport> for Cip509 {

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

@@ -7,6 +7,7 @@ use c509_certificate::{
     general_names::general_name::{GeneralNameTypeRegistry, GeneralNameValue},
     C509ExtensionType,
 };
+use cardano_blockchain_types::Cip0134Uri;
 use catalyst_types::problem_report::ProblemReport;
 use der_parser::der::parse_der_sequence;
 use tracing::debug;
@@ -17,7 +18,6 @@ use crate::cardano::cip509::{
         certs::{C509Cert, X509DerCert},
         Cip509RbacMetadata,
     },
-    utils::Cip0134Uri,
     validation::URI,
 };
 
@@ -281,8 +281,7 @@ mod tests {
     #[allow(clippy::indexing_slicing)]
     #[test]
     fn set_new() {
-        let block =
-            hex::decode(include_str!("../../../../test_data/cardano/conway_1.block")).unwrap();
+        let block = hex::decode(include_str!("../../../test_data/cardano/conway_1.block")).unwrap();
         let block = MultiEraBlock::decode(&block).unwrap();
         let tx = &block.txs()[3];
         let cip509 = cip509(tx);

rust/rbac-registration/src/cardano/cip509/utils/cip134/uri_set.rs renamed to rust/rbac-registration/src/cardano/cip509/utils/cip134_uri_set.rs

@@ -1,6 +1,7 @@
 //! Utility functions for CIP-509
 
 pub mod cip19;
-pub use cip134::{Cip0134Uri, Cip0134UriSet};
 
-mod cip134;
+pub use cip134_uri_set::Cip0134UriSet;
+
+mod cip134_uri_set;

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

@@ -183,7 +183,7 @@ fn extract_stake_addresses(cip509: &Cip509) -> Vec<Vec<u8>> {
         .certificate_uris
         .x_uris()
         .iter()
-        .chain(cip509.metadata.certificate_uris.c_uris())
+        .chain(metadata.certificate_uris.c_uris())
         .flat_map(|(_index, uris)| uris.iter())
         .filter_map(|uri| {
             if let Address::Stake(a) = uri.address() {
@@ -565,7 +565,7 @@ mod tests {
         let cip509 = Cip509::decode(&mut decoder, &mut report).expect("Failed to decode Cip509");
         assert!(!report.is_problematic());
 
-        let addresses = extract_stake_addresses(&cip);
+        let addresses = extract_stake_addresses(&cip509);
         // TODO: FIXME:
         todo!();
     }