feat: implement 'BlockRangeRootRetriever' for 'CardanoTransactionsRepository' in aggregator

Author: jpraynaud

mithril-aggregator/src/database/provider/block_range_root/get_block_range_root.rs

@@ -1,4 +1,8 @@
-use mithril_persistence::sqlite::{Provider, SourceAlias, SqLiteEntity, SqliteConnection};
+use mithril_common::entities::BlockNumber;
+use mithril_persistence::sqlite::{
+    Provider, SourceAlias, SqLiteEntity, SqliteConnection, WhereCondition,
+};
+use sqlite::Value;
 
 use crate::database::record::BlockRangeRootRecord;
 
@@ -8,11 +12,14 @@ pub struct GetBlockRangeRootProvider<'client> {
 }
 
 impl<'client> GetBlockRangeRootProvider<'client> {
-    #[cfg(test)]
     /// Create a new instance
     pub fn new(connection: &'client SqliteConnection) -> Self {
         Self { connection }
     }
+
+    pub fn get_up_to_block_number_condition(&self, block_number: BlockNumber) -> WhereCondition {
+        WhereCondition::new("end < ?*", vec![Value::Integer(block_number as i64)])
+    }
 }
 
 #[cfg(test)]

mithril-aggregator/src/database/provider/block_range_root/mod.rs

@@ -2,7 +2,6 @@ mod get_block_range_root;
 mod get_interval_without_block_range_provider;
 mod insert_block_range;
 
-#[cfg(test)]
 pub use get_block_range_root::*;
 pub use get_interval_without_block_range_provider::*;
 pub use insert_block_range::*;

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

@@ -2,7 +2,7 @@ use std::ops::Range;
 
 use sqlite::Value;
 
-use mithril_common::entities::{BlockNumber, ImmutableFileNumber, TransactionHash};
+use mithril_common::entities::{BlockNumber, TransactionHash};
 use mithril_persistence::sqlite::{
     Provider, SourceAlias, SqLiteEntity, SqliteConnection, WhereCondition,
 };
@@ -40,16 +40,6 @@ impl<'client> GetCardanoTransactionProvider<'client> {
         WhereCondition::where_in("transaction_hash", hashes_values)
     }
 
-    pub fn get_transaction_up_to_beacon_condition(
-        &self,
-        beacon: ImmutableFileNumber,
-    ) -> WhereCondition {
-        WhereCondition::new(
-            "immutable_file_number <= ?*",
-            vec![Value::Integer(beacon as i64)],
-        )
-    }
-
     pub fn get_transaction_between_blocks_condition(
         &self,
         range: Range<BlockNumber>,

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

@@ -9,12 +9,15 @@ use mithril_common::entities::{
     BlockHash, BlockNumber, BlockRange, CardanoDbBeacon, CardanoTransaction, ImmutableFileNumber,
     SlotNumber, TransactionHash,
 };
+use mithril_common::signable_builder::BlockRangeRootRetriever;
 use mithril_common::StdResult;
 use mithril_persistence::sqlite::{Provider, SqliteConnection, WhereCondition};
+use sqlite::Value;
 
 use crate::database::provider::{
-    GetCardanoTransactionProvider, GetIntervalWithoutBlockRangeRootProvider,
-    InsertBlockRangeRootProvider, InsertCardanoTransactionProvider,
+    GetBlockRangeRootProvider, GetCardanoTransactionProvider,
+    GetIntervalWithoutBlockRangeRootProvider, InsertBlockRangeRootProvider,
+    InsertCardanoTransactionProvider,
 };
 use crate::database::record::{BlockRangeRootRecord, CardanoTransactionRecord};
 use crate::services::{TransactionStore, TransactionsRetriever};
@@ -60,8 +63,14 @@ impl CardanoTransactionRepository {
         &self,
         beacon: ImmutableFileNumber,
     ) -> StdResult<Vec<CardanoTransactionRecord>> {
+        // Get the highest block number for the given immutable number.
+        // This is a temporary fix that will be removed when the retrieval is based on block number instead of immutable number.
+        let block_number = self
+            .get_highest_block_number_for_immutable_number(beacon)
+            .await?
+            .unwrap_or(0);
         let provider = GetCardanoTransactionProvider::new(&self.connection);
-        let filters = provider.get_transaction_up_to_beacon_condition(beacon);
+        let filters = provider.get_transaction_between_blocks_condition(0..block_number);
         let transactions = provider.find(filters)?;
 
         Ok(transactions.collect())
@@ -130,6 +139,48 @@ impl CardanoTransactionRepository {
 
         Ok(cursor.collect())
     }
+
+    // TODO: remove this function when the Cardano transaction signature is based on block number instead of immutable number
+    async fn get_highest_block_number_for_immutable_number(
+        &self,
+        immutable_file_number: ImmutableFileNumber,
+    ) -> StdResult<Option<BlockNumber>> {
+        let sql =
+            "select max(block_number) as highest from cardano_tx where immutable_file_number <= $1;";
+        match self
+            .connection
+            .prepare(sql)
+            .with_context(|| {
+                format!(
+                    "Prepare query error: SQL=`{}`",
+                    &sql.replace('\n', " ").trim()
+                )
+            })?
+            .iter()
+            .bind::<&[(_, Value)]>(&[(1, Value::Integer(immutable_file_number as i64))])?
+            .next()
+        {
+            None => Ok(None),
+            Some(row) => {
+                let highest = row?.read::<Option<i64>, _>(0);
+                highest
+                    .map(u64::try_from)
+                    .transpose()
+                    .with_context(||
+                        format!("Integer field max(block_number) (value={highest:?}) is incompatible with u64 representation.")
+                    )
+            }
+        }
+    }
+
+    #[cfg(test)]
+    pub(crate) async fn get_all(&self) -> StdResult<Vec<CardanoTransaction>> {
+        let provider = GetCardanoTransactionProvider::new(&self.connection);
+        let filters = WhereCondition::default();
+        let transactions = provider.find(filters)?;
+
+        Ok(transactions.map(|record| record.into()).collect::<Vec<_>>())
+    }
 }
 
 #[cfg(test)]
@@ -261,6 +312,31 @@ impl TransactionsRetriever for CardanoTransactionRepository {
     }
 }
 
