Merge branch 'main' into 2091-map-proposal-elements-for-testing

Author: emiride

.github/workflows/flutter-publish-packages.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           channel: stable
-          flutter-version: 3.29.0
+          flutter-version: 3.29.3
       - uses: bluefireteam/melos-action@v3
         with:
           run-versioning: true

Earthfile

@@ -1,8 +1,8 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.3.3 AS mdlint-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.3.3 AS cspell-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.3.3 AS postgresql-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.4.0 AS mdlint-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.4.0 AS cspell-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.4.0 AS postgresql-ci
 
 FROM debian:stable-slim
 

catalyst-gateway/Earthfile

@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.3.3 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.4.0 AS rust-ci
 IMPORT ../ AS repo-ci
 
 #cspell: words rustfmt toolsets USERARCH stdcfgs

catalyst-gateway/bin/Cargo.toml

@@ -15,12 +15,12 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-cardano-chain-follower = { version = "0.0.8", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250425-00" }
-rbac-registration = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250425-00" }
-catalyst-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250425-00" }
-cardano-blockchain-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250425-00" }
-catalyst-signed-doc = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250425-00" }
-c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250425-00" }
+cardano-chain-follower = { version = "0.0.8", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250428-00" }
+rbac-registration = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250428-00" }
+catalyst-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250428-00" }
+cardano-blockchain-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250428-00" }
+catalyst-signed-doc = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250428-00" }
+c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250428-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" }
@@ -87,7 +87,6 @@ rust-embed = "8.5.0"
 num-traits = "0.2.19"
 base64 = "0.22.1"
 dashmap = { version = "6.1.0", features = ["rayon"] }
-jsonschema = "0.26.1"
 bech32 = "0.11.0"
 const_format = "0.2.33"
 regex = "1.11.1"

catalyst-gateway/bin/src/db/event/config/default/frontend.json

@@ -1,15 +1,6 @@
 //! Configuration Key
 
-use std::{fmt::Display, net::IpAddr, sync::LazyLock};
-
-use jsonschema::{BasicOutput, Validator};
-use serde_json::{json, Value};
-use tracing::error;
-
-use crate::{
-    service::utilities::json::load_json,
-    utils::schema::{extract_json_schema_for, SCHEMA_VERSION},
-};
+use std::{fmt::Display, net::IpAddr};
 
 /// Configuration key
 #[derive(Debug, Clone, PartialEq)]
@@ -29,50 +20,6 @@ impl Display for ConfigKey {
     }
 }
 
-/// Frontend schema from API specification.
-pub(crate) static FRONTEND_SCHEMA: LazyLock<Value> =
-    LazyLock::new(|| extract_json_schema_for("FrontendConfig"));
-
-/// Frontend schema validator.
-static FRONTEND_SCHEMA_VALIDATOR: LazyLock<Validator> =
-    LazyLock::new(|| schema_validator(&FRONTEND_SCHEMA));
-
-/// Frontend default configuration.
-static FRONTEND_DEFAULT: LazyLock<Value> =
-    LazyLock::new(|| load_json(include_str!("default/frontend.json")));
-
-/// Frontend specific configuration.
-static FRONTEND_IP_DEFAULT: LazyLock<Value> =
-    LazyLock::new(|| load_json(include_str!("default/frontend_ip.json")));
-
-/// Helper function to create a JSON validator from a JSON schema.
-/// If the schema is invalid, a default JSON validator is created.
-fn schema_validator(schema: &Value) -> Validator {
-    Validator::options()
-        .with_draft(jsonschema::Draft::Draft202012)
-        .build(schema)
-        .unwrap_or_else(|err| {
-            error!(
-                id="schema_validator",
-                error=?err,
-                "Error creating JSON validator"
-            );
-
-            default_validator()
-        })
-}
-
-/// Create a default JSON validator as a fallback
-/// This should not fail since it is hard coded
-fn default_validator() -> Validator {
-    #[allow(clippy::expect_used)]
-    Validator::new(&json!({
-        "$schema": SCHEMA_VERSION,
-        "type": "object"
-    }))
-    .expect("Failed to create default JSON validator")
-}
-
 impl ConfigKey {
     /// Convert a `ConfigKey` to its corresponding IDs.
     pub(super) fn to_id(&self) -> (String, String, String) {
@@ -83,106 +30,4 @@ impl ConfigKey {
             },
         }
     }
-
-    /// Validate the provided value against the JSON schema.
-    pub(super) fn validate(&self, value: &Value) -> BasicOutput<'static> {
-        // Retrieve the validator based on ConfigKey
-        let validator = match self {
-            ConfigKey::Frontend | ConfigKey::FrontendForIp(_) => &*FRONTEND_SCHEMA_VALIDATOR,
-        };
-
-        // Validate the value against the schema
-        validator.apply(value).basic()
-    }
-
-    /// Retrieve the default configuration value.
-    pub(super) fn default(&self) -> Value {
-        // Retrieve the default value based on the ConfigKey
-        match self {
-            ConfigKey::Frontend => FRONTEND_DEFAULT.clone(),
-            ConfigKey::FrontendForIp(_) => FRONTEND_IP_DEFAULT.clone(),
-        }
-    }
-
-    /// Retrieve the JSON schema.
-    pub(crate) fn schema(&self) -> &Value {
-        match self {
-            ConfigKey::Frontend | ConfigKey::FrontendForIp(_) => &FRONTEND_SCHEMA,
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use serde_json::json;
-
-    use super::*;
-
-    #[test]
-    fn test_schema_for_schema() {
-        // Invalid schema
-        let invalid_schema = json!({
-            "title": "Invalid Example Schema",
-            "type": "object",
-
-            "properties": {
-                "invalidProperty": {
-                    "type": "unknownType"
-                }
-            },
-
-        });
-        // This should not fail
-        schema_validator(&invalid_schema);
-    }
-
-    #[test]
-    fn test_valid_validate_1() {
-        let value = json!({
-            "sentry": {
-                "dsn": "https://test.com"
-            }
-        });
-        let result = ConfigKey::Frontend.validate(&value);
-        assert!(result.is_valid());
-        println!("{:?}", serde_json::to_value(result).unwrap());
-    }
-
-    #[test]
-    fn test_valid_validate_2() {
-        let value = json!({});
-        let result = ConfigKey::Frontend.validate(&value);
-        assert!(result.is_valid());
-        println!("{:?}", serde_json::to_value(result).unwrap());
-    }
-
-    #[test]
-    fn test_invalid_validate() {
-        let value = json!([]);
-        let result = ConfigKey::Frontend.validate(&value);
-        assert!(!result.is_valid());
-        println!("{:?}", serde_json::to_value(result).unwrap());
-    }
-
-    #[test]
-    fn test_default() {
-        let result = ConfigKey::Frontend.default();
-        assert!(result.is_object());
-    }
-
-    #[test]
-    fn test_default_validator() {
-        let result = std::panic::catch_unwind(|| {
-            default_validator();
-        });
-        // Assert that no panic occurred
-        assert!(result.is_ok(), "default_validator panicked");
-    }
-
-    // Since load_json return an empty object for invalid JSON,
-    // Add test for default file to ensure it is not empty object.
-    #[test]
-    fn test_default_files() {
-        assert!(!FRONTEND_DEFAULT.as_object().unwrap().is_empty());
-    }
 }

catalyst-gateway/bin/src/db/event/config/default/frontend_ip.json

@@ -1,9 +1,7 @@
 //! Configuration query
 
-use jsonschema::BasicOutput;
 use key::ConfigKey;
 use serde_json::Value;
-use tracing::error;
 
 use crate::db::event::EventDB;
 
@@ -27,20 +25,10 @@ impl Config {
     /// - Error if the query fails.
     pub(crate) async fn get(id: ConfigKey) -> anyhow::Result<Value> {
         let (id1, id2, id3) = id.to_id();
-        let rows = EventDB::query(GET_CONFIG, &[&id1, &id2, &id3]).await?;
+        let row = EventDB::query_one(GET_CONFIG, &[&id1, &id2, &id3]).await?;
 
-        if let Some(row) = rows.first() {
-            let value: Value = row.get(0);
-            match id.validate(&value) {
-                BasicOutput::Valid(_) => return Ok(value),
-                BasicOutput::Invalid(errors) => {
-                    // This should not happen, expecting the schema to be valid
-                    error!(id=%id, error=?errors, "Get Config, schema validation failed, defaulting.");
-                },
-            }
-        }
-        // Return the default config value as a fallback
-        Ok(id.default())
+        let value = row.get(0);
+        Ok(value)
     }
 
     /// Set the configuration for the given `ConfigKey`.
@@ -49,16 +37,9 @@ impl Config {
     ///
     /// - A `BasicOutput` of the validation result, which can be valid or invalid.
     /// - Error if the query fails.
-    pub(crate) async fn set(id: ConfigKey, value: Value) -> anyhow::Result<BasicOutput<'static>> {
-        let validate = id.validate(&value);
-        // Validate schema failed, return immediately with JSON schema error
-        if !validate.is_valid() {
-            return Ok(validate);
-        }
-
+    pub(crate) async fn set(id: ConfigKey, value: Value) -> anyhow::Result<()> {
         let (id1, id2, id3) = id.to_id();
         EventDB::query(UPSERT_CONFIG, &[&id1, &id2, &id3, &value]).await?;
-
-        Ok(validate)
+        Ok(())
     }
 }