Merge branch 'main' into feat/sync-with-gateway-v2-endpoints-3362

# Conflicts:
#	catalyst_voices/Earthfile

Author: dt-iohk

.config/dictionaries/project.dic

@@ -151,6 +151,7 @@ headful
 headlessui
 healthz
 HIDPI
+hotfixes
 hotspots
 httpx
 icudtl
@@ -310,8 +311,8 @@ ripgrep
 ristretto
 rlib
 rngs
-rolname
 rollouts
+rolname
 RPATH
 ruleset
 rustc
@@ -428,4 +429,4 @@ xprv
 xpub
 xpublic
 xvfb
-yoroi
+yoroi

.github/workflows/ci.yml

@@ -18,14 +18,14 @@ permissions:
 
 jobs:
   paths-filter:
-    if: ${{ github.event.pull_request }}
     runs-on: ubuntu-latest
     outputs:
       catalyst-gateway: ${{ steps.filter.outputs.catalyst-gateway }}
       catalyst-voices: ${{ steps.filter.outputs.catalyst-voices }}
       docs: ${{ steps.filter.outputs.docs }}
       not-only-docs: ${{ steps.filter.outputs.not-only-docs }}
     steps:
+      - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v3
         id: filter
         with:
@@ -67,7 +67,7 @@ jobs:
       forge_version: 0.21.0
 
   ci:
-    if: ${{ !github.event.pull_request.draft && needs.paths-filter.outputs.not-only-docs == 'true' }}
+    if: ${{ (!github.event.pull_request.draft && needs.paths-filter.outputs.not-only-docs == 'true') || startsWith(github.ref, 'refs/tags/') }}
     needs: [reject, paths-filter]
     uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@ci/v1.10.0
     with:

Earthfile

@@ -1,8 +1,8 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.5.28 AS mdlint-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.5.28 AS cspell-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.5.28 AS postgresql-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.6.1 AS mdlint-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.6.1 AS cspell-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.6.1 AS postgresql-ci
 
 ARG --global REGISTRY="harbor.shared-services.projectcatalyst.io/dockerhub/library"
 FROM ${REGISTRY}/debian:stable-slim

catalyst-gateway/Cargo.toml