+#[async_trait]
+impl BlockRangeRootRetriever for CardanoTransactionRepository {
+    async fn retrieve_block_range_roots(
+        &self,
+        up_to_beacon: ImmutableFileNumber,
+    ) -> StdResult<Box<dyn Iterator<Item = (BlockRange, MKTreeNode)>>> {
+        // Get the highest block number for the given immutable number.
+        // This is a temporary fix that will be removed when the retrieval is based on block number instead of immutable number.
+        let block_number = self
+            .get_highest_block_number_for_immutable_number(up_to_beacon)
+            .await?
+            .unwrap_or(0);
+        let provider = GetBlockRangeRootProvider::new(&self.connection);
+        let filters = provider.get_up_to_block_number_condition(block_number);
+        let block_range_roots = provider.find(filters)?;
+        let block_range_roots = block_range_roots
+            .into_iter()
+            .map(|record| -> (BlockRange, MKTreeNode) { record.into() })
+            .collect::<Vec<_>>() // TODO: remove this collect when we should ba able return the iterator directly
+            .into_iter();
+
+        Ok(Box::new(block_range_roots))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use mithril_persistence::sqlite::GetAllProvider;
@@ -413,7 +489,7 @@ mod tests {
         let cardano_transactions: Vec<CardanoTransactionRecord> = (20..=40)
             .map(|i| CardanoTransactionRecord {
                 transaction_hash: format!("tx-hash-{i}"),
-                block_number: i % 10,
+                block_number: i / 10,
                 slot_number: i * 100,
                 block_hash: format!("block-hash-{i}"),
                 immutable_file_number: i,
@@ -425,10 +501,10 @@ mod tests {
             .unwrap();
 
         let transaction_result = repository.get_transactions_up_to(34).await.unwrap();
-        assert_eq!(cardano_transactions[0..=14].to_vec(), transaction_result);
+        assert_eq!(cardano_transactions[0..10].to_vec(), transaction_result);
 
         let transaction_result = repository.get_transactions_up_to(300).await.unwrap();
-        assert_eq!(cardano_transactions.clone(), transaction_result);
+        assert_eq!(cardano_transactions[0..20].to_vec(), transaction_result);
 
         let transaction_result = repository.get_transactions_up_to(19).await.unwrap();
         assert_eq!(Vec::<CardanoTransactionRecord>::new(), transaction_result);