Merge branch 'main' into feat/more-doc-usage-details

Author: stevenj

Earthfile

@@ -1,9 +1,9 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.6.1 AS mdlint-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.6.1 AS cspell-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.6.1 AS python-ci
-IMPORT github.com/input-output-hk/catalyst-ci:v3.6.1 AS cat-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.6.6 AS mdlint-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.6.6 AS cspell-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.6.6 AS python-ci
+IMPORT github.com/input-output-hk/catalyst-ci:v3.6.0 AS cat-ci
 
 FROM debian:stable-slim
 

docs/Earthfile

@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.6.1 AS docs-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.6.6 AS docs-ci
 
 IMPORT .. AS repo
 

docs/src/architecture/08_concepts/signed_doc/cddl/Earthfile

@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.6.1 AS cddl-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.6.6 AS cddl-ci
 
 check-cddl:
     FROM cddl-ci+cddl-base

rust/Earthfile

@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.6.1 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.6.6 AS rust-ci
 IMPORT ../ AS repo-ci
 
 COPY_SRC:

rust/deny.toml

@@ -19,6 +19,7 @@ version = 2
 ignore = [
     "RUSTSEC-2025-0067",
     "RUSTSEC-2025-0068",
+    "RUSTSEC-2024-0370",
 ]
 
 [bans]

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

@@ -1,6 +1,10 @@
 //! `chain` rule type impl.
 
-use catalyst_signed_doc_spec::{is_required::IsRequired, metadata::chain::Chain};
+use anyhow::ensure;
+use catalyst_signed_doc_spec::{
+    is_required::IsRequired,
+    metadata::{chain::Chain, collaborators::Collaborators},
+};
 
 use crate::{CatalystSignedDocument, providers::CatalystSignedDocumentProvider};
 
@@ -21,16 +25,24 @@ pub(crate) enum ChainRule {
 
 impl ChainRule {
     /// Generating `ChainRule` from specs
-    pub(crate) fn new(spec: &Chain) -> Self {
+    pub(crate) fn new(
+        spec: &Chain,
+        collaborators_spec: &Collaborators,
+    ) -> anyhow::Result<Self> {
         let optional = match spec.required {
             IsRequired::Yes => false,
             IsRequired::Optional => true,
             IsRequired::Excluded => {
-                return Self::NotSpecified;
+                return Ok(Self::NotSpecified);
             },
         };
 
-        Self::Specified { optional }
+        ensure!(
+            matches!(collaborators_spec.required, IsRequired::Excluded),
+            "Chained Documents do not support collaborators"
+        );
+
+        Ok(Self::Specified { optional })
     }
 
     /// Field validation rule

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

@@ -1,3 +1,4 @@
+use catalyst_signed_doc_spec::{is_required::IsRequired, metadata::chain::Chain as ChainSpec};
 use catalyst_types::uuid::{UuidV4, UuidV7};
 use test_case::test_case;
 
@@ -48,6 +49,17 @@ async fn test_without_chaining_documents() {
     assert!(!rule.check(&doc, &provider).await.unwrap());
 }
 
+#[tokio::test]
+async fn chain_rule_collaborators_rule_conflict() {
+    let chain = ChainSpec {
+        required: IsRequired::Optional,
+    };
+    let collaborators = Collaborators {
+        required: IsRequired::Optional,
+    };
+    ChainRule::new(&chain, &collaborators).unwrap_err();
+}
+
 #[test_case(
     {
         let doc_type = UuidV4::new();

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

@@ -129,7 +129,7 @@ impl Rules {
             content_encoding: ContentEncodingRule::new(&doc_spec.headers.content_encoding)?,
             template: TemplateRule::new(all_docs_specs, &doc_spec.metadata.template)?,
             parameters: ParametersRule::new(all_docs_specs, &doc_spec.metadata.parameters)?,
-            chain: ChainRule::new(&doc_spec.metadata.chain),
+            chain: ChainRule::new(&doc_spec.metadata.chain, &doc_spec.metadata.collaborators)?,
             doc_ref: RefRule::new(all_docs_specs, &doc_spec.metadata.doc_ref)?,
             reply: ReplyRule::new(all_docs_specs, &doc_spec.metadata.reply)?,
             section: SectionRule::NotSpecified,

specs/Earthfile

@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.6.1 AS python-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.6.6 AS python-ci
 
 IMPORT ../docs AS docs
 

specs/generators/pages/signed_doc/cddl/Earthfile.jinja

@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.6.1 AS cddl-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.6.6 AS cddl-ci
 
 check-cddl:
     FROM cddl-ci+cddl-base