wip

Author: Mr-Leshiy

rust/cardano-blockchain-types/Cargo.toml

@@ -18,7 +18,7 @@ crate-type = ["cdylib", "rlib"]
 workspace = true
 
 [dependencies]
-catalyst-types = { version = "0.0.6", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.6" }
+catalyst-types = { version = "0.0.9", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.9" }
 cbork-utils = { version = "0.0.2", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cbork-utils-v0.0.2" }
 
 ouroboros = "0.18.4"

rust/cardano-blockchain-types/src/metadata/cip36/mod.rs

@@ -51,7 +51,7 @@ impl fmt::Display for Cip36 {
     ) -> fmt::Result {
         write!(
             f,
-            "Cip36 {{ network: {network}, slot: {slot:?}, txn_idx: {txn_idx:?}, is_catalyst_strict: {is_catalyst_strict}, key_registration: {key_registration:?}, registration_witness: {registration_witness:?}, validation: {{ signature: {is_valid_signature}, payment_address_network: {is_valid_payment_address_network}, voting_keys: {is_valid_voting_keys}, purpose: {is_valid_purpose} }}, err_report: {err_report} }}",
+            "Cip36 {{ network: {network}, slot: {slot:?}, txn_idx: {txn_idx:?}, is_catalyst_strict: {is_catalyst_strict}, key_registration: {key_registration:?}, registration_witness: {registration_witness:?}, validation: {{ signature: {is_valid_signature}, payment_address_network: {is_valid_payment_address_network}, voting_keys: {is_valid_voting_keys}, purpose: {is_valid_purpose} }}, problematic: {is_problematic} }}",
             key_registration = self.key_registration,
             registration_witness = self.registration_witness,
             network = self.network,
@@ -62,34 +62,7 @@ impl fmt::Display for Cip36 {
             is_valid_payment_address_network = self.is_valid_payment_address_network,
             is_valid_voting_keys = self.is_valid_voting_keys,
             is_valid_purpose = self.is_valid_purpose,
-            err_report = serde_json::to_string(&self.err_report)
-            .unwrap_or_else(|_| String::from("Failed to serialize ProblemReport"))
-        )
-    }
-}
-
-/// CIP-36 Catalyst registration error
-#[allow(dead_code, clippy::module_name_repetitions)]
-#[derive(Debug)]
-pub struct Cip36Error {
-    /// The decoding error that make the code not able to process.
-    error: anyhow::Error,
-    /// The problem report that contains the errors found during decoding and validation.
-    report: ProblemReport,
-}
-
-impl fmt::Display for Cip36Error {
-    fn fmt(
-        &self,
-        fmt: &mut fmt::Formatter<'_>,
-    ) -> fmt::Result {
-        let report_json = serde_json::to_string(&self.report)
-            .unwrap_or_else(|_| String::from("Failed to serialize ProblemReport"));
-
-        write!(
-            fmt,
-            "Cip36Error {{ error: {}, report: {} }}",
-            self.error, report_json
+            is_problematic = self.err_report.is_problematic(),
         )
     }
 }
@@ -118,7 +91,7 @@ impl Cip36 {
         block: &MultiEraBlock,
         txn_idx: TxnIndex,
         is_catalyst_strict: bool,
-    ) -> Result<Option<Cip36>, Cip36Error> {
+    ) -> anyhow::Result<Option<Cip36>> {
         // Record of errors found during decoding and validation
         let mut err_report = ProblemReport::new("CIP36 Registration Decoding and Validation");
 
@@ -148,25 +121,15 @@ impl Cip36 {
                     metadata
                 },
                 Err(e) => {
-                    return Err(Cip36Error {
-                        error: anyhow::anyhow!(format!(
-                            "Failed to construct CIP-36 key registration, {e}"
-                        )),
-                        report: err_report,
-                    });
+                    anyhow::bail!("Failed to construct CIP-36 key registration, {e}");
                 },
             };
 
         let registration_witness =
             match Cip36RegistrationWitness::decode(&mut registration_witness, &mut err_report) {
                 Ok(metadata) => metadata,
                 Err(e) => {
-                    return Err(Cip36Error {
-                        error: anyhow::anyhow!(format!(
-                            "Failed to construct CIP-36 registration witness {e}"
-                        )),
-                        report: err_report,
-                    });
+                    anyhow::bail!("Failed to construct CIP-36 registration witness {e}");
                 },
             };
 
@@ -210,7 +173,7 @@ impl Cip36 {
     pub fn cip36_from_block(
         block: &MultiEraBlock,
         is_catalyst_strict: bool,
-    ) -> Option<HashMap<TxnIndex, Result<Cip36, Cip36Error>>> {
+    ) -> Option<HashMap<TxnIndex, anyhow::Result<Cip36>>> {
         let mut cip36_map = HashMap::new();
 
         for (txn_idx, _tx) in block.decode().txs().iter().enumerate() {

rust/cardano-chain-follower/Cargo.toml

@@ -17,7 +17,7 @@ mithril-client = { version = "=0.12.2", default-features = false, features = [
 ] }
 
 cardano-blockchain-types = { version = "0.0.6", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cardano-blockchain-types/v0.0.6" }
-catalyst-types = { version = "0.0.8",  git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.8" }
+catalyst-types = { version = "0.0.9",  git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.9" }
 
 thiserror = "1.0.69"
 tokio = { version = "1.45.0", features = [

rust/rbac-registration/Cargo.toml

@@ -35,4 +35,4 @@ 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.7", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cardano-blockchain-types/v0.0.7" }
-catalyst-types = { version = "0.0.8", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.8" }
+catalyst-types = { version = "0.0.9", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.9" }