Merge branch 'main' into feat/catid-eq

Author: Mr-Leshiy

rust/cardano-blockchain-types/Cargo.toml

@@ -2,7 +2,7 @@
 name = "cardano-blockchain-types"
 description = "Common Cardano Blockchain data types for use in both applications and crates"
 keywords = ["cardano", "catalyst", ]
-version = "0.0.6"
+version = "0.0.7"
 authors = [
     "Steven Johnson <[email protected]>"
 ]
@@ -41,12 +41,12 @@ thiserror = "2.0.11"
 
 # TODO: Revert ALL to Upstream Pallas after <https://github.com/txpipe/pallas/pull/685> merges. 
 # pallas related commit is from <https://github.com/input-output-hk/catalyst-pallas/pull/4>
-pallas-traverse = { version = "=1.0.0-alpha.2",  git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9c6322e6b51916b2cc54ba713b07bb25ef07dd00" }
-pallas-addresses = { version = "=1.0.0-alpha.2",  git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9c6322e6b51916b2cc54ba713b07bb25ef07dd00" }
-pallas-primitives = { version = "=1.0.0-alpha.2",  git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9c6322e6b51916b2cc54ba713b07bb25ef07dd00" }
-pallas-crypto = { version = "=1.0.0-alpha.2",  git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9c6322e6b51916b2cc54ba713b07bb25ef07dd00" }
-pallas-codec = { version = "=1.0.0-alpha.2",  git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9c6322e6b51916b2cc54ba713b07bb25ef07dd00" }
+pallas-traverse = { version = "=1.0.0-alpha.2", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9c6322e6b51916b2cc54ba713b07bb25ef07dd00" }
+pallas-addresses = { version = "=1.0.0-alpha.2", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9c6322e6b51916b2cc54ba713b07bb25ef07dd00" }
+pallas-primitives = { version = "=1.0.0-alpha.2", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9c6322e6b51916b2cc54ba713b07bb25ef07dd00" }
+pallas-crypto = { version = "=1.0.0-alpha.2", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9c6322e6b51916b2cc54ba713b07bb25ef07dd00" }
+pallas-codec = { version = "=1.0.0-alpha.2", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9c6322e6b51916b2cc54ba713b07bb25ef07dd00" }
 # Only include these for non-wasm32 targets
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-pallas-network = { version = "=1.0.0-alpha.2",  git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9c6322e6b51916b2cc54ba713b07bb25ef07dd00" }
-pallas-hardano = { version = "=1.0.0-alpha.2",  git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9c6322e6b51916b2cc54ba713b07bb25ef07dd00" }
+pallas-network = { version = "=1.0.0-alpha.2", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9c6322e6b51916b2cc54ba713b07bb25ef07dd00" }
+pallas-hardano = { version = "=1.0.0-alpha.2", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9c6322e6b51916b2cc54ba713b07bb25ef07dd00" }

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

@@ -175,7 +175,7 @@ impl Cip36 {
         let mut cip36 = Cip36 {
             key_registration,
             registration_witness,
-            network,
+            network: network.clone(),
             slot: slot.into(),
             txn_idx,
             is_catalyst_strict,
@@ -298,8 +298,8 @@ impl Cip36 {
 
     /// Get the network of this CIP-36 registration.
     #[must_use]
-    pub fn network(&self) -> Network {
-        self.network
+    pub fn network(&self) -> &Network {
+        &self.network
     }
 
     /// Get the transaction index of this CIP-36 registration.
@@ -373,7 +373,7 @@ mod tests {
         let res = Cip36::new(&block_1(), 1.into(), true).unwrap().unwrap();
         assert!(!res.err_report().is_problematic());
         assert!(res.is_valid());
-        assert!(res.network() == Network::Preprod);
+        assert!(res.network() == &Network::Preprod);
         assert!(res.raw_nonce() == Some(55_076_993));
         assert!(res.nonce() == Some(55_076_993));
     }

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

@@ -236,8 +236,8 @@ impl MultiEraBlock {
     ///
     /// - The network that this block originated on.
     #[must_use]
-    pub fn network(&self) -> Network {
-        self.inner.network
+    pub fn network(&self) -> &Network {
+        &self.inner.network
     }
 
     /// Get The Metadata fora a transaction and known label from the block

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

@@ -22,7 +22,7 @@ pub(crate) const ENVVAR_MITHRIL_EXE_NAME: &str = "MITHRIL_EXE_NAME";
 
 /// Enum of possible Cardano networks.
 #[derive(
-    Debug, Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, strum::VariantNames, strum::Display,
+    Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, strum::VariantNames, strum::Display,
 )]
 #[strum(serialize_all = "snake_case")]
 #[non_exhaustive]
@@ -36,7 +36,7 @@ pub enum Network {
     /// Cardano devnet network.
     Devnet {
         /// Mithril signature genesis key for a blockchain.
-        genesis_key: &'static str,
+        genesis_key: String,
         /// Cardano blockchain networking magic number genesis block setting
         magic: u64,
         /// Cardano blockchain network id genesis block setting
@@ -48,7 +48,7 @@ pub enum Network {
         /// Cardano byron known slot genesis block setting
         byron_known_slot: u64,
         /// Cardano byron known hash genesis block setting
-        byron_known_hash: &'static str,
+        byron_known_hash: String,
         /// Cardano byron known time genesis block setting
         byron_known_time: u64,
         /// Cardano shelley epoch length genesis block setting
@@ -58,7 +58,7 @@ pub enum Network {
         /// Cardano shelley known slot genesis block setting
         shelley_known_slot: u64,
         /// Cardano shelley known hash genesis block setting
-        shelley_known_hash: &'static str,
+        shelley_known_hash: String,
         /// Cardano shelley known time genesis block setting
         shelley_known_time: u64,
     },
@@ -311,18 +311,18 @@ mod tests {
         assert_eq!(Network::Preview.to_string(), "preview");
         assert_eq!(
             Network::Devnet {
-                genesis_key: "genesis_key",
+                genesis_key: "genesis_key".into(),
                 magic: 0,
                 network_id: 0,
                 byron_epoch_length: 0,
                 byron_slot_length: 0,
                 byron_known_slot: 0,
-                byron_known_hash: "byron_known_hash",
+                byron_known_hash: "byron_known_hash".into(),
                 byron_known_time: 0,
                 shelley_epoch_length: 0,
                 shelley_slot_length: 0,
                 shelley_known_slot: 0,
-                shelley_known_hash: "shelley_known_hash",
+                shelley_known_hash: "shelley_known_hash".into(),
                 shelley_known_time: 0
             }
             .to_string(),

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

@@ -160,7 +160,7 @@ mod tests {
         ];
 
         for (network, is_script, hash, expected_header) in test_data {
-            let stake_address = StakeAddress::new(network, is_script, hash.into());
+            let stake_address = StakeAddress::new(network.clone(), is_script, hash.into());
             assert_eq!(stake_address.is_script(), is_script);
 
             // Check that conversion to bytes includes the expected header value.

rust/rbac-registration/Cargo.toml

@@ -2,7 +2,7 @@
 name = "rbac-registration"
 description = "Role Based Access Control Registration"
 keywords = ["cardano", "catalyst", "rbac registration"]
-version = "0.0.11"
+version = "0.0.12"
 authors = [
     "Arissara Chotivichit <[email protected]>"
 ]
@@ -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.6", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cardano-blockchain-types/v0.0.6" }
+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" }

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

@@ -357,7 +357,7 @@ fn validate_x509_self_signed_cert(
 #[allow(clippy::similar_names)]
 pub fn validate_role_data(
     metadata: &Cip509RbacMetadata,
-    subnet: Network,
+    subnet: &Network,
     report: &ProblemReport,
 ) -> Option<CatalystId> {
     let context = "Role data validation";
@@ -474,7 +474,7 @@ pub fn validate_role_data(
 fn validate_role_0(
     role: &RoleData,
     metadata: &Cip509RbacMetadata,
-    subnet: Network,
+    subnet: &Network,
     context: &str,
     report: &ProblemReport,
 ) -> Option<CatalystId> {

rust/signed_doc/src/validator/rules/mod.rs

@@ -145,7 +145,7 @@ impl Rules {
                 collaborators: CollaboratorsRule::NotSpecified,
                 content: ContentRule::new(&doc_spec.payload)?,
                 kid: SignatureKidRule::new(&doc_spec.signers.roles)?,
-                signature: SignatureRule { mutlisig: false },
+                signature: SignatureRule {},
                 ownership: DocumentOwnershipRule::new(&doc_spec.signers.update)?,
             };
             let doc_type = doc_spec.doc_type.parse()?;

rust/signed_doc/src/validator/rules/signature/mod.rs

@@ -14,10 +14,7 @@ use crate::{
 
 /// Signed Document signatures validation rule.
 #[derive(Debug)]
-pub(crate) struct SignatureRule {
-    /// Allows multiple signatures.
-    pub(crate) mutlisig: bool,
-}
+pub(crate) struct SignatureRule;
 
 impl SignatureRule {
     /// Verify document signatures.
@@ -41,18 +38,6 @@ impl SignatureRule {
             return Ok(false);
         }
 
-        if !self.mutlisig && doc.signatures().len() > 1 {
-            doc.report().other(
-                format!(
-                    "Multi-signature is not allowed, found {} signatures",
-                    doc.signatures().len()
-                )
-                .as_str(),
-                "During Catalyst Signed Document signature validation",
-            );
-            return Ok(false);
-        }
-
         let sign_rules = doc
             .signatures()
             .iter()

rust/signed_doc/src/validator/rules/signature/tests.rs

@@ -27,10 +27,6 @@ fn metadata() -> serde_json::Value {
     })
 }
 
-fn rule(mutlisig: bool) -> SignatureRule {
-    SignatureRule { mutlisig }
-}
-
 #[tokio::test]
 async fn single_signature_validation_test() {
     let (sk, pk, kid) = create_dummy_key_pair(RoleId::Role0);
@@ -51,13 +47,13 @@ async fn single_signature_validation_test() {
     let mut provider = TestCatalystProvider::default();
     provider.add_pk(kid.clone(), pk);
     assert!(
-        rule(true).check(&signed_doc, &provider).await.unwrap(),
+        SignatureRule.check(&signed_doc, &provider).await.unwrap(),
         "{:?}",
         signed_doc.problem_report()
     );
 
     // case: empty provider
-    assert!(!rule(true)
+    assert!(!SignatureRule
         .check(&signed_doc, &TestCatalystProvider::default())
         .await
         .unwrap());
@@ -71,7 +67,7 @@ async fn single_signature_validation_test() {
         .unwrap()
         .build()
         .unwrap();
-    assert!(!rule(true).check(&invalid_doc, &provider).await.unwrap());
+    assert!(!SignatureRule.check(&invalid_doc, &provider).await.unwrap());
 
     // case: missing signatures
     let unsigned_doc = Builder::new()
@@ -86,7 +82,7 @@ async fn single_signature_validation_test() {
         .unwrap()
         .build()
         .unwrap();
-    assert!(!rule(true).check(&unsigned_doc, &provider).await.unwrap());
+    assert!(!SignatureRule.check(&unsigned_doc, &provider).await.unwrap());
 }
 
 #[tokio::test]
@@ -112,33 +108,26 @@ async fn multiple_signatures_validation_test() {
 
     assert!(!signed_doc.problem_report().is_problematic());
 
-    // case: multi-sig rule disabled
-    let mut provider = TestCatalystProvider::default();
-    provider.add_pk(kid1.clone(), pk1);
-    provider.add_pk(kid2.clone(), pk2);
-    provider.add_pk(kid3.clone(), pk3);
-    assert!(!rule(false).check(&signed_doc, &provider).await.unwrap());
-
     // case: all signatures valid
     let mut provider = TestCatalystProvider::default();
     provider.add_pk(kid1.clone(), pk1);
     provider.add_pk(kid2.clone(), pk2);
     provider.add_pk(kid3.clone(), pk3);
-    assert!(rule(true).check(&signed_doc, &provider).await.unwrap());
+    assert!(SignatureRule.check(&signed_doc, &provider).await.unwrap());
 
     // case: partially available signatures
     let mut provider = TestCatalystProvider::default();
     provider.add_pk(kid1.clone(), pk1);
     provider.add_pk(kid2.clone(), pk2);
-    assert!(!rule(true).check(&signed_doc, &provider).await.unwrap());
+    assert!(!SignatureRule.check(&signed_doc, &provider).await.unwrap());
 
     // case: with unrecognized provider
     let mut provider = TestCatalystProvider::default();
     provider.add_pk(kid_n.clone(), pk_n);
-    assert!(!rule(true).check(&signed_doc, &provider).await.unwrap());
+    assert!(!SignatureRule.check(&signed_doc, &provider).await.unwrap());
 
     // case: no valid signatures available
-    assert!(!rule(true)
+    assert!(!SignatureRule
         .check(&signed_doc, &TestCatalystProvider::default())
         .await
         .unwrap());
@@ -288,7 +277,7 @@ async fn special_cbor_cases() {
         .unwrap();
 
         assert!(
-            rule(true).check(&doc, &provider).await.unwrap(),
+            SignatureRule.check(&doc, &provider).await.unwrap(),
             "[case: {}] {:?}",
             case.name,
             doc.problem_report()