Merge branch 'main' into feat/doc-signing-logic

Author: saibatizoku

docs/src/architecture/08_concepts/signed_doc/cddl/additional_meta.cddl

@@ -5,10 +5,10 @@ additional_fields = {
   ? "reply" => ref_type,
   ? "section" => text,
   ? "collabs" => [+any],
-  ? "brand_id" => UUID, ; UUID v4
-  ? "campaign_id" => UUID, ; UUID v4
+  ? "brand_id" => ref_type,
+  ? "campaign_id" => ref_type,
   ? "election_id" => UUID, ; UUID v4
-  ? "category_id" => UUID, ; UUID v4
+  ? "category_id" => ref_type,
 }
 
 ref_type = UUID / [UUID, UUID] ; UUIDs v7

docs/src/architecture/08_concepts/signed_doc/meta.md

@@ -88,13 +88,17 @@ This list can impact actions that can be performed by the `Proposal Action Docum
 
 ## `brand_id`
 
-Unique identifier [UUID] v4, which represents a "brand" who is running the voting,
-e.g. Catalyst, Midnight.
+This is a reply to another document.
+The format is the same as the [CBOR] Array form of [`ref`](#ref-document-reference).
+
+`brand_id` represents a "brand" who is running the voting, e.g. Catalyst, Midnight.
 
 ## `campaign_id`
 
-Unique identifier [UUID] v4, which defines a "campaign" of voting,
-e.g. "treasury campaign".
+This is a reply to another document.
+The format is the same as the [CBOR] Array form of [`ref`](#ref-document-reference).
+
+`campaign_id` defines a "campaign" of voting, e.g. "treasury campaign".
 
 ## `election_id`
 
@@ -103,7 +107,10 @@ e.g. "Catalyst Fund 1", "Catalyst Fund 2".
 
 ## `category_id`
 
-Unique identifier [UUID] v4 which defines a voting category as a collection of proposals,
+This is a reply to another document.
+The format is the same as the [CBOR] Array form of [`ref`](#ref-document-reference).
+
+`campaign_id` defines a voting category as a collection of proposals,
 e.g. "Development & Infrastructure", "Products & Integrations".
 
 [UUID]: https://www.rfc-editor.org/rfc/rfc9562.html

rust/Cargo.toml

@@ -10,7 +10,7 @@ members = [
     "cbork-cddl-parser",
     "cbork-utils",
     "catalyst-voting",
-    "catalyst-types", 
+    "catalyst-types",
     "immutable-ledger",
     "vote-tx-v1",
     "vote-tx-v2",
@@ -60,3 +60,4 @@ string_slice = "deny"
 unchecked_duration_subtraction = "deny"
 unreachable = "deny"
 missing_docs_in_private_items = "deny"
+arithmetic_side_effects = "deny"

rust/Earthfile

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

rust/c509-certificate/src/attributes/mod.rs

@@ -62,7 +62,10 @@ impl Encode<()> for Attributes {
             ));
         }
         // The attribute type should be included in array too
-        encode_array_len(e, "Attributes", self.0.len() as u64 * 2)?;
+        let len = (self.0.len() as u64)
+            .checked_mul(2)
+            .ok_or_else(|| minicbor::encode::Error::message("Attributes length overflow"))?;
+        encode_array_len(e, "Attributes", len)?;
         for attribute in &self.0 {
             attribute.encode(e, ctx)?;
         }

rust/c509-certificate/src/extensions/extension/mod.rs

@@ -110,7 +110,11 @@ impl Encode<()> for Extension {
         {
             // Determine encoded OID value based on critical flag
             let encoded_oid = if self.critical {
-                -mapped_oid
+                mapped_oid.checked_neg().ok_or_else(|| {
+                    minicbor::encode::Error::message(format!(
+                        "Invalid OID value (will overflow during negation): {mapped_oid}"
+                    ))
+                })?
             } else {
                 mapped_oid
             };

rust/c509-certificate/src/extensions/mod.rs

@@ -70,7 +70,13 @@ impl Encode<()> for Extensions {
             if self.0.len() == 1 && extension.registered_oid().c509_oid().oid() == &KEY_USAGE_OID {
                 match extension.value() {
                     ExtensionValue::Int(value) => {
-                        let ku_value = if extension.critical() { -value } else { *value };
+                        let ku_value = if extension.critical() {
+                            value
+                                .checked_neg()
+                                .ok_or_else(|| minicbor::encode::Error::message(format!("Invalid key usage value (will overflow during negation): {value}")))?
+                        } else {
+                            *value
+                        };
                         encode_helper(e, "Extensions KeyUsage", ctx, &ku_value)?;
                         return Ok(());
                     },

rust/c509-certificate/src/general_names/mod.rs

@@ -59,7 +59,10 @@ impl Encode<()> for GeneralNames {
             ));
         }
         // The general name type should be included in array too
-        encode_array_len(e, "General Names", self.0.len() as u64 * 2)?;
+        let len = (self.0.len() as u64)
+            .checked_mul(2)
+            .ok_or_else(|| minicbor::encode::Error::message("General Names length overflow"))?;
+        encode_array_len(e, "General Names", len)?;
         for gn in &self.0 {
             gn.encode(e, ctx)?;
         }

rust/c509-certificate/src/name/mod.rs

@@ -106,14 +106,20 @@ impl Encode<()> for NameValue {
 
                         encode_cn_value(e, cn_value)?;
                     } else {
-                        encode_array_len(e, "Attributes", attrs.len() as u64 * 2)?;
+                        let len = (attrs.len() as u64).checked_mul(2).ok_or_else(|| {
+                            minicbor::encode::Error::message("Attribute length overflow")
+                        })?;
+                        encode_array_len(e, "Attributes", len)?;
                         for attribute in attrs {
                             attribute.encode(e, ctx)?;
                         }
                     }
                 } else {
                     // If is okay if the attributes is empty
-                    encode_array_len(e, "Attributes", attrs.len() as u64 * 2)?;
+                    let len = (attrs.len() as u64).checked_mul(2).ok_or_else(|| {
+                        minicbor::encode::Error::message("Attribute length overflow")
+                    })?;
+                    encode_array_len(e, "Attributes", len)?;
                     for attribute in attrs {
                         attribute.encode(e, ctx)?;
                     }

rust/cardano-blockchain-types/src/auxdata/scripts.rs

@@ -100,7 +100,7 @@ impl TryFrom<u64> for ScriptType {
         match value {
             0 => Err(anyhow!("Invalid script type: {}", value)),
             1 => Ok(Self::Native),
-            _ => Ok(Self::Plutus(value - 1)),
+            _ => Ok(Self::Plutus(value.saturating_sub(1))),
         }
     }
 }