Merge pull request #2922 from input-output-hk/djo/2905/new_cardano_blocks_txs_signed_entity

Alenar · web-flow · commit 9072d5bfbe3e · 2026-01-15T12:45:10.000+01:00
feat: add new `CardanoBlocksTransactions` to `SignedEntityTypes`
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/internal/mithril-persistence/Cargo.toml b/internal/mithril-persistence/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-persistence"
-version = "0.2.60"
+version = "0.2.61"
 description = "Common types, interfaces, and utilities to persist data for Mithril nodes."
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/internal/mithril-persistence/src/database/hydrator.rs b/internal/mithril-persistence/src/database/hydrator.rs
@@ -85,6 +85,21 @@ impl Hydrator {
                     })?;
                 SignedEntityType::CardanoTransactions(beacon.epoch, beacon.block_number)
             }
+            SignedEntityTypeDiscriminants::CardanoBlocksTransactions => {
+                #[derive(Deserialize)]
+                struct CardanoBlocksTransactionsBeacon {
+                    epoch: Epoch,
+                    block_number: BlockNumber,
+                }
+
+                let beacon: CardanoBlocksTransactionsBeacon = serde_json::from_str(beacon_str)
+                    .map_err(|e| {
+                        HydrationError::InvalidData(format!(
+                            "Invalid Beacon JSON in open_message.beacon: '{beacon_str}'. Error: {e}"
+                        ))
+                    })?;
+                SignedEntityType::CardanoBlocksTransactions(beacon.epoch, beacon.block_number)
+            }
             SignedEntityTypeDiscriminants::CardanoDatabase => {
                 let beacon: CardanoDbBeacon = serde_json::from_str(beacon_str).map_err(|e| {
                     HydrationError::InvalidData(format!(
@@ -104,7 +119,7 @@ mod tests {
     use super::*;
 
     #[test]
-    fn hydrate_cardano_transaction_signed_entity_type() {
+    fn hydrate_cardano_transactions_signed_entity_type() {
         let expected = SignedEntityType::CardanoTransactions(Epoch(35), BlockNumber(77));
         let signed_entity = Hydrator::hydrate_signed_entity_type(
             SignedEntityTypeDiscriminants::CardanoTransactions.index(),
@@ -115,6 +130,18 @@ mod tests {
         assert_eq!(expected, signed_entity);
     }
 
+    #[test]
+    fn hydrate_cardano_blocks_transactions_signed_entity_type() {
+        let expected = SignedEntityType::CardanoBlocksTransactions(Epoch(37), BlockNumber(79));
+        let signed_entity = Hydrator::hydrate_signed_entity_type(
+            SignedEntityTypeDiscriminants::CardanoBlocksTransactions.index(),
+            &expected.get_json_beacon().unwrap(),
+        )
+        .unwrap();
+
+        assert_eq!(expected, signed_entity);
+    }
+
     #[test]
     fn hydrate_cardano_database_signed_entity_type() {
         let expected = SignedEntityType::CardanoDatabase(CardanoDbBeacon::new(84, 239));
diff --git a/mithril-aggregator/Cargo.toml b/mithril-aggregator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.8.9"
+version = "0.8.10"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/mithril-aggregator/src/database/migration.rs b/mithril-aggregator/src/database/migration.rs
@@ -276,5 +276,14 @@ pragma foreign_key_check;
 pragma foreign_keys=true;
         "#,
         ),
+        // Migration 38
+        // Add the `signed_entity_type` record for 'CardanoBlocksTransactions'
+        SqlMigration::new(
+            38,
+            r#"
+insert into signed_entity_type (signed_entity_type_id, name)
+    values  (5, 'Cardano Blocks and Transactions');
+        "#,
+        ),
     ]
 }
diff --git a/mithril-aggregator/src/database/record/signed_entity.rs b/mithril-aggregator/src/database/record/signed_entity.rs
@@ -113,6 +113,9 @@ impl SignedEntityRecord {
                 let artifact = fake_data::cardano_transactions_snapshot(block_number);
                 get_id_and_artifact(&artifact)
             }
+            SignedEntityType::CardanoBlocksTransactions(_epoch, _block_number) => {
+                panic!("Cardano blocks transactions is not supported yet")
+            }
         };
 
         SignedEntityRecord {
diff --git a/mithril-aggregator/src/metrics/service.rs b/mithril-aggregator/src/metrics/service.rs
@@ -123,6 +123,10 @@ build_metrics_service!(
         "mithril_aggregator_artifact_cardano_transaction_total_produced_since_startup",
         "Number of Cardano transaction artifacts produced since startup on a Mithril aggregator node"
     ),
+    artifact_cardano_blocks_transactions_total_produced_since_startup:MetricCounter(
+        "mithril_aggregator_artifact_cardano_blocks_transactions_total_produced_since_startup",
+        "Number of Cardano blocks transactions artifacts produced since startup on a Mithril aggregator node"
+    ),
     runtime_cycle_success_since_startup:MetricCounter(
         "mithril_aggregator_runtime_cycle_success_since_startup",
         "Number of successful runtime cycles since startup on a Mithril aggregator"
diff --git a/mithril-aggregator/src/services/signed_entity.rs b/mithril-aggregator/src/services/signed_entity.rs
@@ -265,6 +265,8 @@ impl MithrilSignedEntityService {
                         )
                     })?,
             )),
+            SignedEntityType::CardanoBlocksTransactions(_epoch, _block_number) =>
+                Err(anyhow!("Cardano blocks transactions is not supported yet")),
             SignedEntityType::CardanoDatabase(beacon) => Ok(Arc::new(
                 self.cardano_database_artifact_builder
                     .compute_artifact(beacon, certificate)
@@ -299,19 +301,22 @@ impl MithrilSignedEntityService {
     ) {
         let metrics = self.metrics_service.clone();
         let metric_counter = match signed_entity_type {
-            SignedEntityType::MithrilStakeDistribution(_) => {
+            SignedEntityType::MithrilStakeDistribution(..) => {
                 metrics.get_artifact_mithril_stake_distribution_total_produced_since_startup()
             }
-            SignedEntityType::CardanoImmutableFilesFull(_) => {
+            SignedEntityType::CardanoImmutableFilesFull(..) => {
                 metrics.get_artifact_cardano_immutable_files_full_total_produced_since_startup()
             }
-            SignedEntityType::CardanoStakeDistribution(_) => {
+            SignedEntityType::CardanoStakeDistribution(..) => {
                 metrics.get_artifact_cardano_stake_distribution_total_produced_since_startup()
             }
-            SignedEntityType::CardanoTransactions(_, _) => {
+            SignedEntityType::CardanoTransactions(..) => {
                 metrics.get_artifact_cardano_transaction_total_produced_since_startup()
             }
-            SignedEntityType::CardanoDatabase(_) => {
+            SignedEntityType::CardanoBlocksTransactions(..) => {
+                metrics.get_artifact_cardano_blocks_transactions_total_produced_since_startup()
+            }
+            SignedEntityType::CardanoDatabase(..) => {
                 metrics.get_artifact_cardano_database_total_produced_since_startup()
             }
         };
@@ -697,19 +702,22 @@ mod tests {
         signed_entity_type: &SignedEntityType,
     ) -> CounterValue {
         match signed_entity_type {
-            SignedEntityType::MithrilStakeDistribution(_) => metrics_service
+            SignedEntityType::MithrilStakeDistribution(..) => metrics_service
                 .get_artifact_mithril_stake_distribution_total_produced_since_startup()
                 .get(),
-            SignedEntityType::CardanoImmutableFilesFull(_) => metrics_service
+            SignedEntityType::CardanoImmutableFilesFull(..) => metrics_service
                 .get_artifact_cardano_immutable_files_full_total_produced_since_startup()
                 .get(),
-            SignedEntityType::CardanoStakeDistribution(_) => metrics_service
+            SignedEntityType::CardanoStakeDistribution(..) => metrics_service
                 .get_artifact_cardano_stake_distribution_total_produced_since_startup()
                 .get(),
-            SignedEntityType::CardanoTransactions(_, _) => metrics_service
+            SignedEntityType::CardanoTransactions(..) => metrics_service
                 .get_artifact_cardano_transaction_total_produced_since_startup()
                 .get(),
-            SignedEntityType::CardanoDatabase(_) => metrics_service
+            SignedEntityType::CardanoBlocksTransactions(..) => metrics_service
+                .get_artifact_cardano_blocks_transactions_total_produced_since_startup()
+                .get(),
+            SignedEntityType::CardanoDatabase(..) => metrics_service
                 .get_artifact_cardano_database_total_produced_since_startup()
                 .get(),
         }
diff --git a/mithril-aggregator/src/tools/certificates_hash_migrator.rs b/mithril-aggregator/src/tools/certificates_hash_migrator.rs
@@ -295,6 +295,9 @@ mod test {
                     SignedEntityType::CardanoTransactions(epoch, block_number) => {
                         format!("cardano-transactions-{epoch}-{block_number}",)
                     }
+                    SignedEntityType::CardanoBlocksTransactions(epoch, block_number) => {
+                        format!("cardano-blocks-transactions-{epoch}-{block_number}",)
+                    }
                     SignedEntityType::CardanoDatabase(beacon) => {
                         format!(
                             "cardano-database-{}-{}",
diff --git a/mithril-aggregator/tests/test_extensions/aggregator_observer.rs b/mithril-aggregator/tests/test_extensions/aggregator_observer.rs
@@ -1,4 +1,4 @@
-use anyhow::Context;
+use anyhow::{Context, anyhow};
 use std::sync::Arc;
 
 use mithril_aggregator::{
@@ -113,35 +113,40 @@ impl AggregatorObserver {
         signed_entity_type_expected: &SignedEntityType,
     ) -> StdResult<bool> {
         match signed_entity_type_expected {
-            SignedEntityType::CardanoImmutableFilesFull(_) => Ok(Some(signed_entity_type_expected)
-                == self
-                    .signed_entity_service
-                    .get_last_signed_snapshots(1)
-                    .await?
-                    .first()
-                    .map(|s| &s.signed_entity_type)),
-            SignedEntityType::MithrilStakeDistribution(_) => Ok(Some(signed_entity_type_expected)
+            SignedEntityType::CardanoImmutableFilesFull(..) => {
+                Ok(Some(signed_entity_type_expected)
+                    == self
+                        .signed_entity_service
+                        .get_last_signed_snapshots(1)
+                        .await?
+                        .first()
+                        .map(|s| &s.signed_entity_type))
+            }
+            SignedEntityType::MithrilStakeDistribution(..) => Ok(Some(signed_entity_type_expected)
                 == self
                     .signed_entity_service
                     .get_last_signed_mithril_stake_distributions(1)
                     .await?
                     .first()
                     .map(|s| &s.signed_entity_type)),
-            SignedEntityType::CardanoTransactions(_, _) => Ok(Some(signed_entity_type_expected)
+            SignedEntityType::CardanoTransactions(..) => Ok(Some(signed_entity_type_expected)
                 == self
                     .signed_entity_service
                     .get_last_cardano_transaction_snapshot()
                     .await?
                     .map(|s| s.signed_entity_type)
                     .as_ref()),
-            SignedEntityType::CardanoStakeDistribution(_) => Ok(Some(signed_entity_type_expected)
+            SignedEntityType::CardanoBlocksTransactions(..) => {
+                Err(anyhow!("Cardano blocks transactions is not supported yet"))
+            }
+            SignedEntityType::CardanoStakeDistribution(..) => Ok(Some(signed_entity_type_expected)
                 == self
                     .signed_entity_service
                     .get_last_signed_cardano_stake_distributions(1)
                     .await?
                     .first()
                     .map(|s| &s.signed_entity_type)),
-            SignedEntityType::CardanoDatabase(_) => Ok(Some(signed_entity_type_expected)
+            SignedEntityType::CardanoDatabase(..) => Ok(Some(signed_entity_type_expected)
                 == self
                     .signed_entity_service
                     .get_last_signed_cardano_database_snapshots(1)
diff --git a/mithril-common/Cargo.toml b/mithril-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-common"
-version = "0.6.41"
+version = "0.6.42"
 description = "Common types, interfaces, and utilities for Mithril nodes."
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/mithril-common/src/entities/signed_entity_config.rs b/mithril-common/src/entities/signed_entity_config.rs
@@ -74,11 +74,14 @@ impl SignedEntityConfig {
                     ),
                     None => {
                         anyhow::bail!(
-                            "Can't derive a CardanoTransactions signed entity type from a time point without a `CardanoTransactionsSigningConfig`"
+                            "Can't derive a `CardanoTransactions` signed entity type from a time point without a `CardanoTransactionsSigningConfig`"
                         )
                     }
                 }
             }
+            SignedEntityTypeDiscriminants::CardanoBlocksTransactions => {
+                anyhow::bail!("Cardano blocks transactions is not supported yet")
+            }
             SignedEntityTypeDiscriminants::CardanoDatabase => SignedEntityType::CardanoDatabase(
                 CardanoDbBeacon::new(*time_point.epoch, time_point.immutable_file_number),
             ),
@@ -254,7 +257,7 @@ mod tests {
             )
             .unwrap_err();
 
-        let expected_error = "Can't derive a CardanoTransactions signed entity type from a time point without a `CardanoTransactionsSigningConfig`";
+        let expected_error = "Can't derive a `CardanoTransactions` signed entity type from a time point without a `CardanoTransactionsSigningConfig`";
         assert!(
             error.to_string().contains(expected_error),
             "Error message: {error:?}\nshould contains: {expected_error}\n"
diff --git a/mithril-common/src/entities/signed_entity_type.rs b/mithril-common/src/entities/signed_entity_type.rs
diff --git a/mithril-common/src/signable_builder/signable_builder_service.rs b/mithril-common/src/signable_builder/signable_builder_service.rs
diff --git a/mithril-signer/Cargo.toml b/mithril-signer/Cargo.toml
diff --git a/mithril-signer/src/database/migration.rs b/mithril-signer/src/database/migration.rs

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,9 @@ impl SignedEntityRecord {`
`113`	`113`	`let artifact = fake_data::cardano_transactions_snapshot(block_number);`
`114`	`114`	`get_id_and_artifact(&artifact)`
`115`	`115`	`}`
	`116`	`+ SignedEntityType::CardanoBlocksTransactions(_epoch, _block_number) => {`
	`117`	`+ panic!("Cardano blocks transactions is not supported yet")`
	`118`	`+ }`
`116`	`119`	`};`
`117`	`120`
`118`	`121`	`SignedEntityRecord {`