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

Author: emiride

.config/dictionaries/project.dic

@@ -206,6 +206,7 @@ minicbor
 minijinja
 mithril
 mitigations
+mitmdump
 mocktail
 moderations
 moka
@@ -258,6 +259,7 @@ pubkey
 PUBLICKEY
 pubspec
 pycardano
+pyright
 pytest
 qrcode
 rapidoc

.vscode/settings.recommended.json

@@ -9,14 +9,19 @@
   },
   "files.autoSave": "afterDelay",
   "editor.formatOnType": true,
-  "editor.rulers": [100],
+  "editor.rulers": [
+    100
+  ],
   "editor.tabSize": 4,
   "debug.openDebug": "openOnDebugBreak",
   "debug.internalConsoleOptions": "openOnSessionStart",
+  "dart.lineLength": 100,
   "[dart]": {
     "editor.formatOnSave": true,
     "editor.formatOnType": true,
-    "editor.rulers": [80],
+    "editor.rulers": [
+      100
+    ],
     "editor.codeActionsOnSave": {
       "source.fixAll": "explicit",
       "source.organizeImports": "explicit",
@@ -54,8 +59,14 @@
     ".pages": "yaml",
     ".earthlyignore": "ignore"
   },
-  "rust-analyzer.linkedProjects": ["./catalyst-gateway/Cargo.toml"],
-  "rust-analyzer.check.overrideCommand": ["bash", "-c", "cargo lint-vscode"],
+  "rust-analyzer.linkedProjects": [
+    "./catalyst-gateway/Cargo.toml"
+  ],
+  "rust-analyzer.check.overrideCommand": [
+    "bash",
+    "-c",
+    "cargo lint-vscode"
+  ],
   "yaml.schemas": {
     "https://squidfunk.github.io/mkdocs-material/schema.json": "mkdocs.yml"
   },
@@ -83,7 +94,9 @@
     "files.trimTrailingWhitespace": true,
     "editor.defaultFormatter": "DavidAnson.vscode-markdownlint"
   },
-  "rust-analyzer.rustfmt.extraArgs": ["+nightly"],
+  "rust-analyzer.rustfmt.extraArgs": [
+    "+nightly"
+  ],
   "rust-analyzer.lens.enable": true,
   "vs-kubernetes": {
     "vs-kubernetes.kubeconfig": "utilities/local-cluster/shared/k3s.yaml"
@@ -94,4 +107,4 @@
   "languageToolLinter.external.url": "https://api.languagetoolplus.com",
   "languageToolLinter.languageTool.language": "en-US",
   "languageToolLinter.languageTool.motherTongue": "en-US"
-}
+}

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 = "r20250512-00" }
-rbac-registration = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250512-00" }
-catalyst-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250512-00" }
-cardano-blockchain-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250512-00" }
-catalyst-signed-doc = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250512-00" }
-c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250512-00" }
+cardano-chain-follower = { version = "0.0.8", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250526-00" }
+rbac-registration = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250526-00" }
+catalyst-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250526-00" }
+cardano-blockchain-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250526-00" }
+catalyst-signed-doc = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250526-00" }
+c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250526-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" }
@@ -35,7 +35,6 @@ tracing-subscriber = { version = "0.3.18", features = [
     "time",
     "env-filter",
 ] }
-serde = { version = "1.0.214", features = ["derive"] }
 serde_json = { version = "1.0.132", features = ["arbitrary_precision"] }
 thiserror = "1.0.68"
 chrono = "0.4.38"
@@ -109,9 +108,6 @@ poem-openapi-derive = { version = "=5.1.4" }
 # Its a transitive dependency of the "poem-openapi-derive" crate,
 # but its breaks API after version "0.20.11".
 darling = { version = "=0.20.10" }
-# Its a transitive dependency of the "orx-concurrent-vec" crate,
-# but its breaks API after version "1.3.0".
-orx-iterable = { version = "=1.2.0" }
 
 [dev-dependencies]
 
@@ -120,4 +116,4 @@ build-info-build = "0.0.39"
 
 [package.metadata.cargo-machete]
 # remove that after fixing issues with latest crates
-ignored = ["poem-openapi-derive", "darling", "orx-iterable"]
+ignored = ["poem-openapi-derive", "darling"]

catalyst-gateway/bin/src/build_info.rs

@@ -19,7 +19,7 @@ build time: {}
     $.timestamp
 );
 
-build_info_crate::build_info!(fn build_info);
+build_info_crate::build_info!(pub(crate) fn build_info);
 
 /// Log Build Info to our logs.
 pub(crate) fn log_build_info() {

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

@@ -27,9 +27,7 @@ use crate::{
     settings::{chain_follower, Settings},
 };
 
-// pub(crate) mod cip36_registration_obsolete;
 pub(crate) mod event;
-pub(crate) mod util;
 
 /// How long we wait between checks for connection to the indexing DB to be ready.
 pub(crate) const INDEXING_DB_READY_WAIT_INTERVAL: Duration = Duration::from_secs(1);

catalyst-gateway/bin/src/cardano/util.rs

@@ -2,15 +2,16 @@
 use std::{io::Write, path::PathBuf, time::Duration};
 
 use clap::Parser;
-use tracing::{error, info};
+use tracing::{debug, error, info};
 
 use crate::{
     cardano::start_followers,
-    db::{self, index::session::CassandraSession},
+    db::{self, event::EventDB, index::session::CassandraSession},
     service::{
         self,
         utilities::health::{
-            condition_for_started, is_live, live_counter_reset, service_has_started, set_to_started,
+            condition_for_started, is_live, live_counter_reset, service_has_started,
+            set_event_db_liveness, set_to_started,
         },
     },
     settings::{ServiceSettings, Settings},
@@ -54,7 +55,15 @@ impl Cli {
                 // Start the DB's.
                 CassandraSession::init();
 
-                db::event::establish_connection();
+                // Initialize Event DB connection pool
+                db::event::establish_connection_pool().await;
+                // Test that connection is available
+                if EventDB::connection_is_ok().await {
+                    set_event_db_liveness(true);
+                    debug!("Event DB is connected. Liveness set to true");
+                } else {
+                    error!("Event DB connection failed");
+                }
 
                 // Start the chain indexing follower.
                 start_followers().await?;