refactor(client-lib): move merkleproof creation and verification inside the snapshotmessage computation

Author: turmelclem

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

@@ -98,14 +98,21 @@ async fn main() -> MithrilResult<()> {
         )
         .await?;
 
+    println!("Downloading and verifying digests file authenticity...");
+    let verified_digest = client
+        .cardano_database_v2()
+        .download_and_verify_digests(&certificate, &cardano_database_snapshot)
+        .await?;
+
     println!("Computing Cardano database Merkle proof...",);
     let merkle_proof = client
         .cardano_database_v2()
         .compute_merkle_proof(
             &certificate,
-            &cardano_database_snapshot,
+            cardano_database_snapshot.beacon.immutable_file_number,
             &immutable_file_range,
             &unpacked_dir,
+            &verified_digest,
         )
         .await?;
     merkle_proof

mithril-client-cli/src/commands/cardano_db/download/v2.rs

@@ -124,22 +124,41 @@ impl PreparedCardanoDbV2Download {
             )
         })?;
 
-        let merkle_proof = shared_steps::compute_verify_merkle_proof(
+        let verified_digests = shared_steps::download_and_verify_digests(
             4,
             &progress_printer,
             &client,
             &certificate,
             &cardano_db_message,
-            &restoration_options.immutable_file_range,
-            &restoration_options.db_dir,
         )
-        .await?;
+        .await
+        .with_context(|| {
+            format!(
+                "Can not download and verify digests file for cardano db snapshot with hash: '{}'",
+                self.hash
+            )
+        })?;
+
+        // let merkle_proof = shared_steps::compute_verify_merkle_proof(
+        //     5,
+        //     &progress_printer,
+        //     &client,
+        //     &certificate,
+        //     &cardano_db_message,
+        //     &restoration_options.immutable_file_range,
+        //     &restoration_options.db_dir,
+        //     &verified_digests,
+        // )
+        // .await?;
 
         let message = shared_steps::compute_cardano_db_snapshot_message(
             5,
             &progress_printer,
             &certificate,
-            &merkle_proof,
+            &cardano_db_message,
+            &restoration_options.immutable_file_range,
+            &restoration_options.db_dir,
+            &verified_digests,
         )
         .await?;
 

mithril-client-cli/src/commands/cardano_db/shared_steps.rs

@@ -72,15 +72,17 @@ pub async fn compute_verify_merkle_proof(
     cardano_database_snapshot: &CardanoDatabaseSnapshot,
     immutable_file_range: &ImmutableFileRange,
     unpacked_dir: &Path,
+    verified_digests: &VerifiedDigests,
 ) -> MithrilResult<MKProof> {
     progress_printer.report_step(step_number, "Computing and verifying the Merkle proof…")?;
     let merkle_proof = client
         .cardano_database_v2()
         .compute_merkle_proof(
             certificate,
-            cardano_database_snapshot,
+            cardano_database_snapshot.beacon.immutable_file_number,
             immutable_file_range,
             Path::new(&unpacked_dir),
+            verified_digests,
         )
         .await?;
 
@@ -96,12 +98,21 @@ pub async fn compute_cardano_db_snapshot_message(
     step_number: u16,
     progress_printer: &ProgressPrinter,
     certificate: &MithrilCertificate,
-    merkle_proof: &MKProof,
+    cardano_database_snapshot: &CardanoDatabaseSnapshot,
+    immutable_file_range: &ImmutableFileRange,
+    database_dir: &Path,
+    verified_digest: &VerifiedDigests,
 ) -> MithrilResult<ProtocolMessage> {
     progress_printer.report_step(step_number, "Computing the cardano db snapshot message")?;
     let message = CardanoDbUtils::wait_spinner(
         progress_printer,
-        MessageBuilder::new().compute_cardano_database_message(certificate, merkle_proof.root()),
+        MessageBuilder::new().compute_cardano_database_message(
+            certificate,
+            cardano_database_snapshot,
+            immutable_file_range,
+            database_dir,
+            verified_digest,
+        ),
     )
     .await
     .with_context(|| "Can not compute the cardano db snapshot message")?;

mithril-client-cli/src/commands/cardano_db/verify.rs

@@ -113,22 +113,26 @@ impl CardanoDbVerifyCommand {
         )
         .await?;
 
-        let merkle_proof = shared_steps::compute_verify_merkle_proof(
-            2,
-            &progress_printer,
-            &client,
-            &certificate,
-            &cardano_db_message,
-            &immutable_file_range,
-            db_dir,
-        )
-        .await?;
+        // let merkle_proof = shared_steps::compute_verify_merkle_proof(
+        //     3,
+        //     &progress_printer,
+        //     &client,
+        //     &certificate,
+        //     &cardano_db_message,
+        //     &immutable_file_range,
+        //     db_dir,
+        //     &verified_digests,
+        // )
+        // .await?;
 
         let message = shared_steps::compute_cardano_db_snapshot_message(
             3,
             &progress_printer,
             &certificate,
-            &merkle_proof,
+            &cardano_db_message,
+            &immutable_file_range,
+            db_dir,
+            &verified_digests,
         )
         .await?;
 

mithril-client/src/cardano_database_client/api.rs

@@ -8,6 +8,7 @@ use slog::Logger;
 #[cfg(feature = "fs")]
 use mithril_common::{
     crypto_helper::MKProof,
+    entities::ImmutableFileNumber,
     messages::{CardanoDatabaseSnapshotMessage, CertificateMessage},
 };
 
@@ -119,16 +120,18 @@ impl CardanoDatabaseClient {
     pub async fn compute_merkle_proof(
         &self,
         certificate: &CertificateMessage,
-        cardano_database_snapshot: &CardanoDatabaseSnapshotMessage,
+        last_immutable_file_number_from_beacon: ImmutableFileNumber,
         immutable_file_range: &ImmutableFileRange,
         database_dir: &Path,
+        verified_digests: &VerifiedDigests,
     ) -> MithrilResult<MKProof> {
         self.artifact_prover
             .compute_merkle_proof(
                 certificate,
-                cardano_database_snapshot,
+                last_immutable_file_number_from_beacon,
                 immutable_file_range,
                 database_dir,
+                verified_digests,
             )
             .await
     }

mithril-client/src/cardano_database_client/mod.rs

@@ -113,9 +113,16 @@
 //!     )
 //!     .await?;
 //!
+//! let verified_digests = client
+//!     .cardano_database_v2()
+//!     .download_and_verify_digests(
+//!         &certificate,
+//!         &cardano_database_snapshot)
+//!     .await?;
+//!
 //! let merkle_proof = client
 //!     .cardano_database_v2()
-//!     .compute_merkle_proof(&certificate, &cardano_database_snapshot, &immutable_file_range, &target_directory)
+//!     .compute_merkle_proof(&certificate, cardano_database_snapshot.beacon.immutable_file_number, &immutable_file_range, &target_directory, &verified_digests)
 //!     .await?;
 //! #
 //! #    Ok(())