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

Author: emiride

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

@@ -23,7 +23,7 @@ use super::{queries::FallibleQueryTasks, session::CassandraSession};
 pub(crate) async fn index_block(block: &MultiEraBlock) -> anyhow::Result<()> {
     // Get the session.  This should never fail.
     let Some(session) = CassandraSession::get(block.is_immutable()) else {
-        anyhow::bail!("Failed to get Index DB Session.  Can not index block.");
+        anyhow::bail!("Failed to get Index DB Session. Cannot index block.");
     };
 
     let mut cert_index = CertInsertQuery::new();

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

@@ -7,6 +7,7 @@ pub(crate) mod insert_rbac509_invalid;
 
 use std::sync::Arc;
 
+use anyhow::{bail, Context};
 use cardano_blockchain_types::{
     Cip0134Uri, MultiEraBlock, Slot, StakeAddress, TransactionId, TxnIndex,
 };
@@ -99,9 +100,21 @@ impl Rbac509InsertQuery {
             );
         }
 
-        let Some(catalyst_id) = catalyst_id(session, &cip509, txn_hash, slot, index).await else {
-            error!("Unable to determine Catalyst id for registration: slot = {slot:?}, index = {index:?}, txn_hash = {txn_hash:?}");
-            return;
+        let catalyst_id = match catalyst_id(
+            session,
+            &cip509,
+            txn_hash,
+            slot,
+            index,
+            block.is_immutable(),
+        )
+        .await
+        {
+            Ok(v) => v,
+            Err(e) => {
+                error!("Unable to determine Catalyst id for registration: slot = {slot:?}, index = {index:?}, txn_hash = {txn_hash:?}: {e:?}");
+                return;
+            },
         };
 
         let previous_transaction = cip509.previous_transaction();
@@ -199,29 +212,52 @@ impl Rbac509InsertQuery {
 
 /// Returns a Catalyst ID of the given registration.
 async fn catalyst_id(
-    session: &Arc<CassandraSession>, cip509: &Cip509, txn_hash: TransactionId, slot: Slot,
-    index: TxnIndex,
-) -> Option<IdUri> {
-    use crate::db::index::queries::rbac::get_catalyst_id_from_transaction_id::{
-        cache_for_transaction_id, Query,
-    };
+    session: &Arc<CassandraSession>, cip509: &Cip509, txn_id: TransactionId, slot: Slot,
+    index: TxnIndex, is_immutable: bool,
+) -> anyhow::Result<IdUri> {
+    use crate::db::index::queries::rbac::get_catalyst_id_from_transaction_id::cache_for_transaction_id;
 
     let id = match cip509.previous_transaction() {
-        Some(previous) => {
-            Query::get_latest(session, previous.into())
-                .await
-                .inspect_err(|e| error!("{e:?}"))
-                .ok()
-                .flatten()?
-                .catalyst_id
-                .into()
+        Some(previous) => query_catalyst_id(session, previous, is_immutable).await?,
+        None => {
+            cip509
+                .catalyst_id()
+                .context("Empty Catalyst ID in root RBAC registration")?
+                .as_short_id()
         },
-        None => cip509.catalyst_id()?.as_short_id(),
     };
 
-    cache_for_transaction_id(txn_hash, id.clone(), slot, index);
+    cache_for_transaction_id(txn_id, id.clone(), slot, index);
+
+    Ok(id)
+}
+
+/// Queries a Catalyst ID from the database by the given transaction ID.
+async fn query_catalyst_id(
+    session: &Arc<CassandraSession>, txn_id: TransactionId, is_immutable: bool,
+) -> anyhow::Result<IdUri> {
+    use crate::db::index::queries::rbac::get_catalyst_id_from_transaction_id::Query;
 
-    Some(id)
+    if let Some(q) = Query::get_latest(session, txn_id.into())
+        .await
+        .context("Failed to query Catalyst ID from transaction ID")?
+    {
+        Ok(q.catalyst_id.into())
+    } else {
+        if is_immutable {
+            bail!("Unable to find Catalyst ID in the persistent DB");
+        }
+
+        // If this block is a volatile/mutable one then try to look up a Catalyst ID in the
+        // persistent database.
+        let persistent_session =
+            CassandraSession::get(true).context("Failed to get persistent DB session")?;
+        Query::get_latest(&persistent_session, txn_id.into())
+            .await
+            .transpose()
+            .context("Unable to find Catalyst ID in the persistent DB")?
+            .map(|q| q.catalyst_id.into())
+    }
 }
 
 /// Returns stake addresses of the role 0.

catalyst_voices/apps/voices/integration_test/suites/proposals_test.dart

@@ -11,6 +11,7 @@ import '../pageobject/proposals_page.dart';
 
 void main() async {
   late final GoRouter router;
+
   setUpAll(() async {
     router = buildAppRouter();
   });

catalyst_voices/apps/voices/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,6 +5,7 @@
 import FlutterMacOS
 import Foundation
 
+import file_picker
 import file_selector_macos
 import flutter_secure_storage_macos
 import package_info_plus
@@ -18,6 +19,7 @@ import video_player_avfoundation
 import webview_flutter_wkwebview
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))

catalyst_voices/apps/voices/pubspec.yaml

@@ -63,7 +63,7 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   formz: ^0.7.0
-  go_router: ^14.0.2
+  go_router: ^14.8.0
   google_fonts: ^6.2.1
   intl: ^0.19.0
   lottie: ^3.3.1

catalyst_voices/melos.yaml

@@ -126,6 +126,7 @@ command:
       flutter_rust_bridge: 2.5.1
       flutter_secure_storage: ^9.2.2
       formz: ^0.7.0
+      go_router: ^14.8.0
       intl: ^0.19.0
       logging: ^1.3.0
       lottie: ^3.3.1

catalyst_voices/utilities/poc_local_storage/pubspec.yaml

@@ -16,7 +16,7 @@ dependencies:
   flutter_secure_storage: ^9.2.2
   flutter_web_plugins:
     sdk: flutter
-  go_router: ^14.2.3
+  go_router: ^14.8.0
   pointycastle: ^3.9.1
 
 dev_dependencies: