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

Author: emiride

.config/dictionaries/project.dic

@@ -137,6 +137,7 @@ IDHI
 IDLO
 ilap
 IMEI
+inappwebview
 insertable
 Instantitation
 integ

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 = "r20250413-00" }
-rbac-registration = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250413-00" }
-catalyst-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250413-00" }
-cardano-blockchain-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250413-00" }
-catalyst-signed-doc = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250413-00" }
-c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250413-00" }
+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" }
 
 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" }
@@ -49,7 +49,7 @@ tokio-postgres = { version = "0.7.12", features = [
 ] }
 tokio = { version = "1.41.0", features = ["rt", "macros", "rt-multi-thread"] }
 dotenvy = "0.15.7"
-local-ip-address = "0.6.3"
+local-ip-address = "=0.6.3"
 gethostname = "0.5.0"
 hex = "0.4.3"
 handlebars = "6.2.0"

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

@@ -590,6 +590,7 @@ impl SyncTask {
                 let purge_to_slot =
                     self.immutable_tip_slot - Settings::purge_backward_slot_buffer();
                 let purge_condition = PurgeCondition::PurgeBackwards(purge_to_slot);
+                info!(chain=%self.cfg.chain, purge_to_slot=?purge_to_slot, "Backwards purging volatile data.");
                 if let Err(error) = roll_forward::purge_live_index(purge_condition).await {
                     error!(chain=%self.cfg.chain, error=%error, "BUG: Purging volatile data task failed.");
                 } else {

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

@@ -33,7 +33,6 @@ pub(crate) struct QueryParams {
 }
 
 /// Get registrations by Catalyst ID query.
-#[allow(dead_code)]
 #[derive(DeserializeRow, Clone)]
 pub(crate) struct Query {
     /// Registration transaction id.
@@ -45,6 +44,7 @@ pub(crate) struct Query {
     /// A previous  transaction id.
     pub prv_txn_id: Option<DbTransactionId>,
     /// A registration purpose.
+    #[allow(dead_code)]
     pub purpose: DbUuidV4,
 }
 
@@ -128,19 +128,28 @@ pub(crate) async fn build_reg_chain(
 }
 
 /// A helper function to return a RBAC registration from the given block and slot.
-async fn registration(network: Network, slot: Slot, txn_index: TxnIndex) -> anyhow::Result<Cip509> {
+pub(crate) async fn registration(
+    network: Network, slot: Slot, txn_index: TxnIndex,
+) -> anyhow::Result<Cip509> {
     let point = Point::fuzzy(slot);
     let block = ChainFollower::get_block(network, point)
         .await
         .context("Unable to get block")?
         .data;
     if block.point().slot_or_default() != slot {
-        // The `ChainFollower::get_block` function can return the next consecutive block if
-        // it cannot find the exact one. This shouldn't happen, but we need
-        // to check anyway.
-        return Err(anyhow::anyhow!("Unable to find exact block"));
+        // The `ChainFollower::get_block` function can return the next consecutive block if it
+        // cannot find the exact one. This shouldn't happen, but we need to check anyway.
+        anyhow::bail!(
+            "Unable to find exact {slot:?} block. Found block slot {:?}",
+            block.point().slot_or_default()
+        );
     }
+    // We perform validation during indexing, so this normally should never fail.
     Cip509::new(&block, txn_index, &[])
-        .context("Invalid RBAC registration")?
-        .context("No RBAC registration at this block and txn index")
+        .with_context(|| {
+            format!("Invalid RBAC registration, slot = {slot:?}, transaction index = {txn_index:?}")
+        })?
+        .with_context(|| {
+            format!("No RBAC registration, slot = {slot:?}, transaction index = {txn_index:?}")
+        })
 }

catalyst-gateway/bin/src/service/api/cardano/cip36/mod.rs

@@ -1,12 +1,11 @@
 //! CIP36 Registration Endpoints
 
-use poem::http::HeaderMap;
-use poem_openapi::{param::Query, payload::Json, OpenApi};
-use response::Cip36RegistrationUnprocessableContent;
+use poem_openapi::{param::Query, OpenApi};
 
-use self::{cardano::slot_no::SlotNo, common::auth::none::NoAuthorization};
+use self::cardano::slot_no::SlotNo;
 use crate::service::common::{
     self,
+    auth::api_key::InternalApiKeyAuthorization,
     tags::ApiTags,
     types::cardano::{self},
 };
@@ -40,32 +39,16 @@ impl Api {
     #[oai(
         path = "/v1/cardano/registration/cip36",
         method = "get",
-        operation_id = "cardanoRegistrationCip36"
+        operation_id = "cardanoRegistrationCip36",
+        hidden = true
     )]
     async fn get_registration(
         &self, lookup: Query<Option<cardano::query::stake_or_voter::StakeOrVoter>>,
         asat: Query<Option<cardano::query::AsAt>>,
         page: Query<Option<common::types::generic::query::pagination::Page>>,
         limit: Query<Option<common::types::generic::query::pagination::Limit>>,
-        /// Headers, used if the query is requesting ALL to determine if the secret API
-        /// Key is also defined.
-        headers: &HeaderMap,
-        _auth: NoAuthorization,
+        _auth: InternalApiKeyAuthorization,
     ) -> response::AllRegistration {
-        // Special validation for the `lookup` parameter.
-        // If the parameter is ALL, BUT we do not have a valid API Key, just report the parameter
-        // is invalid.
-        if let Some(lookup) = lookup.0.clone() {
-            if lookup.is_all(headers).is_err() {
-                return response::Cip36Registration::UnprocessableContent(Json(
-                    Cip36RegistrationUnprocessableContent::new(
-                        "Invalid Stake Address or Voter key",
-                    ),
-                ))
-                .into();
-            }
-        }
-
         endpoint::cip36_registrations(
             lookup.0,
             SlotNo::into_option(asat.0),

catalyst-gateway/bin/src/service/api/cardano/cip36/response.rs

@@ -22,9 +22,6 @@ pub(crate) enum Cip36Registration {
     /// No valid registration.
     #[oai(status = 404)]
     NotFound,
-    /// Response for unprocessable content.
-    #[oai(status = 422)]
-    UnprocessableContent(Json<Cip36RegistrationUnprocessableContent>),
 }
 
 /// All responses to a cip36 registration query
@@ -199,26 +196,3 @@ impl Cip36Details {
         }
     }
 }
-
-/// Cip36 Registration Validation Error.
-#[derive(Object)]
-#[oai(example = true)]
-pub(crate) struct Cip36RegistrationUnprocessableContent {
-    /// Error messages.
-    error: common::types::generic::error_msg::ErrorMessage,
-}
-
-impl Cip36RegistrationUnprocessableContent {
-    /// Create a new instance of `Cip36RegistrationUnprocessableContent`.
-    pub(crate) fn new(error: &(impl ToString + ?Sized)) -> Self {
-        Self {
-            error: error.to_string().into(),
-        }
-    }
-}
-
-impl Example for Cip36RegistrationUnprocessableContent {
-    fn example() -> Self {
-        Self::new("Cip36 Registration in request body")
-    }
-}

catalyst-gateway/bin/src/service/api/cardano/rbac/registrations_get/chain_info.rs

@@ -2,16 +2,15 @@
 
 // cspell: words rposition
 
-use anyhow::{bail, Context};
-use cardano_blockchain_types::{Network, Point, Slot, TransactionId, TxnIndex};
-use cardano_chain_follower::ChainFollower;
+use anyhow::Context;
+use cardano_blockchain_types::{Slot, TransactionId};
 use catalyst_types::id_uri::IdUri;
 use futures::{future::try_join, TryFutureExt, TryStreamExt};
-use rbac_registration::{cardano::cip509::Cip509, registration::cardano::RegistrationChain};
+use rbac_registration::registration::cardano::RegistrationChain;
 
 use crate::{
     db::index::{
-        queries::rbac::get_rbac_registrations::{Query, QueryParams},
+        queries::rbac::get_rbac_registrations::{registration, Query, QueryParams},
         session::CassandraSession,
     },
     settings::Settings,
@@ -134,28 +133,6 @@ async fn indexed_registrations(
     Ok(result)
 }
 
-/// Returns a RBAC registration from the given block and slot.
-async fn registration(network: Network, slot: Slot, txn_index: TxnIndex) -> anyhow::Result<Cip509> {
-    let point = Point::fuzzy(slot);
-    let block = ChainFollower::get_block(network, point)
-        .await
-        .with_context(|| format!("Unable to get {slot:?} block"))?
-        .data;
-    if block.point().slot_or_default() != slot {
-        // The `ChainFollower::get_block` function can return the next consecutive block if it
-        // cannot find the exact one. This shouldn't happen, but we need to check anyway.
-        bail!("Unable to find exact {slot:?} block");
-    }
-    // We perform validation during indexing, so this normally should never fail.
-    Cip509::new(&block, txn_index, &[])
-        .with_context(|| {
-            format!("Invalid RBAC registration, slot = {slot:?}, transaction index = {txn_index:?}")
-        })?
-        .with_context(|| {
-            format!("No RBAC registration, slot = {slot:?}, transaction index = {txn_index:?}")
-        })
-}
-
 /// Updates the values depending on if the given registration is persistent or not.
 fn update_values(
     is_persistent: bool, reg: &Query, last_persistent_txn: &mut Option<TransactionId>,

catalyst-gateway/bin/src/service/api/config/mod.rs

@@ -14,7 +14,7 @@ use tracing::error;
 use crate::{
     db::event::config::{key::ConfigKey, Config},
     service::common::{
-        auth::{none_or_rbac::NoneOrRBAC, rbac::scheme::CatalystRBACSecurityScheme},
+        auth::{api_key::InternalApiKeyAuthorization, none_or_rbac::NoneOrRBAC},
         objects::config::{frontend_config::FrontendConfig, ConfigUnprocessableContent},
         responses::WithErrorResponses,
         tags::ApiTags,
@@ -159,14 +159,15 @@ impl ConfigApi {
     #[oai(
         path = "/draft/config/frontend",
         method = "put",
-        operation_id = "put_config_frontend"
+        operation_id = "put_config_frontend",
+        hidden = true
     )]
     async fn put_frontend(
         &self,
         /// *OPTIONAL* The IP Address to set the configuration for.
         #[oai(name = "IP")]
         ip_query: Query<Option<IpAddr>>,
-        _auth: CatalystRBACSecurityScheme, body: Json<FrontendConfig>,
+        body: Json<FrontendConfig>, _auth: InternalApiKeyAuthorization,
     ) -> SetConfigAllResponses {
         let body_value = body.0.to_json();
 

catalyst-gateway/bin/src/service/api/documents/templates/mod.rs

@@ -6,7 +6,7 @@ use std::{collections::HashMap, env, sync::LazyLock};
 
 use catalyst_signed_doc::{Builder, CatalystSignedDocument, ContentEncoding, ContentType, IdUri};
 use data::{CATEGORY_DOCUMENTS, COMMENT_TEMPLATES, PROPOSAL_TEMPLATES};
-use ed25519_dalek::SigningKey;
+use ed25519_dalek::{ed25519::signature::Signer, SigningKey};
 use hex::FromHex;
 use uuid::Uuid;
 
@@ -112,7 +112,7 @@ fn build_signed_doc(data: &SignedDocData, sk: &SigningKey) -> (Uuid, CatalystSig
         .with_json_metadata(metadata.clone())
         .expect("Failed to build Metadata from template")
         .with_decoded_content(data.content.to_vec())
-        .add_signature(sk.to_bytes(), kid)
+        .add_signature(|m| sk.sign(&m).to_vec(), &kid)
         .expect("Failed to add signature for template")
         .build();
     let doc_id = doc

catalyst-gateway/bin/src/service/api/health/mod.rs

@@ -1,7 +1,10 @@
 //! Health Endpoints
 use poem_openapi::{param::Query, OpenApi};
 
-use crate::service::common::{auth::none::NoAuthorization, tags::ApiTags};
+use crate::service::common::{
+    auth::{api_key::InternalApiKeyAuthorization, none::NoAuthorization},
+    tags::ApiTags,
+};
 
 mod inspection_get;
 mod live_get;
@@ -74,7 +77,8 @@ impl HealthApi {
     #[oai(
         path = "/v1/health/inspection",
         method = "put",
-        operation_id = "healthInspection"
+        operation_id = "healthInspection",
+        hidden = true
     )]
     async fn inspection(
         &self,
@@ -83,7 +87,7 @@ impl HealthApi {
         /// Enable or disable Verbose Query inspection in the logs.  Used to find query
         /// performance issues.
         query_inspection: Query<Option<inspection_get::DeepQueryInspectionFlag>>,
-        _auth: NoAuthorization,
+        _auth: InternalApiKeyAuthorization,
     ) -> inspection_get::AllResponses {
         inspection_get::endpoint(log_level.0, query_inspection.0).await
     }