feat(cat-gateway): Updated Catalyst Signed Document validation (#3466)

* change catalyst-signed-doc version

* wip

* define f15 uuids

* cleanup

* fix

* wip

* fix

* cleanup

* update test

* wip

* update f15 uuids

* update test_signed_doc.py

* fix tests

* update templates() test

Author: Mr-Leshiy

catalyst-gateway/Cargo.lock

@@ -19,7 +19,7 @@ cardano-chain-follower = { version = "0.0.10", git = "https://github.com/input-o
 rbac-registration = { version = "0.0.5", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cardano-chain-follower-v0.0.10" }
 catalyst-types = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250724-01" }
 cardano-blockchain-types = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250724-01" }
-catalyst-signed-doc = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "cardano-chain-follower-v0.0.10" }
+catalyst-signed-doc = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "catalyst-signed-doc/v0.0.4-f15-rc" }
 c509-certificate = { version = "0.0.3", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250724-01" }
 
 pallas = { version = "0.33.0" }

catalyst-gateway/bin/Cargo.toml

@@ -5,28 +5,13 @@ use std::collections::HashMap;
 
 use catalyst_signed_doc::CatalystSignedDocument;
 
-use super::templates::get_doc_static_template;
+use super::templates::get_active_doc_static_template;
 use crate::{
     db::event::{error::NotFoundError, signed_docs::FullSignedDoc},
     service::common::auth::rbac::token::CatalystRBACTokenV1,
     settings::Settings,
 };
 
-/// Get document from the database
-pub(crate) async fn get_document(
-    document_id: &uuid::Uuid,
-    version: Option<&uuid::Uuid>,
-) -> anyhow::Result<CatalystSignedDocument> {
-    // Find the doc in the static templates first
-    if let Some(doc) = get_doc_static_template(document_id) {
-        return Ok(doc);
-    }
-
-    // If doesn't exist in the static templates, try to find it in the database
-    let db_doc = FullSignedDoc::retrieve(document_id, version).await?;
-    db_doc.raw().try_into()
-}
-
 /// A struct which implements a
 /// `catalyst_signed_doc::providers::CatalystSignedDocumentProvider` trait
 pub(crate) struct DocProvider;
@@ -38,8 +23,14 @@ impl catalyst_signed_doc::providers::CatalystSignedDocumentProvider for DocProvi
     ) -> anyhow::Result<Option<CatalystSignedDocument>> {
         let id = doc_ref.id.uuid();
         let ver = doc_ref.ver.uuid();
-        match get_document(&id, Some(&ver)).await {
-            Ok(doc) => Ok(Some(doc)),
+
+        // Find the doc in the static templates first
+        if let Some(doc) = get_active_doc_static_template(&id) {
+            return Ok(Some(doc));
+        }
+
+        match FullSignedDoc::retrieve(&id, Some(&ver)).await {
+            Ok(doc) => doc.raw().try_into().map(Some),
             Err(err) if err.is::<NotFoundError>() => Ok(None),
             Err(err) => Err(err),
         }

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

@@ -2,9 +2,9 @@
 
 use poem_openapi::ApiResponse;
 
-use super::common;
+use super::templates::get_doc_static_template;
 use crate::{
-    db::event::error::NotFoundError,
+    db::event::{error::NotFoundError, signed_docs::FullSignedDoc},
     service::common::{responses::WithErrorResponses, types::payload::cbor::Cbor},
 };
 
@@ -31,13 +31,16 @@ pub(crate) async fn endpoint(
     document_id: uuid::Uuid,
     version: Option<uuid::Uuid>,
 ) -> AllResponses {
-    match common::get_document(&document_id, version.as_ref()).await {
-        Ok(doc) => {
-            match doc.try_into() {
-                Ok(doc_cbor_bytes) => Responses::Ok(Cbor(doc_cbor_bytes)).into(),
-                Err(err) => AllResponses::handle_error(&err),
-            }
-        },
+    // Find the doc in the static templates first
+    if let Some(doc) = get_doc_static_template(&document_id) {
+        return match doc.try_into() {
+            Ok(doc_cbor_bytes) => Responses::Ok(Cbor(doc_cbor_bytes)).into(),
+            Err(err) => AllResponses::handle_error(&err),
+        };
+    }
+
+    match FullSignedDoc::retrieve(&document_id, version.as_ref()).await {
+        Ok(doc) => Responses::Ok(Cbor(doc.raw().to_vec())).into(),
         Err(err) if err.is::<NotFoundError>() => Responses::NotFound.into(),
         Err(err) => AllResponses::handle_error(&err),
     }