@@ -1,11 +1,11 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
     "bin",
 ]
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 version = "0.0.1"
 authors = [
     "Steven Johnson <[email protected]>"

catalyst-gateway/Earthfile

@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.5.28 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.6.1 AS rust-ci
 IMPORT ../ AS repo-ci
 IMPORT github.com/input-output-hk/catalyst-voices/catalyst-gateway:main AS cat-gateway-main
 

catalyst-gateway/bin/Cargo.toml

@@ -15,12 +15,12 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-cardano-chain-follower = { version = "0.0.17", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cardano-chain-follower/v0.0.17" }
-rbac-registration = { version = "0.0.13", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "rbac-registration/v0.0.13" }
-catalyst-signed-doc = { version = "0.0.9", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-signed-doc/v0.0.9" }
+cardano-chain-follower = { version = "0.0.18", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cardano-chain-follower/v0.0.18" }
+rbac-registration = { version = "0.0.14", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "rbac-registration/v0.0.14" }
+catalyst-signed-doc = { version = "0.0.10", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-signed-doc/v0.0.10" }
 catalyst-signed-doc-v1 = { package = "catalyst-signed-doc", version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-signed-doc/v.0.0.4" }
 c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "c509-certificate-v0.0.3" }
-catalyst-types = { version = "0.0.9", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.9" }
+catalyst-types = { version = "0.0.10", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.10" }
 
 clap = { version = "4.5.20", features = ["derive", "env"] }
 tracing = { version = "0.1.40", features = ["log"] }

catalyst-gateway/bin/src/build_info.rs

@@ -48,15 +48,15 @@ pub(crate) fn log_build_info() {
     let mut branch = "Unknown".to_string();
     let mut tags = "Unknown".to_string();
 
-    if let Some(ref vc) = info.version_control {
-        if let Some(git) = vc.git() {
-            commit_id.clone_from(&git.commit_short_id);
-            commit_timestamp = git.commit_timestamp.to_rfc3339();
-            if let Some(git_branch) = git.branch.clone() {
-                branch = git_branch;
-            }
-            tags = git.tags.join(",");
+    if let Some(ref vc) = info.version_control
+        && let Some(git) = vc.git()
+    {
+        commit_id.clone_from(&git.commit_short_id);
+        commit_timestamp = git.commit_timestamp.to_rfc3339();
+        if let Some(git_branch) = git.branch.clone() {
+            branch = git_branch;
         }
+        tags = git.tags.join(",");
     }
 
     let ipv4 = utilities::net::get_public_ipv4().to_string();
@@ -65,15 +65,15 @@ pub(crate) fn log_build_info() {
     let mut interfaces: String = "Unknown".to_string();
 
     // Get local IP address v4 and v6
-    if let Ok(network_interfaces) = list_afinet_netifas() {
-        if !network_interfaces.is_empty() {
-            interfaces.clear();
-            for iface in network_interfaces {
-                if !interfaces.is_empty() {
-                    interfaces.push(',');
-                }
-                let _ = write!(interfaces, "{}:{}", iface.0, iface.1);
+    if let Ok(network_interfaces) = list_afinet_netifas()
+        && !network_interfaces.is_empty()
+    {
+        interfaces.clear();
+        for iface in network_interfaces {
+            if !interfaces.is_empty() {
+                interfaces.push(',');
             }
+            let _ = write!(interfaces, "{}:{}", iface.0, iface.1);
         }
     }
 

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

@@ -4,7 +4,7 @@ use std::{collections::BTreeSet, fmt::Display, sync::Arc, time::Duration};
 
 use cardano_chain_follower::{ChainFollower, ChainSyncConfig, MultiEraBlock, Network, Point, Slot};
 use duration_string::DurationString;
-use futures::{stream::FuturesUnordered, StreamExt};
+use futures::{StreamExt, stream::FuturesUnordered};
 use rand::{Rng, SeedableRng};
 use tokio::sync::watch;
 use tracing::{debug, error, info};
@@ -16,7 +16,7 @@ use crate::{
             roll_forward::{self, PurgeCondition},
         },
         queries::sync_status::{
-            get::{get_sync_status, SyncStatus},
+            get::{SyncStatus, get_sync_status},
             update::update_sync_status,
         },
         session::CassandraSession,
@@ -25,7 +25,7 @@ use crate::{
     service::utilities::health::{
         set_follower_immutable_first_reached_tip, set_follower_live_first_reached_tip,
     },
-    settings::{chain_follower, Settings},
+    settings::{Settings, chain_follower},
 };
 
 /// How long we wait between checks for connection to the indexing DB to be ready.

catalyst-gateway/bin/src/db/event/common/eq_or_ranged_uuid.rs

@@ -1,8 +1,8 @@
 //! `EqOrRangedUuid` query conditional stmt object.
 
-/// Search either by a singe UUID, or a Range of UUIDs
+/// Search either by a singe UUID, a range of UUIDs or a list of UUIDs.
 #[derive(Clone, Debug, PartialEq)]
-pub(crate) enum EqOrRangedUuid {
+pub(crate) enum UuidSelector {
     /// Search by the exact UUID
     Eq(uuid::Uuid),
     /// Search in this UUID's range
@@ -12,9 +12,11 @@ pub(crate) enum EqOrRangedUuid {
         /// Maximum UUID to find (inclusive)
         max: uuid::Uuid,
     },
+    /// Search UUIDs in the given list.
+    In(Vec<uuid::Uuid>),
 }
 
-impl EqOrRangedUuid {
+impl UuidSelector {
     /// Return a sql conditional statement by the provided `table_field`
     pub(crate) fn conditional_stmt(
         &self,
@@ -25,6 +27,13 @@ impl EqOrRangedUuid {
             Self::Range { min, max } => {
                 format!("{table_field} >= '{min}' AND {table_field} <= '{max}'")
             },
+            Self::In(ids) => {
+                itertools::intersperse(
+                    ids.iter().map(|id| format!("{table_field} = '{id}'")),
+                    " OR ".to_string(),
+                )
+                .collect()
+            },
         }
     }
 }

catalyst-gateway/bin/src/db/event/mod.rs

@@ -2,17 +2,17 @@
 use std::{
     str::FromStr,
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc, LazyLock, Mutex, OnceLock,
+        atomic::{AtomicBool, Ordering},
     },
     time::Duration,
 };
 
 use error::NotFoundError;
 use futures::{Stream, StreamExt, TryStreamExt};
 use tokio::task::JoinHandle;
-use tokio_postgres::{types::ToSql, Row};
-use tracing::{debug, debug_span, error, info, Instrument};
+use tokio_postgres::{Row, types::ToSql};
+use tracing::{Instrument, debug, debug_span, error, info};
 
 use crate::{
     service::utilities::health::{event_db_is_live, set_event_db_liveness},
@@ -58,8 +58,8 @@ pub(crate) enum EventDBConnectionError {
 
 impl EventDB {
     /// Get a connection from the pool.
-    async fn get_pool_connection(
-    ) -> Result<deadpool::managed::Object<deadpool_postgres::Manager>, EventDBConnectionError> {
+    async fn get_pool_connection()
+    -> Result<deadpool::managed::Object<deadpool_postgres::Manager>, EventDBConnectionError> {
         let pool = EVENT_DB_POOL
             .get()
             .ok_or(EventDBConnectionError::DbPoolUninitialized)?;
@@ -127,7 +127,7 @@ impl EventDB {
     pub(crate) async fn query_stream(
         stmt: &str,
         params: &[&(dyn ToSql + Sync)],
-    ) -> anyhow::Result<impl Stream<Item = anyhow::Result<Row>>> {
+    ) -> anyhow::Result<impl Stream<Item = anyhow::Result<Row>> + use<>> {
         if Self::is_deep_query_enabled() {
             Self::explain_analyze_rollback(stmt, params).await?;
         }