Merge pull request #1663 from input-output-hk/jpraynaud/1635-prove-cardano-tx-with-block-range-roots

Prove `Cardano Transactions` with `Block Range Merkle Roots`

Author: jpraynaud

CHANGELOG.md

@@ -9,7 +9,7 @@ As a minor extension, we have adopted a slightly different versioning convention
 
 ## Mithril Distribution [XXXX.X] - UNRELEASED
 
-- Support computation of the Cardano Transactions signature with the pre-computed Block Range Merkle Roots retrieved from the database.
+- Support computation of the Cardano Transactions signature and proving with the pre-computed Block Range Merkle Roots retrieved from the database.
 
 ## Mithril Distribution [2418.1] - UNRELEASED
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-build-script"
-version = "0.2.1"
+version = "0.2.2"
 description = "A toolbox for Mithril crates build scripts"
 authors = { workspace = true }
 edition = { workspace = true }

internal/mithril-build-script/Cargo.toml

@@ -145,7 +145,7 @@ info:
         write_minimal_open_api_file("2.0.0", &sub_folder.join("openapi-thales.yaml"));
 
         let expected = r#"("openapi-thales.yaml".to_string(), semver::Version::new(2, 0, 0)), ("openapi.yaml".to_string(), semver::Version::new(1, 0, 0))"#;
-        let generated_code = generate_open_api_versions_mapping(&[&parent_folder, &sub_folder]);
+        let generated_code = generate_open_api_versions_mapping(&[parent_folder, &sub_folder]);
 
         assert_open_api_content_contains(expected, &generated_code);
     }
@@ -162,7 +162,7 @@ info:
         let expected = r#"HashMap::from([
         ("openapi.yaml".to_string(), semver::Version::new(2, 0, 0)), 
     ])"#;
-        let generated_code = generate_open_api_versions_mapping(&[&parent_folder, &sub_folder]);
+        let generated_code = generate_open_api_versions_mapping(&[parent_folder, &sub_folder]);
 
         assert_open_api_content_contains(expected, &generated_code);
     }

internal/mithril-build-script/src/open_api.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-doc"
-version = "0.1.3"
+version = "0.1.4"
 description = "An internal crate to generate documentation."
 authors = { workspace = true }
 edition = { workspace = true }

internal/mithril-doc/Cargo.toml

@@ -87,13 +87,14 @@ impl StructDoc {
             } else {
                 let mut d = data_map1.get(&field_doc.parameter).unwrap().clone();
                 if d.default_value.is_none() {
-                    d.default_value = field_doc.default_value.clone();
+                    d.default_value.clone_from(&field_doc.default_value);
                 }
                 if d.example.is_none() {
-                    d.example = field_doc.example.clone();
+                    d.example.clone_from(&field_doc.example);
                 }
                 if d.environment_variable.is_none() {
-                    d.environment_variable = field_doc.environment_variable.clone();
+                    d.environment_variable
+                        .clone_from(&field_doc.environment_variable);
                 }
                 data_map1.insert(field_doc.parameter.clone(), d);
             }

internal/mithril-doc/src/lib.rs

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

mithril-aggregator/Cargo.toml

@@ -2,7 +2,7 @@ use std::ops::Range;
 
 use sqlite::Value;
 
-use mithril_common::entities::{BlockNumber, TransactionHash};
+use mithril_common::entities::{BlockNumber, BlockRange, TransactionHash};
 use mithril_persistence::sqlite::{
     Provider, SourceAlias, SqLiteEntity, SqliteConnection, WhereCondition,
 };
@@ -43,6 +43,24 @@ impl<'client> GetCardanoTransactionProvider<'client> {
         WhereCondition::where_in("transaction_hash", hashes_values)
     }
 
+    pub fn get_transaction_block_ranges_condition(
+        &self,
+        block_ranges: Vec<BlockRange>,
+    ) -> WhereCondition {
+        let mut where_condition = WhereCondition::default();
+        for block_range in block_ranges {
+            where_condition = where_condition.or_where(WhereCondition::new(
+                "(block_number >= ?* and block_number < ?*)",
+                vec![
+                    Value::Integer(block_range.start as i64),
+                    Value::Integer(block_range.end as i64),
+                ],
+            ))
+        }
+
+        where_condition
+    }
+
     pub fn get_transaction_between_blocks_condition(
         &self,
         range: Range<BlockNumber>,

mithril-aggregator/src/database/provider/cardano_transaction/get_cardano_transaction.rs

@@ -313,6 +313,20 @@ impl TransactionsRetriever for CardanoTransactionRepository {
             .map(|record| record.into())
             .collect())
     }
+
+    async fn get_by_block_ranges(
+        &self,
+        block_ranges: Vec<BlockRange>,
+    ) -> StdResult<Vec<CardanoTransaction>> {
+        let provider = GetCardanoTransactionProvider::new(&self.connection);
+        let filters = provider.get_transaction_block_ranges_condition(block_ranges);
+        let transactions = provider.find(filters)?;
+
+        Ok(transactions
+            .into_iter()
+            .map(|record| record.into())
+            .collect())
+    }
 }
 
 #[async_trait]
@@ -489,7 +503,7 @@ mod tests {
         let connection = Arc::new(cardano_tx_db_connection().unwrap());
         let repository = CardanoTransactionRepository::new(connection);
 
-        // Build transactions with block numbers from 10 to 40 and immutable file numbers from 12 to 14
+        // Build transactions with block numbers from 20 to 40 and immutable file numbers from 12 to 14
         let cardano_transactions: Vec<CardanoTransactionRecord> = (20..=40)
             .map(|i| CardanoTransactionRecord {
                 transaction_hash: format!("tx-hash-{i}"),
@@ -676,6 +690,63 @@ mod tests {
         );
     }
 
+    #[tokio::test]
+    async fn repository_get_transactions_by_block_ranges() {
+        let connection = Arc::new(cardano_tx_db_connection().unwrap());
+        let repository = CardanoTransactionRepository::new(connection);
+
+        let transactions = vec![
+            CardanoTransaction::new("tx-hash-1", 10, 50, "block-hash-1", 99),
+            CardanoTransaction::new("tx-hash-2", 11, 51, "block-hash-2", 100),
+            CardanoTransaction::new("tx-hash-3", 20, 52, "block-hash-3", 101),
+            CardanoTransaction::new("tx-hash-4", 31, 53, "block-hash-4", 102),
+            CardanoTransaction::new("tx-hash-5", 35, 54, "block-hash-5", 103),
+            CardanoTransaction::new("tx-hash-6", 46, 55, "block-hash-6", 104),
+        ];
+        repository
+            .create_transactions(transactions.clone())
+            .await
+            .unwrap();
+
+        {
+            let transaction_result = repository
+                .get_by_block_ranges(vec![BlockRange::from_block_number(100)])
+                .await
+                .unwrap();
+            assert_eq!(Vec::<CardanoTransaction>::new(), transaction_result);
+        }
+        {
+            let transaction_result = repository
+                .get_by_block_ranges(vec![BlockRange::from_block_number(0)])
+                .await
+                .unwrap();
+            assert_eq!(transactions[0..=1].to_vec(), transaction_result);
+        }
+        {
+            let transaction_result = repository
+                .get_by_block_ranges(vec![
+                    BlockRange::from_block_number(0),
+                    BlockRange::from_block_number(15),
+                ])
+                .await
+                .unwrap();
+            assert_eq!(transactions[0..=2].to_vec(), transaction_result);
+        }
+        {
+            let transaction_result = repository
+                .get_by_block_ranges(vec![
+                    BlockRange::from_block_number(0),
+                    BlockRange::from_block_number(30),
+                ])
+                .await
+                .unwrap();
+            assert_eq!(
+                [transactions[0..=1].to_vec(), transactions[3..=4].to_vec()].concat(),
+                transaction_result
+            );
+        }
+    }
+
     #[tokio::test]
     async fn repository_store_block_range() {
         let connection = Arc::new(cardano_tx_db_connection().unwrap());

mithril-aggregator/src/database/repository/cardano_transaction_repository.rs

@@ -1366,7 +1366,8 @@ impl DependenciesBuilder {
     /// build Prover service
     pub async fn build_prover_service(&mut self) -> Result<Arc<dyn ProverService>> {
         let transaction_retriever = self.get_transaction_repository().await?;
-        let service = MithrilProverService::new(transaction_retriever);
+        let block_range_root_retriever = self.get_transaction_repository().await?;
+        let service = MithrilProverService::new(transaction_retriever, block_range_root_retriever);
 
         Ok(Arc::new(service))
     }