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

# Conflicts:
#	catalyst_voices/apps/voices/lib/widgets/modals/proposals/create_new_proposal_category_selection.dart
#	catalyst_voices/packages/internal/catalyst_voices_blocs/lib/src/category/category_detail_cubit.dart

Author: dt-iohk

catalyst-gateway/bin/Cargo.toml

@@ -15,12 +15,12 @@ repository.workspace = true
 workspace = true
 
 [dependencies]
-cardano-chain-follower = { version = "0.0.15", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cardano-chain-follower/v0.0.15" }
-rbac-registration = { version = "0.0.11", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "rbac-registration/v0.0.11" }
-catalyst-signed-doc = { version = "0.0.8", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-signed-doc/v0.0.8" }
+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" }
 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.8", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.8" }
+catalyst-types = { version = "0.0.9", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-types/v0.0.9" }
 
 clap = { version = "4.5.20", features = ["derive", "env"] }
 tracing = { version = "0.1.40", features = ["log"] }

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

@@ -33,10 +33,10 @@ pub(crate) const INDEXING_DB_READY_WAIT_INTERVAL: Duration = Duration::from_secs
 
 /// Start syncing a particular network
 async fn start_sync_for(cfg: &chain_follower::EnvVars) -> anyhow::Result<()> {
-    let chain = cfg.chain;
+    let chain = &cfg.chain;
     let dl_config = cfg.dl_config.clone();
 
-    let mut cfg = ChainSyncConfig::default_for(chain);
+    let mut cfg = ChainSyncConfig::default_for(chain.clone());
     cfg.mithril_cfg = cfg.mithril_cfg.with_dl_config(dl_config);
     info!(chain = %chain, "Starting Chain Sync Task");
 
@@ -263,9 +263,9 @@ fn sync_subchain(
         let mut blocks_synced = 0u64;
 
         let mut follower =
-            ChainFollower::new(params.chain, params.actual_start(), params.end.clone()).await;
+            ChainFollower::new(&params.chain, params.actual_start(), params.end.clone()).await;
         while let Some(chain_update) = follower.next().await {
-            let tips = ChainFollower::get_tips(params.chain).await;
+            let tips = ChainFollower::get_tips(&params.chain).await;
             let immutable_slot = tips.0.slot_or_default();
             let live_slot = tips.1.slot_or_default();
             metrics_updater::current_tip_slot(live_slot, immutable_slot);
@@ -495,7 +495,7 @@ impl SyncTask {
     async fn run(&mut self) {
         // We can't sync until the local chain data is synced.
         // This call will wait until we sync.
-        let tips = ChainFollower::get_tips(self.cfg.chain).await;
+        let tips = ChainFollower::get_tips(&self.cfg.chain).await;
         self.immutable_tip_slot = tips.0.slot_or_default();
         self.live_tip_slot = tips.1.slot_or_default();
         info!(chain=%self.cfg.chain, immutable_tip=?self.immutable_tip_slot, live_tip=?self.live_tip_slot, "Running the primary blockchain follower task.");
@@ -516,7 +516,7 @@ impl SyncTask {
         // Start the Live Chain sync task - This can never end because it is syncing to TIP.
         // So, if it fails, it will automatically be restarted.
         self.add_sync_task(SyncParams::new(
-            self.cfg.chain,
+            self.cfg.chain.clone(),
             Point::fuzzy(self.immutable_tip_slot),
             Point::TIP,
         ));
@@ -542,7 +542,7 @@ impl SyncTask {
 
             match completed {
                 Ok(finished) => {
-                    let tips = ChainFollower::get_tips(self.cfg.chain).await;
+                    let tips = ChainFollower::get_tips(&self.cfg.chain).await;
                     let immutable_tip_slot = tips.0.slot_or_default();
                     let live_tip_slot = tips.1.slot_or_default();
                     info!(immutable_tip_slot=?immutable_tip_slot, live_tip_slot=?live_tip_slot, "Chain Indexer task finished");
@@ -672,7 +672,7 @@ impl SyncTask {
                     self.get_syncable_range(self.start_slot, end_slot)
                 {
                     self.add_sync_task(SyncParams::new(
-                        self.cfg.chain,
+                        self.cfg.chain.clone(),
                         first_point,
                         last_point.clone(),
                     ));

catalyst-gateway/bin/src/db/index/block/certs.rs

@@ -187,15 +187,15 @@ impl CertInsertQuery {
     ) {
         let (stake_address, pubkey, script) = match *cred {
             conway::StakeCredential::AddrKeyhash(cred) => {
-                let stake_address = StakeAddress::new(block.network(), false, cred.into());
+                let stake_address = StakeAddress::new(block.network().clone(), false, cred.into());
                 let addr = block.witness_for_tx(&VKeyHash::from(*cred), txn);
                 // Note: it is totally possible for the Registration Certificate to not be
                 // witnessed.
                 (stake_address, addr, false)
             },
             conway::StakeCredential::ScriptHash(h) => {
                 (
-                    StakeAddress::new(block.network(), true, h.into()),
+                    StakeAddress::new(block.network().clone(), true, h.into()),
                     None,
                     true,
                 )

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

@@ -85,7 +85,8 @@ impl Cip36InsertQuery {
                     "Valid CIP36 registration must have one stake public key"
                 ))?;
                 let stake_pk_hash = Blake2b224Hash::new(&stake_pk.to_bytes());
-                let stake_address = StakeAddress::new(block.network(), false, stake_pk_hash);
+                let stake_address =
+                    StakeAddress::new(block.network().clone(), false, stake_pk_hash);
 
                 self.registrations.push(insert_cip36::Params::new(
                     voting_key, slot_no, index, &cip36,
@@ -131,7 +132,8 @@ impl Cip36InsertQuery {
                     }
 
                     let stake_pk_hash = Blake2b224Hash::new(&stake_pk.to_bytes());
-                    let stake_address = StakeAddress::new(block.network(), false, stake_pk_hash);
+                    let stake_address =
+                        StakeAddress::new(block.network().clone(), false, stake_pk_hash);
                     self.stake_regs
                         .push(certs::StakeRegistrationInsertQuery::new(
                             stake_address,

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

@@ -77,7 +77,7 @@ impl TxoInsertQuery {
     /// stake address, and still have a primary key on the table. Otherwise return the
     /// header and the stake key hash as a vec of 29 bytes.
     fn extract_stake_address(
-        network: Network,
+        network: &Network,
         txo: &cardano_chain_follower::pallas_traverse::MultiEraOutput<'_>,
         slot_no: Slot,
         txn_id: &str,
@@ -101,10 +101,10 @@ impl TxoInsertQuery {
 
                         let address = match address.delegation() {
                             cardano_chain_follower::pallas_addresses::ShelleyDelegationPart::Script(hash) => {
-                                Some(StakeAddress::new(network, true, (*hash).into()))
+                                Some(StakeAddress::new(network.clone(), true, (*hash).into()))
                             },
                             cardano_chain_follower::pallas_addresses::ShelleyDelegationPart::Key(hash) => {
-                                Some(StakeAddress::new(network, false, (*hash).into()))
+                                Some(StakeAddress::new(network.clone(), false, (*hash).into()))
                             },
                             cardano_chain_follower::pallas_addresses::ShelleyDelegationPart::Pointer(_pointer) => {
                                 // These are not supported from Conway, so we don't support them
@@ -140,7 +140,7 @@ impl TxoInsertQuery {
     /// Index the transaction Inputs.
     pub(crate) fn index(
         &mut self,
-        network: Network,
+        network: &Network,
         txn: &cardano_chain_follower::pallas_traverse::MultiEraTx<'_>,
         slot_no: Slot,
         txn_hash: TransactionId,

catalyst-gateway/bin/src/db/index/schema/mod.rs

@@ -165,7 +165,7 @@ fn generate_cql_schema_version() -> String {
 /// Get the namespace for a particular db configuration
 pub(crate) fn namespace(
     persistent: bool,
-    network: Network,
+    network: &Network,
 ) -> String {
     // Build and set the Keyspace to use.
     let namespace = if persistent { "p" } else { "v" };
@@ -181,7 +181,7 @@ async fn create_namespace(
     session: &mut Arc<Session>,
     cfg: &cassandra_db::EnvVars,
     persistent: bool,
-    network: Network,
+    network: &Network,
 ) -> anyhow::Result<()> {
     let keyspace = namespace(persistent, network);
 
@@ -222,7 +222,7 @@ pub(crate) async fn create_schema(
     session: &mut Arc<Session>,
     cfg: &cassandra_db::EnvVars,
     persistent: bool,
-    network: Network,
+    network: &Network,
 ) -> anyhow::Result<()> {
     create_namespace(session, cfg, persistent, network)
         .await
@@ -290,7 +290,7 @@ mod tests {
     fn test_namespace_persistent() {
         let network = Network::Preprod;
         let persistent = true;
-        let namespace = namespace(persistent, network);
+        let namespace = namespace(persistent, &network);
         let schema_version = generate_cql_schema_version().replace('-', "_");
         let expected = format!("p_{network}_{schema_version}");
         assert_eq!(namespace, expected);
@@ -300,7 +300,7 @@ mod tests {
     fn test_namespace_volatile() {
         let network = Network::Preprod;
         let persistent = false;
-        let namespace = namespace(persistent, network);
+        let namespace = namespace(persistent, &network);
         let schema_version = generate_cql_schema_version().replace('-', "_");
         let expected = format!("v_{network}_{schema_version}");
         assert_eq!(namespace, expected);

catalyst-gateway/bin/src/db/index/session/mod.rs

@@ -399,7 +399,7 @@ async fn make_session(cfg: &cassandra_db::EnvVars) -> anyhow::Result<Arc<Session
 /// Display reasonable logs to help diagnose DB connection issues.
 async fn retry_init(
     cfg: cassandra_db::EnvVars,
-    network: Network,
+    network: &Network,
     persistent: bool,
 ) {
     let mut retry_delay = Duration::from_secs(0);

catalyst-gateway/bin/src/metrics/chain_follower/mod.rs

@@ -24,7 +24,7 @@ fn report_mithril(
     stats: &Statistics,
     api_host_names: &str,
     service_id: &str,
-    network: Network,
+    network: &Network,
 ) {
     let stats = &stats.mithril;
     let network = network.to_string();
@@ -109,7 +109,7 @@ fn report_live(
     stats: &Statistics,
     api_host_names: &str,
     service_id: &str,
-    network: Network,
+    network: &Network,
 ) {
     let stats = &stats.live;
     let network = network.to_string();

catalyst-gateway/bin/src/rbac/get_chain.rs

@@ -23,15 +23,13 @@ use crate::{
 /// Returns the latest (including the volatile part) registration chain by the given
 /// Catalyst ID.
 pub async fn latest_rbac_chain(id: &CatalystId) -> Result<Option<ChainInfo>> {
-    let id = id.as_short_id();
-
     let volatile_session =
         CassandraSession::get(false).context("Failed to get volatile Cassandra session")?;
     // Get the persistent part of the chain and volatile registrations. Both of these parts
     // can be non-existing.
     let (chain, volatile_regs) = try_join(
-        persistent_rbac_chain(&id),
-        indexed_regs(&volatile_session, &id),
+        persistent_rbac_chain(id),
+        indexed_regs(&volatile_session, id),
     )
     .await?;
 
@@ -70,14 +68,11 @@ pub async fn latest_rbac_chain(id: &CatalystId) -> Result<Option<ChainInfo>> {
 /// Returns only the persistent part of a registration chain by the given Catalyst ID.
 pub async fn persistent_rbac_chain(id: &CatalystId) -> Result<Option<RegistrationChain>> {
     let session = CassandraSession::get(true).context("Failed to get Cassandra session")?;
-
-    let id = id.as_short_id();
-
-    if let Some(chain) = cached_persistent_rbac_chain(&session, &id) {
+    if let Some(chain) = cached_persistent_rbac_chain(&session, id) {
         return Ok(Some(chain));
     }
 
-    let regs = indexed_regs(&session, &id).await?;
+    let regs = indexed_regs(&session, id).await?;
     let chain = build_rbac_chain(regs).await?.inspect(|c| {
         cache_persistent_rbac_chain(id.clone(), c.clone());
     });
@@ -145,7 +140,7 @@ pub async fn apply_regs(
 
 /// Loads and parses a `Cip509` registration from a block using chain follower.
 async fn cip509(
-    network: Network,
+    network: &Network,
     slot: Slot,
     txn_index: TxnIndex,
 ) -> Result<Cip509> {

catalyst-gateway/bin/src/service/api/cardano/staking/assets_get.rs

@@ -91,7 +91,7 @@ async fn build_full_stake_info_response(
     slot_num: Option<SlotNo>,
 ) -> anyhow::Result<Option<FullStakeInfo>> {
     if let Some(provided_network) = provided_network {
-        if cardano_chain_follower::Network::from(provided_network) != Settings::cardano_network() {
+        if &cardano_chain_follower::Network::from(provided_network) != Settings::cardano_network() {
             return Ok(None);
         }
     }