Merge branch 'main' into fix/cip36-assets-indexing

Author: Mr-Leshiy

catalyst-gateway/bin/Cargo.toml

@@ -20,6 +20,7 @@ rbac-registration = { version = "0.0.4", git = "https://github.com/input-output-
 catalyst-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250406-00" }
 cardano-blockchain-types = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250406-00" }
 catalyst-signed-doc = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250406-00" }
+c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250406-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" }
@@ -97,6 +98,8 @@ stats_alloc = "0.1.10"
 memory-stats = "1.0.0"
 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"] }
 
 # Its a transitive dependency of the "poem-openapi" crate,
 # but its breaks API after version "5.1.8".

catalyst-gateway/bin/src/db/index/queries/cql/get_catalyst_id_for_stake_address.cql

@@ -1,5 +1,6 @@
 SELECT  
-    catalyst_id
+    catalyst_id,
+    slot_no
 FROM 
     catalyst_id_for_stake_address
 WHERE 

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

@@ -13,7 +13,7 @@ use crate::db::{
         queries::{PreparedQueries, PreparedSelectQuery},
         session::CassandraSession,
     },
-    types::{DbCatalystId, DbStakeAddress},
+    types::{DbCatalystId, DbSlot, DbStakeAddress},
 };
 
 /// Get Catalyst ID by stake address query string.
@@ -27,12 +27,12 @@ pub(crate) struct QueryParams {
 }
 
 /// Get Catalyst ID by stake address query.
