feat: Separate location for ancillary for cardano database v1

CHANGELOG.md

@@ -27,11 +27,13 @@ As a minor extension, we have adopted a slightly different versioning convention
 
 - End support for **macOS x64 pre-built binaries** for the client CLI.
 
+- Cardano database certification: creation of two separate archives, one for the immutable files and another for the ancillary files.
+
 - **UNSTABLE** Implement a slave signer registration mode in the aggregator.
 
 - **UNSTABLE** Cardano database incremental certification:
 
-  - Implement the client library for the the signed entity type `CardanoDatabase` (download and prove snapshot).
+  - Implement the client library for the signed entity type `CardanoDatabase` (download and prove snapshot).
   - Implement the client CLI commands for the signed entity type `CardanoDatabase` (snapshot list, snapshot show and download commands).
   - Implement an example crate for the signed entity type `CardanoDatabase`.
   - Lighter ancillary archive by only including what's strictly necessary: the latest ledger file and the last immutable file trio.

examples/client-cardano-database/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "client-cardano-database"
 description = "Mithril client Cardano database example"
-version = "0.1.27"
+version = "0.1.28"
 authors = ["[email protected]", "[email protected]"]
 documentation = "https://mithril.network/doc"
 edition = "2021"

examples/client-cardano-database/src/main.rs

@@ -103,6 +103,7 @@ async fn main() -> MithrilResult<()> {
 pub struct IndicatifFeedbackReceiver {
     progress_bar: MultiProgress,
     download_pb: RwLock<Option<ProgressBar>>,
+    ancillary_download_pb: RwLock<Option<ProgressBar>>,
     certificate_validation_pb: RwLock<Option<ProgressBar>>,
 }
 
@@ -111,9 +112,19 @@ impl IndicatifFeedbackReceiver {
         Self {
             progress_bar: progress_bar.clone(),
             download_pb: RwLock::new(None),
+            ancillary_download_pb: RwLock::new(None),
             certificate_validation_pb: RwLock::new(None),
         }
     }
+
+    fn new_download_bytes_progress_bar(size: u64) -> ProgressBar {
+        let pb = ProgressBar::new(size);
+        pb.set_style(ProgressStyle::with_template("{spinner:.green} [{elapsed_precise}] [{wide_bar:.cyan/blue}] {bytes}/{total_bytes} ({eta})")
+            .unwrap()
+            .with_key("eta", |state: &ProgressState, w: &mut dyn Write| write!(w, "{:.1}s", state.eta().as_secs_f64()).unwrap())
+            .progress_chars("#>-"));
+        pb
+    }
 }
 
 #[async_trait]
@@ -126,11 +137,7 @@ impl FeedbackReceiver for IndicatifFeedbackReceiver {
                 size,
             } => {
                 println!("Starting download of snapshot '{digest}'");
-                let pb = ProgressBar::new(size);
-                pb.set_style(ProgressStyle::with_template("{spinner:.green} [{elapsed_precise}] [{wide_bar:.cyan/blue}] {bytes}/{total_bytes} ({eta})")
-                    .unwrap()
-                    .with_key("eta", |state: &ProgressState, w: &mut dyn Write| write!(w, "{:.1}s", state.eta().as_secs_f64()).unwrap())
-                    .progress_chars("#>-"));
+                let pb = Self::new_download_bytes_progress_bar(size);
                 self.progress_bar.add(pb.clone());
                 let mut download_pb = self.download_pb.write().await;
                 *download_pb = Some(pb);
@@ -152,6 +159,33 @@ impl FeedbackReceiver for IndicatifFeedbackReceiver {
                 }
                 *download_pb = None;
             }
+            MithrilEvent::SnapshotAncillaryDownloadStarted {
+                download_id: _,
+                size,
+            } => {
+                println!("Starting download of ancillary snapshot");
+                let pb = Self::new_download_bytes_progress_bar(size);
+                self.progress_bar.add(pb.clone());
+                let mut ancillary_download_pb = self.ancillary_download_pb.write().await;
+                *ancillary_download_pb = Some(pb);
+            }
+            MithrilEvent::SnapshotAncillaryDownloadProgress {
+                download_id: _,
+                downloaded_bytes,
+                size: _,
+            } => {
+                let ancillary_download_pb = self.ancillary_download_pb.read().await;
+                if let Some(progress_bar) = ancillary_download_pb.as_ref() {
+                    progress_bar.set_position(downloaded_bytes);
+                }
+            }
+            MithrilEvent::SnapshotAncillaryDownloadCompleted { download_id: _ } => {
+                let mut ancillary_download_pb = self.ancillary_download_pb.write().await;
+                if let Some(progress_bar) = ancillary_download_pb.as_ref() {
+                    progress_bar.finish_with_message("Snapshot ancillary download completed");
+                }
+                *ancillary_download_pb = None;
+            }
             MithrilEvent::CertificateChainValidationStarted {
                 certificate_chain_validation_id: _,
             } => {

mithril-aggregator/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.7.23"
+version = "0.7.24"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }