Merge branch 'main' into fix/cip36-assets-indexing

Author: Mr-Leshiy

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
   ci:
     uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.7.2
     with:
-      forge_version: 0.14.0
+      forge_version: 0.16.0
 
   test_reporting:
     if: always()

.github/workflows/flutter-uikit-example-firebase-deploy.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Install Forge
         uses: input-output-hk/catalyst-forge/actions/install@ci/v1.7.2
         with:
-          version: 0.14.0
+          version: 0.16.0
       - name: Setup CI
         uses: input-output-hk/catalyst-forge/actions/setup@ci/v1.7.2
       - name: Build Flutter Web

.github/workflows/generate-allure-report.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Install Forge
         uses: input-output-hk/catalyst-forge/actions/install@ci/v1.7.2
         with:
-          version: 0.14.0
+          version: 0.16.0
         if: always()
 
       - name: Setup CI

.github/workflows/nightly-ci.yml

@@ -22,7 +22,7 @@ jobs:
   ci_nightly:
     uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.7.2
     with:
-      forge_version: 0.14.0
+      forge_version: 0.16.0
       nightly: true
 
   generate-test-reports:

catalyst-gateway/bin/Cargo.toml

@@ -15,11 +15,11 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-cardano-chain-follower = { version = "0.0.8", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250401-01" }
-rbac-registration = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250401-01" }
-catalyst-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250401-01" }
-cardano-blockchain-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250401-01" }
-catalyst-signed-doc = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250401-01" }
+cardano-chain-follower = { version = "0.0.8", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250406-00" }
+rbac-registration = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250406-00" }
+catalyst-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250406-00" }
+cardano-blockchain-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250406-00" }
+catalyst-signed-doc = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250406-00" }
 
 pallas = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
 pallas-traverse = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }

catalyst-gateway/bin/src/service/api/documents/get_document.rs

@@ -7,6 +7,7 @@ use super::templates::get_doc_static_template;
 use crate::{
     db::event::{error::NotFoundError, signed_docs::FullSignedDoc},
     service::common::{responses::WithErrorResponses, types::payload::cbor::Cbor},
+    settings::Settings,
 };
 
 /// Endpoint responses.
@@ -71,4 +72,14 @@ impl catalyst_signed_doc::providers::CatalystSignedDocumentProvider for DocProvi
             Err(err) => Err(err),
         }
     }
+
+    fn future_threshold(&self) -> Option<std::time::Duration> {
+        let signed_doc_cfg = Settings::signed_doc_cfg();
+        Some(signed_doc_cfg.future_threshold())
+    }
+
+    fn past_threshold(&self) -> Option<std::time::Duration> {
+        let signed_doc_cfg = Settings::signed_doc_cfg();
+        Some(signed_doc_cfg.past_threshold())
+    }
 }

catalyst-gateway/bin/src/settings/mod.rs

@@ -23,6 +23,7 @@ use crate::{
 
 pub(crate) mod cassandra_db;
 pub(crate) mod chain_follower;
+pub(crate) mod signed_doc;
 mod str_env_var;
 
 /// Default address to start service on, '0.0.0.0:3030'.
@@ -136,6 +137,9 @@ struct EnvVars {
     /// The Chain Follower configuration
     chain_follower: chain_follower::EnvVars,
 
+    /// The Catalyst Signed Documents configuration
+    signed_doc: signed_doc::EnvVars,
+
     /// Internal API Access API Key
     internal_api_key: Option<StringEnvVar>,
 
@@ -211,6 +215,7 @@ static ENV_VARS: LazyLock<EnvVars> = LazyLock::new(|| {
             cassandra_db::VOLATILE_NAMESPACE_DEFAULT,
         ),
         chain_follower: chain_follower::EnvVars::new(),
+        signed_doc: signed_doc::EnvVars::new(),
         internal_api_key: StringEnvVar::new_optional("INTERNAL_API_KEY", true),
         check_config_tick: StringEnvVar::new_as_duration(
             "CHECK_CONFIG_TICK",
@@ -307,6 +312,11 @@ impl Settings {
         ENV_VARS.chain_follower.clone()
     }
 
+    /// Get the configuration of the Catalyst Signed Documents.
+    pub(crate) fn signed_doc_cfg() -> signed_doc::EnvVars {
+        ENV_VARS.signed_doc.clone()
+    }
+
     /// Chain Follower network (The Blockchain network we are configured to use).
     /// Note: Catalyst Gateway can ONLY follow one network at a time.
     pub(crate) fn cardano_network() -> Network {

catalyst-gateway/bin/src/settings/signed_doc.rs

@@ -0,0 +1,49 @@
+//! Command line and environment variable settings for the Catalyst Signed Docs
+
+use std::time::Duration;
+
+use super::str_env_var::StringEnvVar;
+
+/// Default number value of `future_threshold`, 30 seconds.
+const DEFAULT_FUTURE_THRESHOLD: Duration = Duration::from_secs(30);
+
+/// Default number value of `past_threshold`, 10 minutes.
+const DEFAULT_PAST_THRESHOLD: Duration = Duration::from_secs(60 * 10);
+
+/// Configuration for the Catalyst Signed Documents validation configuration.
+#[derive(Clone)]
+pub(crate) struct EnvVars {
+    /// The Catalyst Signed Document threshold, document cannot be too far in the future.
+    future_threshold: Duration,
+
+    /// The Catalyst Signed Document threshold, document cannot be too far behind.
+    past_threshold: Duration,
+}
+
+impl EnvVars {
+    /// Create a config for Catalyst Signed Document validation configuration.
+    pub(super) fn new() -> Self {
+        let future_threshold =
+            StringEnvVar::new_as_duration("SIGNED_DOC_FUTURE_THRESHOLD", DEFAULT_FUTURE_THRESHOLD);
+
+        let past_threshold =
+            StringEnvVar::new_as_duration("SIGNED_DOC_PAST_THRESHOLD", DEFAULT_PAST_THRESHOLD);
+
+        Self {
+            future_threshold,
+            past_threshold,
+        }
+    }
+
+    /// The Catalyst Signed Document threshold, document cannot be too far in the future
+    /// (in seconds).
+    pub(crate) fn future_threshold(&self) -> Duration {
+        self.future_threshold
+    }
+
+    /// The Catalyst Signed Document threshold, document cannot be too far behind
+    /// (in seconds).
+    pub(crate) fn past_threshold(&self) -> Duration {
+        self.past_threshold
+    }
+}