-// TODO: Remove the `dead_code` annotation when the query is used.
-#[allow(dead_code)]
 #[derive(Debug, Clone, DeserializeRow)]
 pub(crate) struct Query {
     /// Catalyst ID for the queries stake address.
     pub catalyst_id: DbCatalystId,
+    /// A slot number.
+    pub slot_no: DbSlot,
 }
 
 impl Query {
@@ -46,8 +46,6 @@ impl Query {
     }
 
     /// Executes a get Catalyst ID by stake address query.
-    // TODO: Remove the `dead_code` annotation when the query is used.
-    #[allow(dead_code)]
     pub(crate) async fn execute(
         session: &CassandraSession, params: QueryParams,
     ) -> anyhow::Result<TypedRowStream<Query>> {

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

@@ -28,7 +28,7 @@ pub(crate) struct QueryParams {
 
 /// Get registrations by Catalyst ID query.
 #[allow(dead_code)]
-#[derive(DeserializeRow)]
+#[derive(DeserializeRow, Clone)]
 pub(crate) struct Query {
     /// Registration transaction id.
     pub txn_id: DbTransactionId,

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

@@ -1,27 +1,30 @@
 //! Implementation of the GET `/cardano/cip36` endpoint
 
-use poem::http::HeaderMap;
 use tracing::error;
 
-use self::cardano::query::stake_or_voter::StakeAddressOrPublicKey;
 use super::{
-    cardano::{self},
     filter::{get_registration_given_stake_key_hash, get_registration_given_vote_key, snapshot},
     response, SlotNo,
 };
 use crate::{
     db::index::session::CassandraSession,
     service::{
         api::cardano::cip36::response::AllRegistration,
-        common::{self, types::headers::retry_after::RetryAfterOption},
+        common::{
+            self,
+            types::{
+                cardano::query::stake_or_voter::StakeOrVoter,
+                headers::retry_after::RetryAfterOption,
+            },
+        },
     },
 };
 
 /// Process the endpoint operation
 pub(crate) async fn cip36_registrations(
-    lookup: Option<cardano::query::stake_or_voter::StakeOrVoter>, asat: Option<SlotNo>,
+    lookup: Option<StakeOrVoter>, asat: Option<SlotNo>,
     _page: common::types::generic::query::pagination::Page,
-    _limit: common::types::generic::query::pagination::Limit, _headers: &HeaderMap,
+    _limit: common::types::generic::query::pagination::Limit,
 ) -> AllRegistration {
     let Some(session) = CassandraSession::get(true) else {
         error!("Failed to acquire db session");
@@ -32,8 +35,8 @@ pub(crate) async fn cip36_registrations(
     };
 
     if let Some(stake_or_voter) = lookup {
-        match StakeAddressOrPublicKey::from(stake_or_voter) {
-            StakeAddressOrPublicKey::Address(cip19_stake_address) => {
+        match stake_or_voter {
+            StakeOrVoter::Address(cip19_stake_address) => {
                 // Typically, a stake address will start with 'stake1',
                 // We need to convert this to a stake hash as per our data model to then find the,
                 // Full Stake Public Key (32 byte Ed25519 Public key, not hashed).
@@ -52,7 +55,7 @@ pub(crate) async fn cip36_registrations(
 
                 return get_registration_given_stake_key_hash(address, session, asat).await;
             },
-            StakeAddressOrPublicKey::PublicKey(ed25519_hex_encoded_public_key) => {
+            StakeOrVoter::PublicKey(ed25519_hex_encoded_public_key) => {
                 // As above...
                 // Except using a voting key.
                 return get_registration_given_vote_key(
@@ -62,7 +65,7 @@ pub(crate) async fn cip36_registrations(
                 )
                 .await;
             },
-            StakeAddressOrPublicKey::All =>
+            StakeOrVoter::All =>
             // As above...
             // Snapshot replacement, returns all registrations or returns a
             // subset of registrations if constrained by a given time.

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

@@ -15,18 +15,21 @@ use super::{
         AllRegistration, Cip36Details, Cip36Registration, Cip36RegistrationList,
         Cip36RegistrationsForVotingPublicKey,
     },
-    Ed25519HexEncodedPublicKey, SlotNo,
+    SlotNo,
 };
-use crate::db::index::{
-    queries::registrations::{
-        get_all_invalids::{GetAllInvalidRegistrationsParams, GetAllInvalidRegistrationsQuery},
-        get_all_registrations::{GetAllRegistrationsParams, GetAllRegistrationsQuery},
-        get_from_stake_addr::{GetRegistrationParams, GetRegistrationQuery},
-        get_from_stake_address::{GetStakeAddrParams, GetStakeAddrQuery},
-        get_from_vote_key::{GetStakeAddrFromVoteKeyParams, GetStakeAddrFromVoteKeyQuery},
-        get_invalid::{GetInvalidRegistrationParams, GetInvalidRegistrationQuery},
+use crate::{
+    db::index::{
+        queries::registrations::{
+            get_all_invalids::{GetAllInvalidRegistrationsParams, GetAllInvalidRegistrationsQuery},
+            get_all_registrations::{GetAllRegistrationsParams, GetAllRegistrationsQuery},
+            get_from_stake_addr::{GetRegistrationParams, GetRegistrationQuery},
+            get_from_stake_address::{GetStakeAddrParams, GetStakeAddrQuery},
+            get_from_vote_key::{GetStakeAddrFromVoteKeyParams, GetStakeAddrFromVoteKeyQuery},
+            get_invalid::{GetInvalidRegistrationParams, GetInvalidRegistrationQuery},
+        },
+        session::CassandraSession,
     },
-    session::CassandraSession,
+    service::common::types::generic::ed25519_public_key::Ed25519HexEncodedPublicKey,
 };
 
 /// Get registration given a stake key hash, it can be time specific based on asat param,

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

@@ -5,7 +5,6 @@ use poem_openapi::{param::Query, payload::Json, OpenApi};
 use response::Cip36RegistrationUnprocessableContent;
 
 use self::{cardano::slot_no::SlotNo, common::auth::none::NoAuthorization};
-use super::Ed25519HexEncodedPublicKey;
 use crate::service::common::{
     self,
     tags::ApiTags,
@@ -72,7 +71,6 @@ impl Api {
             SlotNo::into_option(asat.0),
             page.0.unwrap_or_default(),
             limit.0.unwrap_or_default(),
-            headers,
         )
         .await
     }

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

@@ -8,7 +8,7 @@ use poem_openapi::{
     ApiResponse, NewType, Object,
 };
 
-use crate::service::{common, common::types::array_types::impl_array_types};
+use crate::service::common::{self, types::array_types::impl_array_types};
 
 // ToDo: The examples of this response should be taken from representative data from a
 // response generated on pre-prod.
@@ -141,11 +141,9 @@ pub(crate) struct Cip36Details {
     #[oai(skip_serializing_if_is_none)]
     pub payment_address: Option<common::types::cardano::cip19_shelley_address::Cip19ShelleyAddress>,
     /// If the payment address is a script, then it can not be payed rewards.
-    #[oai(default)]
-    pub is_payable: common::types::cardano::boolean::IsPayable,
+    pub is_payable: common::types::generic::boolean::BooleanFlag,
     /// If this field is set, then the registration was in CIP15 format.
-    #[oai(default)]
-    pub cip15: common::types::cardano::boolean::IsCip15,
+    pub cip15: common::types::generic::boolean::BooleanFlag,
     /// If there are errors with this registration, they are listed here.
     /// This field is *NEVER* returned for a valid registration.
     #[oai(skip_serializing_if_is_none)]

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

@@ -1,83 +1,8 @@
 //! Cardano API endpoints
-use poem_openapi::{param::Path, OpenApi};
-
-use crate::service::common::{
-    auth::none_or_rbac::NoneOrRBAC,
-    objects::cardano::hash::Hash128,
-    tags::ApiTags,
-    types::{
-        cardano::{catalyst_id::CatalystId, cip19_stake_address::Cip19StakeAddress},
-        generic::ed25519_public_key::Ed25519HexEncodedPublicKey,
-    },
-};
 
 pub(crate) mod cip36;
-mod rbac;
-// mod registration_get;
+pub(crate) mod rbac;
 pub(crate) mod staking;
 
-/// Cardano Follower API Endpoints
-pub(crate) struct Api;
-
-#[OpenApi(tag = "ApiTags::Cardano")]
-impl Api {
-    // TODO: "Chain root" was replaced by "Catalyst ID", so this endpoint needs to be updated
-    // or removed.
-    #[oai(
-        path = "/draft/rbac/chain_root/:stake_address",
-        method = "get",
-        operation_id = "rbacChainRootGet"
-    )]
-    /// Get RBAC chain root
-    ///
-    /// This endpoint returns the RBAC certificate chain root for a given stake address.
-    async fn rbac_chain_root_get(
-        &self,
-        /// Stake address to get the chain root for.
-        Path(stake_address): Path<Cip19StakeAddress>,
-        /// No Authorization required, but Token permitted.
-        _auth: NoneOrRBAC,
-    ) -> rbac::chain_root_get::AllResponses {
-        rbac::chain_root_get::endpoint(stake_address).await
-    }
-
-    #[oai(
-        path = "/draft/rbac/registrations/:catalyst_id",
-        method = "get",
-        operation_id = "rbacRegistrations"
-    )]
-    /// Get registrations by Catalyst short ID.
-    ///
-    /// This endpoint returns RBAC registrations for the given Catalyst short identifier.
-    async fn rbac_registrations_get(
-        &self,
-        /// A Catalyst short ID to get the registrations for.
-        Path(catalyst_id): Path<CatalystId>,
-        /// No Authorization required, but Token permitted.
-        _auth: NoneOrRBAC,
-    ) -> rbac::registrations_get::AllResponses {
-        rbac::registrations_get::endpoint(catalyst_id.into()).await
-    }
-
-    // TODO: "Chain root" was replaced by "Catalyst ID", so this endpoint needs to be updated
-    // or removed.
-    #[oai(
-        path = "/draft/rbac/role0_chain_root/:role0_key",
-        method = "get",
-        operation_id = "rbacRole0KeyChainRoot"
-    )]
-    /// Get RBAC chain root for a given role0 key.
-    ///
-    /// This endpoint returns the RBAC certificate chain root for a given role 0 key.
-    async fn rbac_role0_key_chain_root(
-        &self, /// Role0 key to get the chain root for.
-        Path(role0_key): Path<Hash128>,
-        /// No Authorization required, but Token permitted.
-        _auth: NoneOrRBAC,
-    ) -> rbac::role0_chain_root_get::AllResponses {
-        rbac::role0_chain_root_get::endpoint(role0_key.to_string()).await
-    }
-}
-
-/// Cardano API Endpoints
-pub(crate) type CardanoApi = (Api, staking::Api, cip36::Api);
+/// All Cardano API Endpoints
+pub(crate) type CardanoApi = (rbac::Api, staking::Api, cip36::Api);