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

Author: emiride

Earthfile

@@ -1,8 +1,8 @@
 VERSION 0.8
 
-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
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.4.2 AS mdlint-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.4.2 AS cspell-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/postgresql:v3.4.2 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.4.0 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.4.2 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 = "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" }
+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" }
 
 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" }
@@ -45,7 +45,7 @@ tokio-postgres = { version = "0.7.12", features = [
     "with-chrono-0_4",
     "with-serde_json-1",
     "with-time-0_3",
-    "with-uuid-1"
+    "with-uuid-1",
 ] }
 tokio = { version = "1.41.0", features = ["rt", "macros", "rt-multi-thread"] }
 dotenvy = "0.15.7"
@@ -95,7 +95,10 @@ bytes = "1.9.0"
 mime = "0.3.17"
 stats_alloc = "0.1.10"
 memory-stats = "1.0.0"
-derive_more = { version = "2.0.1", default-features = false, features = ["from", "into"] }
+derive_more = { version = "2.0.1", default-features = false, features = [
+    "from",
+    "into",
+] }
 rayon = "1.10"
 x509-cert = "0.2.5"
 minicbor = { version = "0.25.1", features = ["alloc"] }

catalyst-gateway/bin/src/db/index/block/rbac509/insert_catalyst_id_for_stake_address.rs

@@ -3,7 +3,7 @@
 use std::{fmt::Debug, sync::Arc};
 
 use cardano_blockchain_types::{Slot, StakeAddress};
-use catalyst_types::id_uri::IdUri;
+use catalyst_types::catalyst_id::CatalystId;
 use scylla::{SerializeRow, Session};
 use tracing::error;
 
