fix(rust): Update Mithril Crate Dependency (#313)

* bump to the latest mithril-client version 0.12.0

* wip

* fix

* remove commented out code

* fix

* fix comments

* fix: restore original logic

* fix: Make minimum necessary changes to use new mithril crate version

* fix:

* Update rust/cardano-chain-follower/src/mithril_turbo_downloader.rs

Co-authored-by: Artur Helmanau <[email protected]>

* Update rust/cardano-chain-follower/src/mithril_turbo_downloader.rs

Co-authored-by: Artur Helmanau <[email protected]>

---------

Co-authored-by: Mr-Leshiy <[email protected]>
Co-authored-by: Artur Helmanau <[email protected]>

Author: 3 people

rust/cardano-chain-follower/Cargo.toml

@@ -15,7 +15,7 @@ pallas = { version = "0.30.1", git = "https://github.com/input-output-hk/catalys
 pallas-hardano = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
 pallas-crypto = { version = "0.30.1", git = "https://github.com/input-output-hk/catalyst-pallas.git", rev = "9b5183c8b90b90fe2cc319d986e933e9518957b3" }
 
-mithril-client = { version = "0.10.4", default-features = false, features = [
+mithril-client = { version = "0.12.2", default-features = false, features = [
     "full",
     "num-integer-backend",
 ] }
@@ -24,7 +24,7 @@ catalyst-types = { version = "0.0.3", path = "../catalyst-types" }
 
 
 thiserror = "1.0.69"
-tokio = { version = "1.42.0", features = [
+tokio = { version = "1.45.0", features = [
     "macros",
     "rt",
     "net",
@@ -58,14 +58,6 @@ hickory-resolver = { version = "0.24.2", features = ["dns-over-rustls"] }
 moka = { version = "0.12.9", features = ["sync"] }
 cpu-time = "1.0.0"
 
-# Its a transitive dependency of the "mithril-client" crate,
-# but its breaks API after version "0.2.21".
-mithril-build-script = { version = "=0.2.19" }
-
-[package.metadata.cargo-machete]
-# remove that after fixing issues with latest crates
-ignored = ["mithril-build-script"]
-
 [dev-dependencies]
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
 test-log = { version = "0.2.16", default-features = false, features = [

rust/cardano-chain-follower/src/mithril_snapshot_config.rs

@@ -353,7 +353,7 @@ impl MithrilSnapshotConfig {
             .map_err(|e| Error::MithrilClient(self.chain, url.clone(), e))?;
 
         let snapshots = client
-            .snapshot()
+            .cardano_database()
             .list()
             .await
             .map_err(|e| Error::MithrilClient(self.chain, url.clone(), e))?;

rust/cardano-chain-follower/src/mithril_snapshot_sync.rs

@@ -52,7 +52,7 @@ async fn get_latest_snapshots(
     client: &Client, network: Network,
 ) -> Option<(SnapshotListItem, SnapshotListItem)> {
     // Get current latest snapshot from the aggregator
-    let snapshots = match client.snapshot().list().await {
+    let snapshots = match client.cardano_database().list().await {
         Ok(s) => s,
         Err(e) => {
             error!("Unexpected Error [{}]: Unable to get Snapshot List from Aggregator for {}.  Mithril Snapshots can not update. Sleeping.", network, e);
@@ -75,7 +75,7 @@ async fn get_latest_snapshots(
 async fn get_snapshot_by_id(
     client: &Client, network: Network, snapshot_id: &SnapshotId,
 ) -> Option<SnapshotListItem> {
-    let snapshots = match client.snapshot().list().await {
+    let snapshots = match client.cardano_database().list().await {
         Ok(s) => s,
         Err(e) => {
             error!("Unexpected Error [{}]: Unable to get Snapshot List from Aggregator for {}.  Mithril Snapshots can not update. Sleeping.", network, e);
@@ -105,7 +105,7 @@ fn create_client(cfg: &MithrilSnapshotConfig) -> Option<(Client, Arc<MithrilTurb
         &cfg.genesis_key,
     )
     //.add_feedback_receiver(receiver)
-    .with_snapshot_downloader(downloader.clone())
+    .with_http_file_downloader(downloader.clone())
     .build()
     {
         Ok(c) => c,
@@ -165,7 +165,7 @@ async fn get_snapshot(
     client: &Client, snapshot_item: &SnapshotListItem, network: Network,
 ) -> Option<Snapshot> {
     let latest_digest = snapshot_item.digest.as_ref();
-    let snapshot = match client.snapshot().get(latest_digest).await {
+    let snapshot = match client.cardano_database().get(latest_digest).await {
         Ok(snapshot) => {
             if let Some(snapshot) = snapshot {
                 snapshot
@@ -598,7 +598,7 @@ async fn download_and_validate_snapshot(
 
     // Download and unpack the actual snapshot archive.
     if let Err(error) = client
-        .snapshot()
+        .cardano_database()
         .download_unpack(snapshot, &cfg.tmp_path())
         .await
     {
@@ -612,7 +612,7 @@ async fn download_and_validate_snapshot(
         cfg.chain
     );
 
-    if let Err(error) = client.snapshot().add_statistics(snapshot).await {
+    if let Err(error) = client.cardano_database().add_statistics(snapshot).await {
         // Just log not fatal to anything.
         error!(
             "Could not increment snapshot download statistics for {}: {error}",

rust/cardano-chain-follower/src/mithril_turbo_downloader.rs

@@ -18,7 +18,9 @@ use catalyst_types::{conversion::from_saturating, mmap_file::MemoryMapFile};
 use dashmap::DashSet;
 use memx::memcmp;
 use mithril_client::{
-    common::CompressionAlgorithm, snapshot_downloader::SnapshotDownloader, MithrilResult,
+    common::CompressionAlgorithm,
+    file_downloader::{DownloadEvent, FileDownloader, FileDownloaderUri},
+    MithrilResult,
 };
 use tar::{Archive, EntryType};
 use tokio::{fs::create_dir_all, task::spawn_blocking};
@@ -323,11 +325,13 @@ impl MithrilTurboDownloader {
         })
         .await;
 
+        // Must always be called when download ends, regardless of the reason.
+        stats::mithril_dl_finished(self.inner.cfg.chain, None);
+
         if let Ok(result) = result {
             return result;
         }
 
-        stats::mithril_dl_finished(self.inner.cfg.chain, None);
         bail!("Download and Dedup task failed");
     }
 }
@@ -341,11 +345,30 @@ fn get_file_size_sync(file: &Path) -> Option<u64> {
 }
 
 #[async_trait]
-impl SnapshotDownloader for MithrilTurboDownloader {
+impl FileDownloader for MithrilTurboDownloader {
     async fn download_unpack(
-        &self, location: &str, target_dir: &Path, _compression_algorithm: CompressionAlgorithm,
-        _download_id: &str, _snapshot_size: u64,
+        &self, location: &FileDownloaderUri, file_size: u64, target_dir: &Path,
+        compression_algorithm: Option<CompressionAlgorithm>, download_event_type: DownloadEvent,
     ) -> MithrilResult<()> {
+        debug!(
+            ?location,
+            file_size,
+            ?target_dir,
+            ?compression_algorithm,
+            ?download_event_type,
+            "Download And Unpack Mithril."
+        );
+
+        // We only support full downloads for now.
+        if !matches!(download_event_type, DownloadEvent::Full { .. }) {
+            bail!("Unsupported Download Event Type: {:?}", download_event_type);
+        }
+
+        let location = location.as_str();
+
+        // Probe was removed in FileDownloader, so call it directly
+        self.probe(location).await?;
+
         self.create_directories(target_dir).await?;
 
         // DL Start stats set after DL actually started inside the probe call.
@@ -370,7 +393,11 @@ impl SnapshotDownloader for MithrilTurboDownloader {
 
         Ok(())
     }
+}
 
+impl MithrilTurboDownloader {
+    /// Set up the download.  
+    /// Called `probe` as this used to exist in an earlier trait which was removed.
     async fn probe(&self, location: &str) -> MithrilResult<()> {
         debug!("Probe Snapshot location='{location}'.");
         let dl_config = self.inner.cfg.dl_config.clone().unwrap_or_default();