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

Author: emiride

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 = "r20250406-00" }
-rbac-registration = { version = "0.0.4", git = "https://github.com/input-output-hk/catalyst-libs.git", tag = "r20250406-00" }
-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" }
+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" }
 
 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" }

catalyst-gateway/bin/src/service/api/documents/get_document.rs

@@ -65,8 +65,8 @@ impl catalyst_signed_doc::providers::CatalystSignedDocumentProvider for DocProvi
         &self, doc_ref: &catalyst_signed_doc::DocumentRef,
     ) -> anyhow::Result<Option<CatalystSignedDocument>> {
         let id = doc_ref.id.uuid();
-        let ver = doc_ref.ver.map(|uuid| uuid.uuid());
-        match get_document(&id, ver.as_ref()).await {
+        let ver = doc_ref.ver.uuid();
+        match get_document(&id, Some(&ver)).await {
             Ok(doc) => Ok(Some(doc)),
             Err(err) if err.is::<NotFoundError>() => Ok(None),
             Err(err) => Err(err),

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

@@ -12,9 +12,13 @@ use uuid::Uuid;
 
 /// Catalyst brand ID.
 const BRAND_ID: &str = "0194cfcd-bddc-7bb3-b5e9-455168bd3ff7";
+/// Catalyst brand Version (same as ID).
+const BRAND_VERSION: &str = BRAND_ID;
 
 /// Fund 14 Campaign ID.
 const CAMPAIGN_ID: &str = "0194cfcf-15a2-7e32-b559-386b93d0724e";
+/// Fund 14 Campaign Version (Same as ID).
+const CAMPAIGN_VERSION: &str = CAMPAIGN_ID;
 
 /// A map of signed document templates to its ID.
 pub(crate) static TEMPLATES: LazyLock<Option<HashMap<Uuid, CatalystSignedDocument>>> =
@@ -96,11 +100,11 @@ fn build_signed_doc(data: &SignedDocData, sk: &SigningKey) -> (Uuid, CatalystSig
         "type": data.doc_type,
         "id": data.id,
         "ver": data.ver,
-        "category_id": data.category_id.map(|v| serde_json::json!({"id": v})),
+        "category_id": data.category_id.map(|v| serde_json::json!({"id": v, "ver": v })),
         "content-type": ContentType::Json.to_string(),
         "content-encoding": ContentEncoding::Brotli.to_string(),
-        "campaign_id": {"id": CAMPAIGN_ID},
-        "brand_id":  {"id": BRAND_ID},
+        "campaign_id": {"id": CAMPAIGN_ID, "ver": CAMPAIGN_VERSION},
+        "brand_id":  {"id": BRAND_ID, "ver": BRAND_VERSION},
     });
 
     let kid = IdUri::new(KID_NETWORK, None, sk.verifying_key());

catalyst-gateway/bin/src/service/common/auth/rbac/token.rs

@@ -96,7 +96,7 @@ impl CatalystRBACTokenV1 {
             return Err(anyhow!("Catalyst ID must have nonce"));
         }
         let (role, rotation) = catalyst_id.role_and_rotation();
-        if role != RoleIndex::DEFAULT {
+        if role != RoleIndex::ROLE_0 {
             return Err(anyhow!("Catalyst ID mustn't have role specified"));
         }
         if rotation != KeyRotation::DEFAULT {

catalyst-gateway/bin/src/service/common/types/document/doc_ref.rs

@@ -204,14 +204,14 @@ pub(crate) struct DocumentReference {
     doc_id: DocumentId,
     /// Document Version
     #[oai(skip_serializing_if_is_none)]
-    ver: Option<DocumentVer>,
+    ver: DocumentVer,
 }
 
 impl Example for DocumentReference {
     fn example() -> Self {
         Self {
             doc_id: DocumentId::example(),
-            ver: Some(DocumentVer::example()),
+            ver: DocumentVer::example(),
         }
     }
 }
@@ -220,7 +220,7 @@ impl From<catalyst_signed_doc::DocumentRef> for DocumentReference {
     fn from(value: catalyst_signed_doc::DocumentRef) -> Self {
         Self {
             doc_id: value.id.into(),
-            ver: value.ver.map(Into::into),
+            ver: value.ver.into(),
         }
     }
 }

catalyst-gateway/tests/api_tests/integration/test_signed_doc.py

@@ -70,6 +70,7 @@ def proposal_doc_factory(proposal_templates, rbac_auth_token_factory):
     def __proposal_doc_factory() -> SignedDocument:
         rbac_auth_token = rbac_auth_token_factory()
         proposal_doc_id = uuid_v7.uuid_v7()
+        category_id = "0194d490-30bf-7473-81c8-a0eaef369619"
         proposal_metadata_json = {
             "id": proposal_doc_id,
             "ver": proposal_doc_id,
@@ -78,9 +79,15 @@ def __proposal_doc_factory() -> SignedDocument:
             "content-type": "application/json",
             "content-encoding": "br",
             # referenced to the defined proposal template id, comes from the 'templates/data.rs' file
-            "template": {"id": proposal_templates[0]},
+            "template": {
+                "id": proposal_templates[0],
+                "ver": proposal_templates[0],
+            },
             # referenced to the defined category id, comes from the 'templates/data.rs' file
-            "category_id": {"id": "0194d490-30bf-7473-81c8-a0eaef369619"},
+            "category_id": {
+                "id": category_id,
+                "ver": category_id,
+            },
         }
         with open("./test_data/signed_docs/proposal.json", "r") as proposal_json_file:
             proposal_json = json.load(proposal_json_file)
@@ -112,8 +119,14 @@ def __comment_doc_factory() -> SignedDocument:
             "type": "b679ded3-0e7c-41ba-89f8-da62a17898ea",
             "content-type": "application/json",
             "content-encoding": "br",
-            "ref": {"id": proposal_doc.metadata["id"]},
-            "template": {"id": comment_templates[0]},
+            "ref": {
+                "id": proposal_doc.metadata["id"],
+                "ver": proposal_doc.metadata["ver"],
+            },
+            "template": {
+                "id": comment_templates[0],
+                "ver": comment_templates[0],
+            },
         }
         with open("./test_data/signed_docs/comment.json", "r") as comment_json_file:
             comment_json = json.load(comment_json_file)
@@ -145,7 +158,10 @@ def __submission_action_factory() -> SignedDocument:
             "type": "5e60e623-ad02-4a1b-a1ac-406db978ee48",
             "content-type": "application/json",
             "content-encoding": "br",
-            "ref": {"id": proposal_doc.metadata["id"]},
+            "ref": {
+                "id": proposal_doc.metadata["id"],
+                "ver": proposal_doc.metadata["ver"],
+            },
         }
         with open(
             "./test_data/signed_docs/submission_action.json", "r"

catalyst_voices/apps/voices/e2e_tests/pageobject/onboarding/create-flow/step-14-keychain-final.ts

@@ -2,7 +2,7 @@ import { Locator, Page } from "@playwright/test";
 import { OnboardingBasePage } from "../onboarding-base-page";
 import { PasswordInputPanel } from "./step-13-password-input";
 
-export class KaychainFinalPanel {
+export class KeychainFinalPanel {
   page: Page;
   linkWalletAndRolesBtn: Locator;
 

catalyst_voices/apps/voices/e2e_tests/pageobject/onboarding/create-flow/step-15-link-wallet-info.ts

@@ -1,5 +1,5 @@
 import { Locator, Page } from "@playwright/test";
-import { KaychainFinalPanel } from "./step-14-keychain-final";
+import { KeychainFinalPanel } from "./step-14-keychain-final";
 
 export  class LinkWalletInfoPanel {
     page: Page
@@ -13,8 +13,8 @@ export  class LinkWalletInfoPanel {
     }
 
     async goto() {
-        await new KaychainFinalPanel(this.page).goto();
-        await new KaychainFinalPanel(this.page).clickLinkWalletAndRolesBtn();
+        await new KeychainFinalPanel(this.page).goto();
+        await new KeychainFinalPanel(this.page).clickLinkWalletAndRolesBtn();
     }
 
     async clickChooseWalletBtn() {

catalyst_voices/apps/voices/e2e_tests/pageobject/onboarding/create-flow/step-2-base-profile-info.ts

@@ -3,11 +3,11 @@ import { GetStartedPanel } from "../step-1-get-started";
 
 export class BaseProfileInfoPanel {
   page: Page;
-  ceateYourBaseProfilebtn: Locator;
+  createYourBaseProfileBtn: Locator;
 
   constructor(page: Page) {
     this.page = page;
-    this.ceateYourBaseProfilebtn = page.getByRole("button", {
+    this.createYourBaseProfileBtn = page.getByRole("button", {
       name: "CreateBaseProfileNext-test",
     });
   }
@@ -16,8 +16,8 @@ export class BaseProfileInfoPanel {
     await new GetStartedPanel(this.page).goto();
     await new GetStartedPanel(this.page).clickCreateNewCatalystKeychain();
   }
-    
+
   async clickCreateBaseProfileBtn() {
-    await this.ceateYourBaseProfilebtn.click();
+    await this.createYourBaseProfileBtn.click();
   }
 }

catalyst_voices/apps/voices/e2e_tests/pageobject/onboarding/create-flow/step-5-base-profile-final.ts

@@ -3,11 +3,11 @@ import { AcknowledgementsPanel } from "./step-4-acknowledgements";
 
 export class BaseProfileFinalPanel {
   page: Page;
-  createYourCatalystKeychainbtn: Locator;
+  createYourCatalystKeychainBtn: Locator;
 
   constructor(page: Page) {
     this.page = page;
-    this.createYourCatalystKeychainbtn = page.getByRole("button", {
+    this.createYourCatalystKeychainBtn = page.getByRole("button", {
       name: "CreateKeychain-test",
     });
   }
@@ -17,7 +17,7 @@ export class BaseProfileFinalPanel {
     await new AcknowledgementsPanel(this.page).clickNextButton();
   }
 
-  async clickCreateYourCatalystKeychainbtn() {
-    await this.createYourCatalystKeychainbtn.click();
+  async clickCreateYourCatalystKeychainBtn() {
+    await this.createYourCatalystKeychainBtn.click();
   }
 }