@@ -41,7 +41,7 @@ impl Debug for Params {
 
 impl Params {
     /// Create a new record for this transaction.
-    pub(crate) fn new(stake_address: StakeAddress, slot_no: Slot, catalyst_id: IdUri) -> Self {
+    pub(crate) fn new(stake_address: StakeAddress, slot_no: Slot, catalyst_id: CatalystId) -> Self {
         Params {
             stake_address: stake_address.into(),
             catalyst_id: catalyst_id.into(),

catalyst-gateway/bin/src/db/index/block/rbac509/insert_catalyst_id_for_txn_id.rs

@@ -3,7 +3,7 @@
 use std::{fmt::Debug, sync::Arc};
 
 use cardano_blockchain_types::TransactionId;
-use catalyst_types::id_uri::IdUri;
+use catalyst_types::catalyst_id::CatalystId;
 use scylla::{SerializeRow, Session};
 use tracing::error;
 
@@ -38,7 +38,7 @@ impl Debug for Params {
 
 impl Params {
     /// Creates a new record for this transaction.
-    pub(crate) fn new(catalyst_id: IdUri, txn_id: TransactionId) -> Self {
+    pub(crate) fn new(catalyst_id: CatalystId, txn_id: TransactionId) -> Self {
         Params {
             txn_id: txn_id.into(),
             catalyst_id: catalyst_id.into(),

catalyst-gateway/bin/src/db/index/block/rbac509/insert_rbac509.rs

@@ -3,7 +3,7 @@
 use std::{fmt::Debug, sync::Arc};
 
 use cardano_blockchain_types::{Slot, TransactionId, TxnIndex};
-use catalyst_types::{id_uri::IdUri, uuid::UuidV4};
+use catalyst_types::{catalyst_id::CatalystId, uuid::UuidV4};
 use scylla::{frame::value::MaybeUnset, SerializeRow, Session};
 use tracing::error;
 
@@ -55,7 +55,7 @@ impl Debug for Params {
 impl Params {
     /// Create a new record for this transaction.
     pub(crate) fn new(
-        catalyst_id: IdUri, txn_id: TransactionId, slot_no: Slot, txn_index: TxnIndex,
+        catalyst_id: CatalystId, txn_id: TransactionId, slot_no: Slot, txn_index: TxnIndex,
         purpose: UuidV4, prv_txn_id: Option<TransactionId>,
     ) -> Self {
         let prv_txn_id = prv_txn_id.map_or(MaybeUnset::Unset, |v| MaybeUnset::Set(v.into()));

catalyst-gateway/bin/src/db/index/block/rbac509/insert_rbac509_invalid.rs

@@ -3,7 +3,7 @@
 use std::{fmt::Debug, sync::Arc};
 
 use cardano_blockchain_types::{Slot, TransactionId, TxnIndex};
-use catalyst_types::{id_uri::IdUri, problem_report::ProblemReport, uuid::UuidV4};
+use catalyst_types::{catalyst_id::CatalystId, problem_report::ProblemReport, uuid::UuidV4};
 use scylla::{frame::value::MaybeUnset, SerializeRow, Session};
 use tracing::error;
 
@@ -40,7 +40,7 @@ pub(crate) struct Params {
 impl Params {
     /// Create a new record for this transaction.
     pub(crate) fn new(
-        catalyst_id: IdUri, txn_id: TransactionId, slot_no: Slot, txn_index: TxnIndex,
+        catalyst_id: CatalystId, txn_id: TransactionId, slot_no: Slot, txn_index: TxnIndex,
         purpose: Option<UuidV4>, prv_txn_id: Option<TransactionId>, report: &ProblemReport,
     ) -> Self {
         let purpose = purpose.map_or(MaybeUnset::Unset, |v| MaybeUnset::Set(v.into()));

catalyst-gateway/bin/src/db/index/block/rbac509/mod.rs

@@ -11,7 +11,7 @@ use anyhow::{bail, Context};
 use cardano_blockchain_types::{
     Cip0134Uri, MultiEraBlock, Slot, StakeAddress, TransactionId, TxnIndex,
 };
-use catalyst_types::id_uri::IdUri;
+use catalyst_types::catalyst_id::CatalystId;
 use pallas::ledger::addresses::Address;
 use rbac_registration::cardano::cip509::{Cip509, Cip509RbacMetadata};
 use scylla::Session;
@@ -214,7 +214,7 @@ impl Rbac509InsertQuery {
 async fn catalyst_id(
     session: &Arc<CassandraSession>, cip509: &Cip509, txn_id: TransactionId, slot: Slot,
     index: TxnIndex, is_immutable: bool,
-) -> anyhow::Result<IdUri> {
+) -> anyhow::Result<CatalystId> {
     use crate::db::index::queries::rbac::get_catalyst_id_from_transaction_id::cache_for_transaction_id;
 
     let id = match cip509.previous_transaction() {
@@ -235,7 +235,7 @@ async fn catalyst_id(
 /// Queries a Catalyst ID from the database by the given transaction ID.
 async fn query_catalyst_id(
     session: &Arc<CassandraSession>, txn_id: TransactionId, is_immutable: bool,
-) -> anyhow::Result<IdUri> {
+) -> anyhow::Result<CatalystId> {
     use crate::db::index::queries::rbac::get_catalyst_id_from_transaction_id::Query;
 
     if let Some(q) = Query::get_latest(session, txn_id.into())

catalyst-gateway/bin/src/db/index/queries/rbac/get_catalyst_id_from_transaction_id.rs

@@ -4,7 +4,7 @@ use std::sync::{Arc, LazyLock};
 
 use anyhow::{Context, Result};
 use cardano_blockchain_types::{Slot, TransactionId, TxnIndex};
-use catalyst_types::id_uri::IdUri;
+use catalyst_types::catalyst_id::CatalystId;
 use futures::StreamExt;
 use moka::{policy::EvictionPolicy, sync::Cache};
 use scylla::{
@@ -102,7 +102,7 @@ impl Query {
 
 /// Update the cache when a rbac registration is indexed.
 pub(crate) fn cache_for_transaction_id(
-    _transaction_id: TransactionId, _catalyst_id: IdUri, _slot_no: Slot, _txn_idx: TxnIndex,
+    _transaction_id: TransactionId, _catalyst_id: CatalystId, _slot_no: Slot, _txn_idx: TxnIndex,
 ) {
     // TODO: Caching is disabled because we want to measure the performance without it and
     // be sure that the logic is sound. Also caches needs to be tunable.

catalyst-gateway/bin/src/db/index/queries/rbac/get_rbac_registrations.rs

@@ -5,7 +5,7 @@ use std::sync::Arc;
 use anyhow::Context;
 use cardano_blockchain_types::{Network, Point, Slot, TxnIndex};
 use cardano_chain_follower::ChainFollower;
-use catalyst_signed_doc::IdUri;
+use catalyst_signed_doc::CatalystId;
 use futures::{TryFutureExt, TryStreamExt};
 use rbac_registration::{cardano::cip509::Cip509, registration::cardano::RegistrationChain};
 use scylla::{
@@ -36,6 +36,7 @@ pub(crate) struct QueryParams {
 #[derive(DeserializeRow, Clone)]
 pub(crate) struct Query {
     /// Registration transaction id.
+    #[allow(dead_code)]
     pub txn_id: DbTransactionId,
     /// A block slot number.
     pub slot_no: DbSlot,
@@ -72,8 +73,8 @@ impl Query {
 
 /// Returns a sorted list of all registrations for the given Catalyst ID from the
 /// database.
-async fn indexed_registrations(
-    session: &CassandraSession, catalyst_id: &IdUri,
+pub(crate) async fn indexed_registrations(
+    session: &CassandraSession, catalyst_id: &CatalystId,
 ) -> anyhow::Result<Vec<Query>> {
     let mut result: Vec<_> = Query::execute(session, QueryParams {
         catalyst_id: catalyst_id.clone().into(),
@@ -86,33 +87,40 @@ async fn indexed_registrations(
 }
 
 /// Build a registration chain from the given indexed data.
-pub(crate) async fn build_reg_chain(
-    session: &CassandraSession, catalyst_id: &IdUri, network: Network,
+///
+/// # NOTE: provided `reg_queries` must be sorted by `slot_no`, look into `indexed_registrations` function.
+pub(crate) async fn build_reg_chain<OnSuccessFn: FnMut(bool, Slot, &RegistrationChain)>(
+    mut reg_queries_iter: impl Iterator<Item = (bool, Query)>, network: Network,
+    mut on_success: OnSuccessFn,
 ) -> anyhow::Result<Option<RegistrationChain>> {
-    let regs = indexed_registrations(session, catalyst_id).await?;
-    let mut regs_iter = regs.iter();
-    let Some(root) = regs_iter.next() else {
+    let Some((is_persistent, root)) = reg_queries_iter.next() else {
         return Ok(None);
     };
 
-    let root = registration(network, root.slot_no.into(), root.txn_index.into())
+    let slot_no = root.slot_no.into();
+    let root = load_cip509_from_chain(network, root.slot_no.into(), root.txn_index.into())
         .await
         .context("Failed to get root registration")?;
-    let mut chain = RegistrationChain::new(root).context("Invalid root registration")?;
+    let mut chain = RegistrationChain::new(&root).context("Invalid root registration")?;
+    on_success(is_persistent, slot_no, &chain);
 
-    for reg in regs_iter {
+    for (is_persistent, reg) in reg_queries_iter {
         // We only store valid registrations in this table, so an error here indicates a bug in
         // our indexing logic.
-        let cip509 = registration(network, reg.slot_no.into(), reg.txn_index.into())
+        let slot_no = reg.slot_no.into();
+        let cip509 = load_cip509_from_chain(network, reg.slot_no.into(), reg.txn_index.into())
             .await
             .with_context(|| {
                 format!(
                     "Invalid or missing registration at {:?} block {:?} transaction",
                     reg.slot_no, reg.txn_index,
                 )
             })?;
-        match chain.update(cip509) {
-            Ok(c) => chain = c,
+        match chain.update(&cip509) {
+            Ok(c) => {
+                chain = c;
+                on_success(is_persistent, slot_no, &chain);
+            },
             Err(e) => {
                 // This isn't a hard error because while the individual registration can be valid it
                 // can be invalid in the context of the whole registration chain.
@@ -127,8 +135,9 @@ pub(crate) async fn build_reg_chain(
     Ok(Some(chain))
 }
 
-/// A helper function to return a RBAC registration from the given block and slot.
-pub(crate) async fn registration(
+/// A helper function to load a RBAC registration `Cip509` by the given block and slot
+/// from the `cardano-chain-follower`.
+pub(crate) async fn load_cip509_from_chain(
     network: Network, slot: Slot, txn_index: TxnIndex,
 ) -> anyhow::Result<Cip509> {
     let point = Point::fuzzy(slot);