Merge branch 'main' into feat/voting-formats

Author: stevenj

Earthfile

@@ -1,8 +1,8 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.5.17 AS mdlint-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.5.17 AS cspell-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.5.17 AS python-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.5.26 AS mdlint-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.5.26 AS cspell-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.5.26 AS python-ci
 IMPORT github.com/input-output-hk/catalyst-ci:v3.5.17 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.5.17 AS docs-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.5.26 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.5.17 AS cddl-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.26 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.5.17 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.5.26 AS rust-ci
 IMPORT ../ AS repo-ci
 
 COPY_SRC:

rust/cardano-chain-follower/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cardano-chain-follower"
-version = "0.0.17"
+version = "0.0.18"
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
@@ -16,8 +16,8 @@ mithril-client = { version = "=0.12.2", default-features = false, features = [
     "num-integer-backend",
 ] }
 
-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.9",  git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.9" }
+cardano-blockchain-types = { version = "0.0.8", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cardano-blockchain-types/v0.0.8" }
+catalyst-types = { version = "0.0.10",  git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.10" }
 
 thiserror = "1.0.69"
 tokio = { version = "1.45.0", features = [
@@ -60,7 +60,7 @@ test-log = { version = "0.2.16", default-features = false, features = [
     "trace",
 ] }
 clap = "4.5.23"
-rbac-registration = { version = "0.0.12", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "rbac-registration/v0.0.12" }
+rbac-registration = { version = "0.0.14", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "rbac-registration/v0.0.14" }
 minicbor = { version = "2.0.0", features = ["alloc", "half"] }
 
 # Note, these features are for support of features exposed by dependencies.

rust/deny.toml

@@ -63,6 +63,8 @@ allow-git = [
     "https://github.com/input-output-hk/mithril",
     # Maintained fork of an archived crates-io version.
     "https://github.com/dariusc93/rust-ipfs",
+    # TODO(dt-iohk): remove this when changes from forked flutter_rust_bridge are merged into the official version
+    "https://github.com/input-output-hk/catalyst_flutter_rust_bridge",
 ]
 
 [licenses]
@@ -109,7 +111,6 @@ crate = "ring"
 expression = "MIT"
 license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]
 
-
 # SPDX considers OpenSSL to encompass both the OpenSSL and SSLeay licenses
 # https://spdx.org/licenses/OpenSSL.html
 # ISC - Both BoringSSL and ring use this for their new files

rust/signed_doc/Cargo.toml

@@ -33,6 +33,7 @@ futures = "0.3.31"
 ed25519-bip32 = "0.4.1" # used by the `mk_signed_doc` cli tool
 tracing = "0.1.40"
 thiserror = "2.0.11"
+chrono = "0.4.42"
 
 [dev-dependencies]
 base64-url = "3.0.0"

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

@@ -8,19 +8,17 @@ use crate::{
 };
 
 mod helper {
-    use std::time::{Duration, SystemTime, UNIX_EPOCH};
-
     use catalyst_types::uuid::UuidV7;
+    use chrono::{Duration, Utc};
     use uuid::{Timestamp, Uuid};
 
-    pub(super) fn get_now_plus_uuidv7(secs: u64) -> UuidV7 {
-        let future_time = SystemTime::now()
-            .checked_add(Duration::from_secs(secs))
-            .unwrap();
-        let duration_since_epoch = future_time.duration_since(UNIX_EPOCH).unwrap();
+    pub(super) fn get_now_plus_uuidv7(secs: i64) -> UuidV7 {
+        let future_time = Utc::now()
+            .checked_add_signed(Duration::seconds(secs))
+            .expect("time overflow in future_time calculation");
 
-        let unix_secs = duration_since_epoch.as_secs();
-        let nanos = duration_since_epoch.subsec_nanos();
+        let unix_secs = u64::try_from(future_time.timestamp()).unwrap_or(0);
+        let nanos = future_time.timestamp_subsec_nanos();
 
         let ts = Timestamp::from_unix(uuid::NoContext, unix_secs, nanos);
         let uuid = Uuid::new_v7(ts);

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

@@ -3,9 +3,8 @@
 #[cfg(test)]
 mod tests;
 
-use std::time::{Duration, SystemTime};
-
 use anyhow::Context;
+use chrono::{DateTime, Utc};
 
 use crate::{providers::CatalystSignedDocumentProvider, CatalystSignedDocument};
 
@@ -16,11 +15,10 @@ pub(crate) struct IdRule;
 impl IdRule {
     /// Validates document `id` field on the timestamps:
     /// 1. If `provider.future_threshold()` not `None`, document `id` cannot be too far in
-    ///    the future (`future_threshold` arg) from `SystemTime::now()` based on the
-    ///    provide threshold
-    /// 2. If `provider.future_threshold()` not `None`, document `id` cannot be too far
-    ///    behind (`past_threshold` arg) from `SystemTime::now()` based on the provide
+    ///    the future (`future_threshold` arg) from `Utc::now()` based on the provided
     ///    threshold
+    /// 2. If `provider.past_threshold()` not `None`, document `id` cannot be too far
+    ///    behind (`past_threshold` arg) from `Utc::now()` based on the provided threshold
     #[allow(clippy::unused_async)]
     pub(crate) async fn check<Provider>(
         &self,
@@ -46,37 +44,40 @@ impl IdRule {
             .ok_or(anyhow::anyhow!("Document `id` field must be a UUIDv7"))?
             .to_unix();
 
-        let Some(id_time) =
-            SystemTime::UNIX_EPOCH.checked_add(Duration::new(id_time_secs, id_time_nanos))
+        let Some(id_time) = i64::try_from(id_time_secs)
+            .ok()
+            .and_then(|id_time_secs| DateTime::from_timestamp(id_time_secs, id_time_nanos))
         else {
             doc.report().invalid_value(
                     "id",
                     &id.to_string(),
-                    "Must a valid duration since `UNIX_EPOCH`",
-                    "Cannot instantiate a valid `SystemTime` value from the provided `id` field timestamp.",
+                    "Must a valid UTC date time since `UNIX_EPOCH`",
+                    "Cannot instantiate a valid `DateTime<Utc>` value from the provided `id` field timestamp.",
                 );
             return Ok(false);
         };
 
-        let now = SystemTime::now();
+        let now = Utc::now();
+        let time_delta = id_time.signed_duration_since(now);
 
-        if let Ok(id_age) = id_time.duration_since(now) {
+        if let Ok(id_age) = time_delta.to_std() {
             // `now` is earlier than `id_time`
             if let Some(future_threshold) = provider.future_threshold() {
                 if id_age > future_threshold {
                     doc.report().invalid_value(
                         "id",
                         &id.to_string(),
                         "id < now + future_threshold",
-                        &format!("Document Version timestamp {id} cannot be too far in future (threshold: {future_threshold:?}) from now: {now:?}"),
+                        &format!("Document ID timestamp {id} cannot be too far in future (threshold: {future_threshold:?}) from now: {now}"),
                     );
                     is_valid = false;
                 }
             }
         } else {
             // `id_time` is earlier than `now`
-            let id_age = now
-                .duration_since(id_time)
+            let id_age = time_delta
+                .abs()
+                .to_std()
                 .context("BUG! `id_time` must be earlier than `now` at this place")?;
 
             if let Some(past_threshold) = provider.past_threshold() {
@@ -85,7 +86,7 @@ impl IdRule {
                         "id",
                         &id.to_string(),
                         "id > now - past_threshold",
-                        &format!("Document Version timestamp {id} cannot be too far behind (threshold: {past_threshold:?}) from now: {now:?}",),
+                        &format!("Document ID timestamp {id} cannot be too far behind (threshold: {past_threshold:?}) from now: {now:?}",),
                     );
                     is_valid = false;
                 }

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

@@ -1,5 +1,4 @@
-use std::time::SystemTime;
-
+use chrono::Utc;
 use test_case::test_case;
 use uuid::{Timestamp, Uuid};
 
@@ -22,46 +21,46 @@ use crate::{
 #[test_case(
     #[allow(clippy::arithmetic_side_effects)]
     |provider| {
-        let now = SystemTime::now()
-            .duration_since(SystemTime::UNIX_EPOCH)
-            .unwrap()
-            .as_secs();
-        let to_far_in_past = Uuid::new_v7(Timestamp::from_unix_time(
-                now - provider.past_threshold().unwrap().as_secs() - 1,
-                0,
-                0,
-                0,
-            ))
-            .try_into()
-            .unwrap();
+        let now = Utc::now().timestamp();
+        let past_threshold_secs = i64::try_from(provider.past_threshold().unwrap().as_secs()).unwrap_or(0);
+
+        let too_far_in_past = Uuid::new_v7(Timestamp::from_unix_time(
+            u64::try_from(now - past_threshold_secs - 1).unwrap_or(0),
+            0,
+            0,
+            0,
+        ))
+        .try_into()
+        .unwrap();
+
         Builder::new()
-            .with_metadata_field(SupportedField::Id(to_far_in_past))
+            .with_metadata_field(SupportedField::Id(too_far_in_past))
             .build()
     }
     => false;
-    "`id` to far in past"
+    "`id` too far in past"
 )]
 #[test_case(
     #[allow(clippy::arithmetic_side_effects)]
     |provider| {
-        let now = SystemTime::now()
-            .duration_since(SystemTime::UNIX_EPOCH)
-            .unwrap()
-            .as_secs();
-        let to_far_in_future = Uuid::new_v7(Timestamp::from_unix_time(
-                now + provider.future_threshold().unwrap().as_secs() + 1,
-                0,
-                0,
-                0,
-            ))
-            .try_into()
-            .unwrap();
+        let now = Utc::now().timestamp();
+        let future_threshold_secs = i64::try_from(provider.future_threshold().unwrap().as_secs()).unwrap_or(0);
+
+        let too_far_in_future = Uuid::new_v7(Timestamp::from_unix_time(
+            u64::try_from(now + future_threshold_secs + 1).unwrap_or(0),
+            0,
+            0,
+            0,
+        ))
+        .try_into()
+        .unwrap();
+
         Builder::new()
-            .with_metadata_field(SupportedField::Id(to_far_in_future))
+            .with_metadata_field(SupportedField::Id(too_far_in_future))
             .build()
     }
     => false;
-    "`id` to far in future"
+    "`id` too far in future"
 )]
 #[test_case(
     |_| {