From fb803703ec800431ecca8a21f2fe1deb3aac8bc2 Mon Sep 17 00:00:00 2001
From: DJO <790521+Alenar@users.noreply.github.com>
Date: Thu, 7 Nov 2024 16:51:54 +0100
Subject: [PATCH 1/7] feat: remove `network` from `CardanoDbBeacon` entity

WARNING: this change invalidate hashes of certificate that with signed
entity type of type `CardanoImmutableFilesFull`, the
`recompute-certificates-hash` command must be run on aggregators in
order to keep their certificate chain valid.
---
 .../src/database/hydrator.rs                  |  2 +-
 .../cardano_immutable_files_full.rs           |  2 +-
 .../src/database/record/certificate.rs        |  1 -
 .../repository/open_message_repository.rs     |  2 +-
 .../routes/artifact_routes/snapshot.rs        |  2 +-
 .../to_certificate_pending_message.rs         |  2 +-
 .../services/certifier/certifier_service.rs   | 24 +++---
 mithril-aggregator/tests/certificate_chain.rs | 18 +----
 .../tests/create_certificate.rs               |  6 +-
 .../tests/open_message_expiration.rs          |  6 +-
 .../tests/open_message_newer_exists.rs        |  6 +-
 .../src/commands/cardano_db/download.rs       |  2 +-
 mithril-common/benches/digester.rs            |  5 +-
 .../digesters/cardano_immutable_digester.rs   | 34 ++++----
 .../src/entities/cardano_db_beacon.rs         | 77 ++++---------------
 .../src/entities/signed_entity_config.rs      |  8 +-
 .../src/entities/signed_entity_type.rs        | 19 ++---
 .../signed_entity_type_message.rs             | 40 ++++------
 mithril-common/src/test_utils/fake_data.rs    | 15 +---
 .../to_register_signature_message.rs          |  2 +-
 ...te_cardano_transaction_single_signature.rs |  2 +-
 ...e_immutable_files_full_single_signature.rs |  4 +-
 .../src/bin/load-aggregator/main.rs           |  1 -
 .../src/stress_test/payload_builder.rs        |  1 -
 24 files changed, 80 insertions(+), 201 deletions(-)

diff --git a/internal/mithril-persistence/src/database/hydrator.rs b/internal/mithril-persistence/src/database/hydrator.rs
index 8a3c73fa4e8..b5940eb96df 100644
--- a/internal/mithril-persistence/src/database/hydrator.rs
+++ b/internal/mithril-persistence/src/database/hydrator.rs
@@ -18,7 +18,7 @@ impl Hydrator {
         column_index: U,
     ) -> String {
         // We need to check first that the cell can be read as a string first
-        // (e.g. when beacon json is '{"network": "dev", "epoch": 1, "immutable_file_number": 2}').
+        // (e.g. when beacon json is '{"epoch": 1, "immutable_file_number": 2}').
         // If it fails, we fallback on reading the cell as an integer (e.g. when beacon json is '5').
         // TODO: Maybe there is a better way of doing this.
         match row.try_read::<&str, _>(column_index.clone()) {
diff --git a/mithril-aggregator/src/artifact_builder/cardano_immutable_files_full.rs b/mithril-aggregator/src/artifact_builder/cardano_immutable_files_full.rs
index 7cd4207053a..293e3e8a57d 100644
--- a/mithril-aggregator/src/artifact_builder/cardano_immutable_files_full.rs
+++ b/mithril-aggregator/src/artifact_builder/cardano_immutable_files_full.rs
@@ -256,7 +256,7 @@ mod tests {
     #[tokio::test]
     async fn snapshot_archive_name_after_beacon_values() {
         let network = fake_data::network();
-        let beacon = CardanoDbBeacon::new("network".to_string(), 20, 145);
+        let beacon = CardanoDbBeacon::new(20, 145);
         let digest = "test+digest";
 
         let cardano_immutable_files_full_artifact_builder =
diff --git a/mithril-aggregator/src/database/record/certificate.rs b/mithril-aggregator/src/database/record/certificate.rs
index 9a6d02dd96a..adb8c9c251c 100644
--- a/mithril-aggregator/src/database/record/certificate.rs
+++ b/mithril-aggregator/src/database/record/certificate.rs
@@ -88,7 +88,6 @@ impl CertificateRecord {
             parent_id,
             epoch,
             SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(
-                fake_data::network(),
                 *epoch,
                 immutable_file_number,
             )),
diff --git a/mithril-aggregator/src/database/repository/open_message_repository.rs b/mithril-aggregator/src/database/repository/open_message_repository.rs
index e56880bf9f2..0c682f23e05 100644
--- a/mithril-aggregator/src/database/repository/open_message_repository.rs
+++ b/mithril-aggregator/src/database/repository/open_message_repository.rs
@@ -183,7 +183,7 @@ mod tests {
 
         for signed_entity_type in [
             SignedEntityType::MithrilStakeDistribution(epoch),
-            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new("devnet", *epoch, 1)),
+            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(*epoch, 1)),
             SignedEntityType::CardanoTransactions(epoch, BlockNumber(100)),
         ] {
             repository
diff --git a/mithril-aggregator/src/http_server/routes/artifact_routes/snapshot.rs b/mithril-aggregator/src/http_server/routes/artifact_routes/snapshot.rs
index 8d102697968..7e0962338ac 100644
--- a/mithril-aggregator/src/http_server/routes/artifact_routes/snapshot.rs
+++ b/mithril-aggregator/src/http_server/routes/artifact_routes/snapshot.rs
@@ -458,7 +458,7 @@ mod tests {
         let signed_entity = create_signed_entity(
             SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::default()),
             Snapshot {
-                beacon: CardanoDbBeacon::new(network, 1, 10),
+                beacon: CardanoDbBeacon::new(1, 10),
                 ..fake_data::snapshots(1)[0].clone()
             },
         );
diff --git a/mithril-aggregator/src/message_adapters/to_certificate_pending_message.rs b/mithril-aggregator/src/message_adapters/to_certificate_pending_message.rs
index ec129ea607f..6c5e9210b47 100644
--- a/mithril-aggregator/src/message_adapters/to_certificate_pending_message.rs
+++ b/mithril-aggregator/src/message_adapters/to_certificate_pending_message.rs
@@ -77,7 +77,7 @@ mod tests {
     #[test]
     fn adapt_on_other_than_cardano_immutable_files_full_signed_entity_type_ok() {
         let mut certificate_pending = fake_data::certificate_pending();
-        let beacon = CardanoDbBeacon::new("", 0, 0);
+        let beacon = CardanoDbBeacon::new(0, 0);
         certificate_pending.signed_entity_type =
             SignedEntityType::MithrilStakeDistribution(Epoch(15));
 
diff --git a/mithril-aggregator/src/services/certifier/certifier_service.rs b/mithril-aggregator/src/services/certifier/certifier_service.rs
index 61c6db81e02..5c6ae5b3378 100644
--- a/mithril-aggregator/src/services/certifier/certifier_service.rs
+++ b/mithril-aggregator/src/services/certifier/certifier_service.rs
@@ -470,7 +470,7 @@ mod tests {
 
     #[tokio::test]
     async fn should_clean_epoch_when_inform_epoch() {
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 1, 1);
+        let beacon = CardanoDbBeacon::new(1, 1);
         let signed_entity_type = SignedEntityType::CardanoImmutableFilesFull(beacon.clone());
         let protocol_message = ProtocolMessage::new();
         let epoch = beacon.epoch;
@@ -491,7 +491,7 @@ mod tests {
 
     #[tokio::test]
     async fn should_mark_open_message_expired_when_exists() {
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 3, 1);
+        let beacon = CardanoDbBeacon::new(3, 1);
         let signed_entity_type = SignedEntityType::CardanoImmutableFilesFull(beacon.clone());
         let protocol_message = ProtocolMessage::new();
         let epochs_with_signers = (1..=5).map(Epoch).collect::<Vec<_>>();
@@ -523,7 +523,7 @@ mod tests {
 
     #[tokio::test]
     async fn should_not_mark_open_message_expired_when_does_not_expire() {
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 3, 1);
+        let beacon = CardanoDbBeacon::new(3, 1);
         let signed_entity_type = SignedEntityType::CardanoImmutableFilesFull(beacon.clone());
         let protocol_message = ProtocolMessage::new();
         let epochs_with_signers = (1..=5).map(Epoch).collect::<Vec<_>>();
@@ -550,7 +550,7 @@ mod tests {
 
     #[tokio::test]
     async fn should_not_mark_open_message_expired_when_has_not_expired_yet() {
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 3, 1);
+        let beacon = CardanoDbBeacon::new(3, 1);
         let signed_entity_type = SignedEntityType::CardanoImmutableFilesFull(beacon.clone());
         let protocol_message = ProtocolMessage::new();
         let epochs_with_signers = (1..=5).map(Epoch).collect::<Vec<_>>();
@@ -577,7 +577,7 @@ mod tests {
 
     #[tokio::test]
     async fn should_register_valid_single_signature() {
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 3, 1);
+        let beacon = CardanoDbBeacon::new(3, 1);
         let signed_entity_type = SignedEntityType::CardanoImmutableFilesFull(beacon.clone());
         let protocol_message = ProtocolMessage::new();
         let epochs_with_signers = (1..=3).map(Epoch).collect::<Vec<_>>();
@@ -610,7 +610,7 @@ mod tests {
 
     #[tokio::test]
     async fn should_not_register_invalid_single_signature() {
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 3, 1);
+        let beacon = CardanoDbBeacon::new(3, 1);
         let signed_entity_type = SignedEntityType::CardanoImmutableFilesFull(beacon.clone());
         let mut protocol_message = ProtocolMessage::new();
         let epochs_with_signers = (1..=5).map(Epoch).collect::<Vec<_>>();
@@ -650,7 +650,7 @@ mod tests {
 
     #[tokio::test]
     async fn should_not_register_single_signature_for_certified_open_message() {
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 3, 1);
+        let beacon = CardanoDbBeacon::new(3, 1);
         let signed_entity_type = SignedEntityType::CardanoImmutableFilesFull(beacon.clone());
         let protocol_message = ProtocolMessage::new();
         let epochs_with_signers = (1..=5).map(Epoch).collect::<Vec<_>>();
@@ -682,7 +682,7 @@ mod tests {
 
     #[tokio::test]
     async fn should_not_register_single_signature_for_expired_open_message() {
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 3, 1);
+        let beacon = CardanoDbBeacon::new(3, 1);
         let signed_entity_type = SignedEntityType::CardanoImmutableFilesFull(beacon.clone());
         let protocol_message = ProtocolMessage::new();
         let epochs_with_signers = (1..=5).map(Epoch).collect::<Vec<_>>();
@@ -715,7 +715,7 @@ mod tests {
     #[tokio::test]
     async fn should_create_certificate_when_multi_signature_produced() {
         let network = fake_data::network();
-        let beacon = CardanoDbBeacon::new(network, 3, 1);
+        let beacon = CardanoDbBeacon::new(3, 1);
         let signed_entity_type = SignedEntityType::CardanoImmutableFilesFull(beacon.clone());
         let protocol_message = ProtocolMessage::new();
         let epochs_with_signers = (1..=3).map(Epoch).collect::<Vec<_>>();
@@ -789,7 +789,7 @@ mod tests {
 
     #[tokio::test]
     async fn should_not_create_certificate_for_open_message_not_created() {
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 1, 1);
+        let beacon = CardanoDbBeacon::new(1, 1);
         let signed_entity_type = SignedEntityType::CardanoImmutableFilesFull(beacon.clone());
         let epochs_with_signers = (1..=5).map(Epoch).collect::<Vec<_>>();
         let fixture = MithrilFixtureBuilder::default().with_signers(5).build();
@@ -802,7 +802,7 @@ mod tests {
 
     #[tokio::test]
     async fn should_not_create_certificate_for_open_message_already_certified() {
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 1, 1);
+        let beacon = CardanoDbBeacon::new(1, 1);
         let signed_entity_type = SignedEntityType::CardanoImmutableFilesFull(beacon.clone());
         let protocol_message = ProtocolMessage::new();
         let epoch = beacon.epoch;
@@ -826,7 +826,7 @@ mod tests {
         mock_multi_signer
             .expect_create_multi_signature()
             .return_once(move |_| Ok(None));
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 1, 1);
+        let beacon = CardanoDbBeacon::new(1, 1);
         let signed_entity_type = SignedEntityType::CardanoImmutableFilesFull(beacon.clone());
         let protocol_message = ProtocolMessage::new();
         let epochs_with_signers = (1..=5).map(Epoch).collect::<Vec<_>>();
diff --git a/mithril-aggregator/tests/certificate_chain.rs b/mithril-aggregator/tests/certificate_chain.rs
index 2fb3fbfe33d..6ffc443b25b 100644
--- a/mithril-aggregator/tests/certificate_chain.rs
+++ b/mithril-aggregator/tests/certificate_chain.rs
@@ -106,11 +106,7 @@ async fn certificate_chain() {
             Epoch(1),
             StakeDistributionParty::from_signers(initial_fixture.signers_with_stake()).as_slice(),
             initial_fixture.compute_and_encode_avk(),
-            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(
-                "devnet".to_string(),
-                1,
-                3
-            )),
+            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(1, 3)),
             ExpectedCertificate::genesis_identifier(Epoch(1)),
         )
     );
@@ -135,11 +131,7 @@ async fn certificate_chain() {
             Epoch(1),
             StakeDistributionParty::from_signers(initial_fixture.signers_with_stake()).as_slice(),
             initial_fixture.compute_and_encode_avk(),
-            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(
-                "devnet".to_string(),
-                1,
-                4
-            )),
+            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(1, 4)),
             ExpectedCertificate::genesis_identifier(Epoch(1)),
         )
     );
@@ -296,11 +288,7 @@ async fn certificate_chain() {
             Epoch(4),
             StakeDistributionParty::from_signers(next_fixture.signers_with_stake()).as_slice(),
             next_fixture.compute_and_encode_avk(),
-            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(
-                "devnet".to_string(),
-                4,
-                7
-            )),
+            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(4, 7)),
             ExpectedCertificate::identifier(&SignedEntityType::MithrilStakeDistribution(Epoch(4))),
         )
     );
diff --git a/mithril-aggregator/tests/create_certificate.rs b/mithril-aggregator/tests/create_certificate.rs
index 7396dcc93d0..1042e74e486 100644
--- a/mithril-aggregator/tests/create_certificate.rs
+++ b/mithril-aggregator/tests/create_certificate.rs
@@ -123,11 +123,7 @@ async fn create_certificate() {
                 .map(|s| s.signer_with_stake.clone().into())
                 .collect::<Vec<_>>(),
             fixture.compute_and_encode_avk(),
-            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(
-                "devnet".to_string(),
-                1,
-                3
-            )),
+            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(1, 3)),
             ExpectedCertificate::genesis_identifier(Epoch(1)),
         )
     );
diff --git a/mithril-aggregator/tests/open_message_expiration.rs b/mithril-aggregator/tests/open_message_expiration.rs
index 2c3ef01a16e..4073392e1ff 100644
--- a/mithril-aggregator/tests/open_message_expiration.rs
+++ b/mithril-aggregator/tests/open_message_expiration.rs
@@ -120,11 +120,7 @@ async fn open_message_expiration() {
                 .map(|s| s.signer_with_stake.clone().into())
                 .collect::<Vec<_>>(),
             fixture.compute_and_encode_avk(),
-            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(
-                "devnet".to_string(),
-                1,
-                3
-            )),
+            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(1, 3)),
             ExpectedCertificate::genesis_identifier(Epoch(1)),
         )
     );
diff --git a/mithril-aggregator/tests/open_message_newer_exists.rs b/mithril-aggregator/tests/open_message_newer_exists.rs
index b2c5b4fcb4f..1fb9f391ab8 100644
--- a/mithril-aggregator/tests/open_message_newer_exists.rs
+++ b/mithril-aggregator/tests/open_message_newer_exists.rs
@@ -123,11 +123,7 @@ async fn open_message_newer_exists() {
                 .map(|s| s.signer_with_stake.clone().into())
                 .collect::<Vec<_>>(),
             fixture.compute_and_encode_avk(),
-            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(
-                "devnet".to_string(),
-                1,
-                4
-            )),
+            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(1, 4)),
             ExpectedCertificate::genesis_identifier(Epoch(1)),
         )
     );
diff --git a/mithril-client-cli/src/commands/cardano_db/download.rs b/mithril-client-cli/src/commands/cardano_db/download.rs
index 14680e24d0f..4da72b5a05f 100644
--- a/mithril-client-cli/src/commands/cardano_db/download.rs
+++ b/mithril-client-cli/src/commands/cardano_db/download.rs
@@ -365,7 +365,7 @@ mod tests {
             ProtocolMessagePartKey::NextAggregateVerificationKey,
             "whatever".to_string(),
         );
-        let beacon = CardanoDbBeacon::new("testnet".to_string(), 10, 100);
+        let beacon = CardanoDbBeacon::new(10, 100);
 
         MithrilCertificate {
             hash: "hash".to_string(),
diff --git a/mithril-common/benches/digester.rs b/mithril-common/benches/digester.rs
index 8bd3bc83e5f..08f9ea033e8 100644
--- a/mithril-common/benches/digester.rs
+++ b/mithril-common/benches/digester.rs
@@ -62,10 +62,7 @@ async fn compute_digest(
     let digester =
         CardanoImmutableDigester::new("devnet".to_string(), cache_provider, create_logger());
     digester
-        .compute_digest(
-            &db_dir(),
-            &CardanoDbBeacon::new("devnet".to_string(), 1, number_of_immutables),
-        )
+        .compute_digest(&db_dir(), &CardanoDbBeacon::new(1, number_of_immutables))
         .await
         .expect("digest computation should not fail");
 }
diff --git a/mithril-common/src/digesters/cardano_immutable_digester.rs b/mithril-common/src/digesters/cardano_immutable_digester.rs
index 65d3beceda9..2c33d2a33ad 100644
--- a/mithril-common/src/digesters/cardano_immutable_digester.rs
+++ b/mithril-common/src/digesters/cardano_immutable_digester.rs
@@ -215,28 +215,22 @@ mod tests {
 
         assert_eq!(
             hash_expected,
-            compute_beacon_hash(
-                network,
-                &CardanoDbBeacon::new("whatever", epoch, immutable_file_number)
-            )
+            compute_beacon_hash(network, &CardanoDbBeacon::new(epoch, immutable_file_number))
         );
         assert_ne!(
             hash_expected,
             compute_beacon_hash(
                 "mainnet",
-                &CardanoDbBeacon::new("whatever", epoch, immutable_file_number)
+                &CardanoDbBeacon::new(epoch, immutable_file_number)
             )
         );
         assert_ne!(
             hash_expected,
-            compute_beacon_hash(
-                network,
-                &CardanoDbBeacon::new("whatever", 20, immutable_file_number)
-            )
+            compute_beacon_hash(network, &CardanoDbBeacon::new(20, immutable_file_number))
         );
         assert_ne!(
             hash_expected,
-            compute_beacon_hash(network, &CardanoDbBeacon::new("whatever", epoch, 200))
+            compute_beacon_hash(network, &CardanoDbBeacon::new(epoch, 200))
         );
     }
 
@@ -271,7 +265,7 @@ mod tests {
         let immutable_db = db_builder("fail_if_no_file_in_folder").build();
         let digester =
             CardanoImmutableDigester::new("devnet".to_string(), None, TestLogger::stdout());
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 1, 1);
+        let beacon = CardanoDbBeacon::new(1, 1);
 
         let result = digester
             .compute_digest(&immutable_db.dir, &beacon)
@@ -298,7 +292,7 @@ mod tests {
             .build();
         let digester =
             CardanoImmutableDigester::new("devnet".to_string(), None, TestLogger::stdout());
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 1, 1);
+        let beacon = CardanoDbBeacon::new(1, 1);
 
         assert!(digester
             .compute_digest(&immutable_db.dir, &beacon)
@@ -313,7 +307,7 @@ mod tests {
             .build();
         let digester =
             CardanoImmutableDigester::new("devnet".to_string(), None, TestLogger::stdout());
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 1, 1);
+        let beacon = CardanoDbBeacon::new(1, 1);
 
         let result = digester
             .compute_digest(&immutable_db.dir, &beacon)
@@ -341,7 +335,7 @@ mod tests {
             .build();
         let digester =
             CardanoImmutableDigester::new("devnet".to_string(), None, TestLogger::stdout());
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 1, 10);
+        let beacon = CardanoDbBeacon::new(1, 10);
 
         let result = digester
             .compute_digest(&immutable_db.dir, &beacon)
@@ -373,7 +367,7 @@ mod tests {
             Some(Arc::new(MemoryImmutableFileDigestCacheProvider::default())),
             logger.clone(),
         );
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 1, 100);
+        let beacon = CardanoDbBeacon::new(1, 100);
 
         let result = digester
             .compute_digest(&immutable_db.dir, &beacon)
@@ -400,7 +394,7 @@ mod tests {
             Some(cache.clone()),
             logger.clone(),
         );
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 1, 2);
+        let beacon = CardanoDbBeacon::new(1, 2);
 
         digester
             .compute_digest(&immutable_db.dir, &beacon)
@@ -438,7 +432,7 @@ mod tests {
             Some(Arc::new(MemoryImmutableFileDigestCacheProvider::default())),
             logger.clone(),
         );
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 1, 3);
+        let beacon = CardanoDbBeacon::new(1, 3);
 
         let without_cache_digest = no_cache_digester
             .compute_digest(&immutable_db.dir, &beacon)
@@ -480,7 +474,7 @@ mod tests {
             Some(Arc::new(cache)),
             logger.clone(),
         );
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 1, 50);
+        let beacon = CardanoDbBeacon::new(1, 50);
 
         let now = Instant::now();
         digester
@@ -526,7 +520,7 @@ mod tests {
             Some(Arc::new(cache)),
             logger.clone(),
         );
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 1, 3);
+        let beacon = CardanoDbBeacon::new(1, 3);
 
         digester
             .compute_digest(&immutable_db.dir, &beacon)
@@ -553,7 +547,7 @@ mod tests {
             Some(Arc::new(cache)),
             logger.clone(),
         );
-        let beacon = CardanoDbBeacon::new("devnet".to_string(), 1, 3);
+        let beacon = CardanoDbBeacon::new(1, 3);
 
         digester
             .compute_digest(&immutable_db.dir, &beacon)
diff --git a/mithril-common/src/entities/cardano_db_beacon.rs b/mithril-common/src/entities/cardano_db_beacon.rs
index f42fd215a57..b2193f72382 100644
--- a/mithril-common/src/entities/cardano_db_beacon.rs
+++ b/mithril-common/src/entities/cardano_db_beacon.rs
@@ -1,18 +1,14 @@
-use crate::entities::{Epoch, ImmutableFileNumber};
-use crate::signable_builder::Beacon;
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
-use std::cmp::Ordering;
 use std::fmt::{Display, Formatter};
 
+use crate::entities::{Epoch, ImmutableFileNumber};
+use crate::signable_builder::Beacon;
+
 /// A point in the Cardano chain at which a Mithril certificate of the Cardano Database should be
 /// produced.
-#[derive(Clone, Debug, PartialEq, Eq, Default, Serialize, Deserialize, Hash)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Default, Serialize, Deserialize, Hash)]
 pub struct CardanoDbBeacon {
-    // todo: remove network (we only need it as metadata of the certificates)
-    /// Cardano network
-    pub network: String,
-
     /// Cardano chain epoch number
     pub epoch: Epoch,
 
@@ -22,40 +18,20 @@ pub struct CardanoDbBeacon {
 
 impl Beacon for CardanoDbBeacon {}
 
-impl PartialOrd for CardanoDbBeacon {
-    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        match self.network.partial_cmp(&other.network) {
-            Some(Ordering::Equal) => {}
-            _ord => return None,
-        };
-        match self.epoch.partial_cmp(&other.epoch) {
-            Some(Ordering::Equal) => {}
-            ord => return ord,
-        }
-        self.immutable_file_number
-            .partial_cmp(&other.immutable_file_number)
-    }
-}
-
 impl Display for CardanoDbBeacon {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
-            "CardanoDbBeacon (network: {}, epoch: {}, immutable_file_number: {})",
-            self.network, self.epoch, self.immutable_file_number
+            "CardanoDbBeacon (epoch: {}, immutable_file_number: {})",
+            self.epoch, self.immutable_file_number
         )
     }
 }
 
 impl CardanoDbBeacon {
     /// CardanoDbBeacon factory
-    pub fn new<T: Into<String>>(
-        network: T,
-        epoch: u64,
-        immutable_file_number: ImmutableFileNumber,
-    ) -> CardanoDbBeacon {
+    pub fn new(epoch: u64, immutable_file_number: ImmutableFileNumber) -> CardanoDbBeacon {
         CardanoDbBeacon {
-            network: network.into(),
             epoch: Epoch(epoch),
             immutable_file_number,
         }
@@ -64,13 +40,12 @@ impl CardanoDbBeacon {
     /// Value used as a placeholder where a beacon is necessary
     #[deprecated]
     pub fn empty() -> Self {
-        Self::new("", 0, 0)
+        Self::new(0, 0)
     }
 
     /// Computes the hash of a CardanoDbBeacon
     pub fn compute_hash(&self) -> String {
         let mut hasher = Sha256::new();
-        hasher.update(self.network.as_bytes());
         hasher.update(self.epoch.to_be_bytes());
         hasher.update(self.immutable_file_number.to_be_bytes());
         hex::encode(hasher.finalize())
@@ -82,26 +57,9 @@ mod tests {
     use super::*;
     use std::cmp::Ordering;
 
-    #[test]
-    fn test_beacon_partial_ord_different_network() {
-        let beacon1: CardanoDbBeacon = CardanoDbBeacon {
-            network: "A".to_string(),
-            epoch: Epoch(0),
-            immutable_file_number: 0,
-        };
-        let beacon2: CardanoDbBeacon = CardanoDbBeacon {
-            network: "B".to_string(),
-            epoch: Epoch(0),
-            immutable_file_number: 0,
-        };
-
-        assert!(beacon1.partial_cmp(&beacon2).is_none());
-    }
-
     #[test]
     fn test_beacon_partial_ord_equal() {
         let beacon1: CardanoDbBeacon = CardanoDbBeacon {
-            network: "A".to_string(),
             epoch: Epoch(0),
             immutable_file_number: 0,
         };
@@ -112,12 +70,10 @@ mod tests {
     #[test]
     fn test_beacon_partial_ord_same_epoch_less() {
         let beacon1: CardanoDbBeacon = CardanoDbBeacon {
-            network: "A".to_string(),
             epoch: Epoch(0),
             immutable_file_number: 0,
         };
         let beacon2: CardanoDbBeacon = CardanoDbBeacon {
-            network: "A".to_string(),
             epoch: Epoch(0),
             immutable_file_number: 1,
         };
@@ -128,12 +84,10 @@ mod tests {
     #[test]
     fn test_beacon_partial_ord_same_epoch_greater() {
         let beacon1: CardanoDbBeacon = CardanoDbBeacon {
-            network: "A".to_string(),
             epoch: Epoch(0),
             immutable_file_number: 1,
         };
         let beacon2: CardanoDbBeacon = CardanoDbBeacon {
-            network: "A".to_string(),
             epoch: Epoch(0),
             immutable_file_number: 0,
         };
@@ -144,12 +98,10 @@ mod tests {
     #[test]
     fn test_beacon_partial_ord_cmp_epochs_less() {
         let beacon1: CardanoDbBeacon = CardanoDbBeacon {
-            network: "A".to_string(),
             epoch: Epoch(0),
             immutable_file_number: 99,
         };
         let beacon2: CardanoDbBeacon = CardanoDbBeacon {
-            network: "A".to_string(),
             epoch: Epoch(1),
             immutable_file_number: 99,
         };
@@ -159,23 +111,20 @@ mod tests {
 
     #[test]
     fn test_beacon_compute_hash() {
-        let hash_expected = "48cbf709b56204d8315aefd3a416b45398094f6fd51785c5b7dcaf7f35aacbfb";
+        let hash_expected = "9ab2a51e6dbed250ff6f2a70709834f3fba8197411ce9fb29923b124f3fe8594";
+        let (epoch, immutable_file_number) = (10, 100);
 
         assert_eq!(
             hash_expected,
-            CardanoDbBeacon::new("testnet".to_string(), 10, 100).compute_hash()
-        );
-        assert_ne!(
-            hash_expected,
-            CardanoDbBeacon::new("mainnet".to_string(), 10, 100).compute_hash()
+            CardanoDbBeacon::new(epoch, immutable_file_number).compute_hash()
         );
         assert_ne!(
             hash_expected,
-            CardanoDbBeacon::new("testnet".to_string(), 20, 100).compute_hash()
+            CardanoDbBeacon::new(20, immutable_file_number).compute_hash()
         );
         assert_ne!(
             hash_expected,
-            CardanoDbBeacon::new("testnet".to_string(), 10, 200).compute_hash()
+            CardanoDbBeacon::new(epoch, 200).compute_hash()
         );
     }
 }
diff --git a/mithril-common/src/entities/signed_entity_config.rs b/mithril-common/src/entities/signed_entity_config.rs
index 8d572f194bf..379629c2d4e 100644
--- a/mithril-common/src/entities/signed_entity_config.rs
+++ b/mithril-common/src/entities/signed_entity_config.rs
@@ -76,7 +76,6 @@ impl SignedEntityConfig {
             }
             SignedEntityTypeDiscriminants::CardanoImmutableFilesFull => {
                 SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(
-                    self.network,
                     *time_point.epoch,
                     time_point.immutable_file_number,
                 ))
@@ -223,7 +222,7 @@ mod tests {
         );
 
         assert_eq!(
-            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new("devnet", 1, 5)),
+            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(1, 5)),
             config
                 .time_point_to_signed_entity(
                     SignedEntityTypeDiscriminants::CardanoImmutableFilesFull,
@@ -427,10 +426,7 @@ mod tests {
     #[test]
     fn test_list_allowed_signed_entity_types_with_specific_configuration() {
         let network = CardanoNetwork::DevNet(12);
-        let beacon = CardanoDbBeacon {
-            network: network.to_string(),
-            ..fake_data::beacon()
-        };
+        let beacon = fake_data::beacon();
         let chain_point = ChainPoint {
             block_number: BlockNumber(45),
             ..ChainPoint::dummy()
diff --git a/mithril-common/src/entities/signed_entity_type.rs b/mithril-common/src/entities/signed_entity_type.rs
index e8a9ebd0822..e103ae9126b 100644
--- a/mithril-common/src/entities/signed_entity_type.rs
+++ b/mithril-common/src/entities/signed_entity_type.rs
@@ -132,7 +132,6 @@ impl SignedEntityType {
                 hasher.update(&epoch.to_be_bytes())
             }
             SignedEntityType::CardanoImmutableFilesFull(db_beacon) => {
-                hasher.update(db_beacon.network.as_bytes());
                 hasher.update(&db_beacon.epoch.to_be_bytes());
                 hasher.update(&db_beacon.immutable_file_number.to_be_bytes());
             }
@@ -255,7 +254,7 @@ mod tests {
     fn get_epoch_when_signed_entity_type_is_signed_for_cardano_immutable_files_full_return_epoch_stored_in_signed_entity_type(
     ) {
         let signed_entity_type =
-            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new("network", 3, 100));
+            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(3, 100));
         assert_eq!(
             signed_entity_type.get_epoch_when_signed_entity_type_is_signed(),
             Epoch(3)
@@ -293,24 +292,18 @@ mod tests {
         );
 
         let reference_hash = hash(SignedEntityType::CardanoImmutableFilesFull(
-            CardanoDbBeacon::new("network", 5, 100),
+            CardanoDbBeacon::new(5, 100),
         ));
         assert_ne!(
             reference_hash,
             hash(SignedEntityType::CardanoImmutableFilesFull(
-                CardanoDbBeacon::new("other_network", 5, 100)
+                CardanoDbBeacon::new(20, 100)
             ))
         );
         assert_ne!(
             reference_hash,
             hash(SignedEntityType::CardanoImmutableFilesFull(
-                CardanoDbBeacon::new("network", 20, 100)
-            ))
-        );
-        assert_ne!(
-            reference_hash,
-            hash(SignedEntityType::CardanoImmutableFilesFull(
-                CardanoDbBeacon::new("network", 5, 507)
+                CardanoDbBeacon::new(5, 507)
             ))
         );
 
@@ -351,11 +344,11 @@ mod tests {
         );
 
         let cardano_immutable_files_full_json =
-            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new("network", 5, 100))
+            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(5, 100))
                 .get_json_beacon()
                 .unwrap();
         assert_same_json!(
-            r#"{"network":"network","epoch":5,"immutable_file_number":100}"#,
+            r#"{"epoch":5,"immutable_file_number":100}"#,
             &cardano_immutable_files_full_json
         );
 
diff --git a/mithril-common/src/messages/message_parts/signed_entity_type_message.rs b/mithril-common/src/messages/message_parts/signed_entity_type_message.rs
index 69bfb6cbfb5..e439d6871d7 100644
--- a/mithril-common/src/messages/message_parts/signed_entity_type_message.rs
+++ b/mithril-common/src/messages/message_parts/signed_entity_type_message.rs
@@ -73,11 +73,7 @@ impl CardanoDbBeaconMessagePart {
 
 impl From<CardanoDbBeaconMessagePart> for CardanoDbBeacon {
     fn from(message: CardanoDbBeaconMessagePart) -> Self {
-        Self::new(
-            message.network.unwrap_or_default(),
-            *message.epoch,
-            message.immutable_file_number,
-        )
+        Self::new(*message.epoch, message.immutable_file_number)
     }
 }
 
@@ -196,7 +192,7 @@ mod tests {
     #[test]
     fn convert_message_to_cardano_db_beacon_entity() {
         assert_eq!(
-            CardanoDbBeacon::new("devnet", 12, 48),
+            CardanoDbBeacon::new(12, 48),
             CardanoDbBeacon::from(CardanoDbBeaconMessagePart::new("devnet", Epoch(12), 48))
         );
     }
@@ -205,14 +201,14 @@ mod tests {
     fn convert_cardano_db_beacon_entity_to_message() {
         assert_eq!(
             CardanoDbBeaconMessagePart::new("devnet", Epoch(12), 48),
-            CardanoDbBeaconMessagePart::from((CardanoDbBeacon::new("unused", 12, 48), "devnet"))
+            CardanoDbBeaconMessagePart::from((CardanoDbBeacon::new(12, 48), "devnet"))
         );
     }
 
     #[test]
     fn convert_message_to_signed_entity_type_entity() {
         assert_eq!(
-            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new("devnet", 12, 48)),
+            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(12, 48)),
             SignedEntityType::from(SignedEntityTypeMessagePart::CardanoImmutableFilesFull(
                 CardanoDbBeaconMessagePart::new("devnet", Epoch(12), 48)
             ))
@@ -245,7 +241,7 @@ mod tests {
                 CardanoDbBeaconMessagePart::new("devnet", Epoch(12), 48)
             ),
             SignedEntityTypeMessagePart::from((
-                SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new("unused", 12, 48)),
+                SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(12, 48)),
                 "devnet"
             ))
         );
@@ -276,31 +272,31 @@ mod tests {
     fn comparing_message_to_cardano_db_beacon_entity() {
         let (epoch, immutable, network) = (Epoch(10), 50, "devnet".to_string());
         assert_commutative_eq(
-            CardanoDbBeacon::new(&network, *epoch, immutable),
+            CardanoDbBeacon::new(*epoch, immutable),
             CardanoDbBeaconMessagePart::new(&network, epoch, immutable),
         );
 
         // Changing epoch should make them not equal
         assert_commutative_ne(
-            CardanoDbBeacon::new(&network, *epoch + 1, immutable),
+            CardanoDbBeacon::new(*epoch + 1, immutable),
             CardanoDbBeaconMessagePart::new(&network, epoch, immutable),
         );
 
         // Changing immutable file number should make them not equal
         assert_commutative_ne(
-            CardanoDbBeacon::new(&network, *epoch, immutable + 1),
+            CardanoDbBeacon::new(*epoch, immutable + 1),
             CardanoDbBeaconMessagePart::new(&network, epoch, immutable),
         );
 
         // Changing network should not matter
         assert_commutative_eq(
-            CardanoDbBeacon::new("another network", *epoch, immutable),
-            CardanoDbBeaconMessagePart::new(&network, epoch, immutable),
+            CardanoDbBeacon::new(*epoch, immutable),
+            CardanoDbBeaconMessagePart::new("another network", epoch, immutable),
         );
 
         // Missing network should not matter too
         assert_commutative_eq(
-            CardanoDbBeacon::new(&network, *epoch, immutable),
+            CardanoDbBeacon::new(*epoch, immutable),
             CardanoDbBeaconMessagePart {
                 network: None,
                 ..CardanoDbBeaconMessagePart::new(&network, epoch, immutable)
@@ -315,27 +311,20 @@ mod tests {
 
         // CardanoImmutableFilesFull
         assert_commutative_eq(
-            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(
-                &network, *epoch, immutable,
-            )),
+            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(*epoch, immutable)),
             SignedEntityTypeMessagePart::CardanoImmutableFilesFull(
                 CardanoDbBeaconMessagePart::new(&network, epoch, immutable),
             ),
         );
         // Changing network should not matter
         assert_commutative_eq(
-            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(
-                "another network",
-                *epoch,
-                immutable,
-            )),
+            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(*epoch, immutable)),
             SignedEntityTypeMessagePart::CardanoImmutableFilesFull(
-                CardanoDbBeaconMessagePart::new(&network, epoch, immutable),
+                CardanoDbBeaconMessagePart::new("another network", epoch, immutable),
             ),
         );
         assert_commutative_ne(
             SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(
-                &network,
                 *epoch + 10,
                 immutable,
             )),
@@ -345,7 +334,6 @@ mod tests {
         );
         assert_commutative_ne(
             SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(
-                &network,
                 *epoch,
                 immutable + 30,
             )),
diff --git a/mithril-common/src/test_utils/fake_data.rs b/mithril-common/src/test_utils/fake_data.rs
index 6d06b01ae9a..25fc0a312ee 100644
--- a/mithril-common/src/test_utils/fake_data.rs
+++ b/mithril-common/src/test_utils/fake_data.rs
@@ -20,9 +20,8 @@ pub fn network() -> crate::CardanoNetwork {
 
 /// Fake Beacon
 pub fn beacon() -> entities::CardanoDbBeacon {
-    let network = network().to_string();
     let time_point = entities::TimePoint::dummy();
-    entities::CardanoDbBeacon::new(network, *time_point.epoch, time_point.immutable_file_number)
+    entities::CardanoDbBeacon::new(*time_point.epoch, time_point.immutable_file_number)
 }
 
 /// Fake ChainPoint
@@ -34,16 +33,6 @@ pub fn chain_point() -> entities::ChainPoint {
     }
 }
 
-/// Fake Digest
-pub fn digest(beacon: &entities::CardanoDbBeacon) -> Vec<u8> {
-    format!(
-        "digest-{}-{}-{}",
-        beacon.network, beacon.epoch, beacon.immutable_file_number
-    )
-    .as_bytes()
-    .to_vec()
-}
-
 /// Fake ProtocolParameters
 pub fn protocol_parameters() -> entities::ProtocolParameters {
     let k = 5;
@@ -143,7 +132,7 @@ pub fn certificate<T: Into<String>>(certificate_hash: T) -> entities::Certificat
         .unwrap()
         .with_timezone(&Utc);
     let metadata = CertificateMetadata::new(
-        &beacon.network,
+        network(),
         protocol_version,
         protocol_parameters,
         initiated_at,
diff --git a/mithril-signer/src/message_adapters/to_register_signature_message.rs b/mithril-signer/src/message_adapters/to_register_signature_message.rs
index b172ffb4d12..ae633f5d738 100644
--- a/mithril-signer/src/message_adapters/to_register_signature_message.rs
+++ b/mithril-signer/src/message_adapters/to_register_signature_message.rs
@@ -72,7 +72,7 @@ mod tests {
     #[test]
     fn adapt_cardano_immutable_files_full_message() {
         let signed_entity_type =
-            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new("unused", 6, 54));
+            SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(6, 54));
         let message: RegisterSignatureMessage = ToRegisterSignatureMessageAdapter::try_adapt((
             signed_entity_type.clone(),
             fake_data::single_signatures([1, 3].to_vec()),
diff --git a/mithril-signer/tests/create_cardano_transaction_single_signature.rs b/mithril-signer/tests/create_cardano_transaction_single_signature.rs
index 72e00b8d022..a613d9bd139 100644
--- a/mithril-signer/tests/create_cardano_transaction_single_signature.rs
+++ b/mithril-signer/tests/create_cardano_transaction_single_signature.rs
@@ -67,7 +67,7 @@ async fn test_create_cardano_transaction_single_signature() {
         .cycle_ready_to_sign_with_signature_registration(MithrilStakeDistribution(Epoch(3))).await.unwrap()
         
         .comment("signer signs a single signature for CardanoImmutableFilesFull = ReadyToSign")
-        .cycle_ready_to_sign_with_signature_registration(CardanoImmutableFilesFull(CardanoDbBeacon::new("devnet", 3, 1))).await.unwrap()
+        .cycle_ready_to_sign_with_signature_registration(CardanoImmutableFilesFull(CardanoDbBeacon::new(3, 1))).await.unwrap()
         
         .comment("creating a new certificate pending with a cardano transaction signed entity → ReadyToSign")
         .increase_block_number_and_slot_number(70, SlotNumber(80), BlockNumber(170)).await.unwrap()
diff --git a/mithril-signer/tests/create_immutable_files_full_single_signature.rs b/mithril-signer/tests/create_immutable_files_full_single_signature.rs
index 2a6599fbd70..aa488ef277a 100644
--- a/mithril-signer/tests/create_immutable_files_full_single_signature.rs
+++ b/mithril-signer/tests/create_immutable_files_full_single_signature.rs
@@ -100,14 +100,14 @@ async fn test_create_immutable_files_full_single_signature() {
         .cycle_ready_to_sign_with_signature_registration(CardanoStakeDistribution(Epoch(3))).await.unwrap()
 
         .comment("signer signs a single signature for CardanoImmutableFilesFull = ReadyToSign")
-        .cycle_ready_to_sign_with_signature_registration(CardanoImmutableFilesFull(CardanoDbBeacon::new("devnet", 4, 8))).await.unwrap()
+        .cycle_ready_to_sign_with_signature_registration(CardanoImmutableFilesFull(CardanoDbBeacon::new(4, 8))).await.unwrap()
 
         .comment("more cycles do not change the state = ReadyToSign")
         .cycle_ready_to_sign_without_signature_registration().await.unwrap()
 
         .comment("new immutable means a new signature with the same stake distribution → ReadyToSign")
         .increase_immutable(1, 9).await.unwrap()
-        .cycle_ready_to_sign_with_signature_registration(CardanoImmutableFilesFull(CardanoDbBeacon::new("devnet", 4, 9))).await.unwrap()
+        .cycle_ready_to_sign_with_signature_registration(CardanoImmutableFilesFull(CardanoDbBeacon::new(4, 9))).await.unwrap()
 
         .comment("changing epoch changes the state → Unregistered")
         .increase_epoch(5).await.unwrap()
diff --git a/mithril-test-lab/mithril-end-to-end/src/bin/load-aggregator/main.rs b/mithril-test-lab/mithril-end-to-end/src/bin/load-aggregator/main.rs
index fc4082fe1b2..14624be5e1d 100644
--- a/mithril-test-lab/mithril-end-to-end/src/bin/load-aggregator/main.rs
+++ b/mithril-test-lab/mithril-end-to-end/src/bin/load-aggregator/main.rs
@@ -226,7 +226,6 @@ async fn main_scenario(
         &parameters.aggregator,
         Duration::from_secs(60),
         &SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new(
-            "devnet".to_string(),
             *current_epoch.deref(),
             parameters.immutable_db.last_immutable_number().unwrap() - 1,
         )),
diff --git a/mithril-test-lab/mithril-end-to-end/src/stress_test/payload_builder.rs b/mithril-test-lab/mithril-end-to-end/src/stress_test/payload_builder.rs
index b2bb973fe17..e21f66218fe 100644
--- a/mithril-test-lab/mithril-end-to-end/src/stress_test/payload_builder.rs
+++ b/mithril-test-lab/mithril-end-to-end/src/stress_test/payload_builder.rs
@@ -104,7 +104,6 @@ pub async fn compute_immutable_files_signatures(
     spin_while_waiting!(
         {
             let beacon = CardanoDbBeacon::new(
-                "devnet".to_string(),
                 *epoch,
                 // Minus one because the last immutable isn't "finished"
                 immutable_db.last_immutable_number().unwrap() - 1,

From 2f82eeffabbd10f61b54b7fd055885975aea7d9c Mon Sep 17 00:00:00 2001
From: DJO <790521+Alenar@users.noreply.github.com>
Date: Thu, 7 Nov 2024 17:08:04 +0100
Subject: [PATCH 2/7] refactor: remove `network` from `SignedEntityConfig`

This allow, by cascade, to remove the `network` of signer & aggregator
epoch services.
---
 .../src/dependency_injection/builder.rs             |  2 --
 mithril-aggregator/src/services/epoch_service.rs    | 13 +------------
 mithril-common/src/entities/signed_entity_config.rs |  8 +-------
 mithril-signer/src/dependency_injection/builder.rs  |  5 +----
 mithril-signer/src/runtime/runner.rs                |  6 +-----
 mithril-signer/src/services/certifier.rs            |  3 ---
 mithril-signer/src/services/epoch_service.rs        | 13 +++----------
 .../tests/test_extensions/state_machine_tester.rs   |  7 +------
 8 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/mithril-aggregator/src/dependency_injection/builder.rs b/mithril-aggregator/src/dependency_injection/builder.rs
index e18c3359b15..9395bf86010 100644
--- a/mithril-aggregator/src/dependency_injection/builder.rs
+++ b/mithril-aggregator/src/dependency_injection/builder.rs
@@ -1260,7 +1260,6 @@ impl DependenciesBuilder {
         let era_checker = self.get_era_checker().await?;
         let stake_distribution_service = self.get_stake_distribution_service().await?;
         let epoch_settings = self.get_epoch_settings_configuration()?;
-        let network = self.configuration.get_network()?;
         let allowed_discriminants = self.get_allowed_signed_entity_types_discriminants()?;
 
         let epoch_service = Arc::new(RwLock::new(MithrilEpochService::new(
@@ -1272,7 +1271,6 @@ impl DependenciesBuilder {
                 era_checker,
                 stake_distribution_service,
             ),
-            network,
             allowed_discriminants,
             self.root_logger(),
         )));
diff --git a/mithril-aggregator/src/services/epoch_service.rs b/mithril-aggregator/src/services/epoch_service.rs
index f1d606ed7e0..8dff89e6e3d 100644
--- a/mithril-aggregator/src/services/epoch_service.rs
+++ b/mithril-aggregator/src/services/epoch_service.rs
@@ -14,7 +14,7 @@ use mithril_common::entities::{
 };
 use mithril_common::logging::LoggerExtensions;
 use mithril_common::protocol::{MultiSigner as ProtocolMultiSigner, SignerBuilder};
-use mithril_common::{CardanoNetwork, StdResult};
+use mithril_common::StdResult;
 
 use crate::{
     entities::AggregatorEpochSettings, services::StakeDistributionService, EpochSettingsStorer,
@@ -188,7 +188,6 @@ pub struct MithrilEpochService {
     chain_observer: Arc<dyn ChainObserver>,
     era_checker: Arc<EraChecker>,
     stake_distribution_service: Arc<dyn StakeDistributionService>,
-    network: CardanoNetwork,
     allowed_signed_entity_discriminants: BTreeSet<SignedEntityTypeDiscriminants>,
     logger: Logger,
 }
@@ -198,7 +197,6 @@ impl MithrilEpochService {
     pub fn new(
         future_epoch_settings: AggregatorEpochSettings,
         dependencies: EpochServiceDependencies,
-        network: CardanoNetwork,
         allowed_discriminants: BTreeSet<SignedEntityTypeDiscriminants>,
         logger: Logger,
     ) -> Self {
@@ -211,7 +209,6 @@ impl MithrilEpochService {
             chain_observer: dependencies.chain_observer,
             era_checker: dependencies.era_checker,
             stake_distribution_service: dependencies.stake_distribution_service,
-            network,
             allowed_signed_entity_discriminants: allowed_discriminants,
             logger: logger.new_with_component_name::<Self>(),
         }
@@ -346,7 +343,6 @@ impl EpochService for MithrilEpochService {
 
         let signed_entity_config = SignedEntityConfig {
             allowed_discriminants: self.allowed_signed_entity_discriminants.clone(),
-            network: self.network,
             cardano_transactions_signing_config: current_epoch_settings
                 .cardano_transactions_signing_config
                 .clone(),
@@ -932,7 +928,6 @@ mod tests {
     struct EpochServiceBuilder {
         cardano_transactions_signing_config: CardanoTransactionsSigningConfig,
         future_protocol_parameters: ProtocolParameters,
-        network: CardanoNetwork,
         allowed_discriminants: BTreeSet<SignedEntityTypeDiscriminants>,
         cardano_era: CardanoEra,
         mithril_era: SupportedEra,
@@ -951,7 +946,6 @@ mod tests {
             Self {
                 cardano_transactions_signing_config: CardanoTransactionsSigningConfig::dummy(),
                 future_protocol_parameters: epoch_fixture.protocol_parameters(),
-                network: CardanoNetwork::TestNet(0),
                 allowed_discriminants: BTreeSet::new(),
                 cardano_era: String::new(),
                 mithril_era: SupportedEra::dummy(),
@@ -1041,7 +1035,6 @@ mod tests {
                     Arc::new(era_checker),
                     Arc::new(stake_distribution_service),
                 ),
-                self.network,
                 self.allowed_discriminants,
                 TestLogger::stdout(),
             )
@@ -1068,7 +1061,6 @@ mod tests {
                 protocol_parameters: signer_registration_protocol_parameters.clone(),
                 ..AggregatorEpochSettings::dummy()
             },
-            network: SignedEntityConfig::dummy().network,
             allowed_discriminants: SignedEntityConfig::dummy().allowed_discriminants,
             cardano_era: "CardanoEra".to_string(),
             mithril_era: SupportedEra::eras()[1],
@@ -1122,14 +1114,12 @@ mod tests {
 
         let cardano_transactions_signing_config =
             CardanoTransactionsSigningConfig::new(BlockNumber(29), BlockNumber(986));
-        let network = CardanoNetwork::TestNet(27);
         let allowed_discriminants = BTreeSet::from([
             SignedEntityTypeDiscriminants::CardanoTransactions,
             SignedEntityTypeDiscriminants::CardanoImmutableFilesFull,
         ]);
 
         let mut service = EpochServiceBuilder {
-            network,
             allowed_discriminants: allowed_discriminants.clone(),
             stored_current_epoch_settings: AggregatorEpochSettings {
                 cardano_transactions_signing_config: cardano_transactions_signing_config.clone(),
@@ -1153,7 +1143,6 @@ mod tests {
             signed_entity_config.clone(),
             SignedEntityConfig {
                 allowed_discriminants,
-                network,
                 cardano_transactions_signing_config,
             }
         );
diff --git a/mithril-common/src/entities/signed_entity_config.rs b/mithril-common/src/entities/signed_entity_config.rs
index 379629c2d4e..0410bd28e31 100644
--- a/mithril-common/src/entities/signed_entity_config.rs
+++ b/mithril-common/src/entities/signed_entity_config.rs
@@ -6,7 +6,7 @@ use crate::entities::{
     BlockNumber, BlockRange, CardanoDbBeacon, SignedEntityType, SignedEntityTypeDiscriminants,
     TimePoint,
 };
-use crate::{CardanoNetwork, StdResult};
+use crate::StdResult;
 
 /// Convert [TimePoint] to [SignedEntityType] and list allowed signed entity types and
 /// discriminants.
@@ -14,8 +14,6 @@ use crate::{CardanoNetwork, StdResult};
 pub struct SignedEntityConfig {
     /// List of discriminants that the node is allowed to sign
     pub allowed_discriminants: BTreeSet<SignedEntityTypeDiscriminants>,
-    /// Cardano network
-    pub network: CardanoNetwork,
     /// Cardano transactions signing configuration
     pub cardano_transactions_signing_config: CardanoTransactionsSigningConfig,
 }
@@ -26,7 +24,6 @@ impl SignedEntityConfig {
         pub fn dummy() -> Self {
             Self {
                 allowed_discriminants: SignedEntityTypeDiscriminants::all(),
-                network: CardanoNetwork::DevNet(12),
                 cardano_transactions_signing_config: CardanoTransactionsSigningConfig::dummy(),
             }
         }
@@ -193,7 +190,6 @@ mod tests {
         };
         let config = SignedEntityConfig {
             allowed_discriminants: SignedEntityTypeDiscriminants::all(),
-            network: CardanoNetwork::DevNet(12),
             cardano_transactions_signing_config: CardanoTransactionsSigningConfig {
                 security_parameter: BlockNumber(0),
                 step: BlockNumber(15),
@@ -425,7 +421,6 @@ mod tests {
 
     #[test]
     fn test_list_allowed_signed_entity_types_with_specific_configuration() {
-        let network = CardanoNetwork::DevNet(12);
         let beacon = fake_data::beacon();
         let chain_point = ChainPoint {
             block_number: BlockNumber(45),
@@ -441,7 +436,6 @@ mod tests {
                 SignedEntityTypeDiscriminants::CardanoStakeDistribution,
                 SignedEntityTypeDiscriminants::CardanoTransactions,
             ]),
-            network,
             cardano_transactions_signing_config: CardanoTransactionsSigningConfig {
                 security_parameter: BlockNumber(0),
                 step: BlockNumber(15),
diff --git a/mithril-signer/src/dependency_injection/builder.rs b/mithril-signer/src/dependency_injection/builder.rs
index 9fb8e8a4f0d..60cb7d4b26d 100644
--- a/mithril-signer/src/dependency_injection/builder.rs
+++ b/mithril-signer/src/dependency_injection/builder.rs
@@ -379,10 +379,7 @@ impl<'a> DependenciesBuilder<'a> {
         ));
         let certifier = Arc::new(SignerCertifierService::new(
             signed_beacon_repository,
-            Arc::new(SignerSignedEntityConfigProvider::new(
-                network,
-                epoch_service.clone(),
-            )),
+            Arc::new(SignerSignedEntityConfigProvider::new(epoch_service.clone())),
             signed_entity_type_lock.clone(),
             single_signer.clone(),
             aggregator_client.clone(),
diff --git a/mithril-signer/src/runtime/runner.rs b/mithril-signer/src/runtime/runner.rs
index 6314996eaf3..c14eff4b07a 100644
--- a/mithril-signer/src/runtime/runner.rs
+++ b/mithril-signer/src/runtime/runner.rs
@@ -407,7 +407,6 @@ mod tests {
         let adapter: MemoryAdapter<Epoch, ProtocolInitializer> = MemoryAdapter::new(None).unwrap();
         let stake_distribution_signers = fake_data::signers_with_stakes(2);
         let party_id = stake_distribution_signers[1].party_id.clone();
-        let network = fake_data::network();
         let fake_observer = FakeObserver::default();
         fake_observer.set_signers(stake_distribution_signers).await;
         let chain_observer = Arc::new(fake_observer);
@@ -492,10 +491,7 @@ mod tests {
         let aggregator_client = Arc::new(DumbAggregatorClient::default());
         let certifier = Arc::new(SignerCertifierService::new(
             Arc::new(SignedBeaconRepository::new(sqlite_connection.clone(), None)),
-            Arc::new(SignerSignedEntityConfigProvider::new(
-                network,
-                epoch_service.clone(),
-            )),
+            Arc::new(SignerSignedEntityConfigProvider::new(epoch_service.clone())),
             signed_entity_type_lock.clone(),
             single_signer.clone(),
             aggregator_client.clone(),
diff --git a/mithril-signer/src/services/certifier.rs b/mithril-signer/src/services/certifier.rs
index fb7f3efe71e..d7366a4d852 100644
--- a/mithril-signer/src/services/certifier.rs
+++ b/mithril-signer/src/services/certifier.rs
@@ -513,8 +513,6 @@ mod tests {
         use std::collections::BTreeSet;
         use tokio::sync::RwLock;
 
-        use mithril_common::CardanoNetwork;
-
         use crate::test_tools::TestLogger;
 
         use super::*;
@@ -547,7 +545,6 @@ mod tests {
                 Self {
                     config: SignedEntityConfig {
                         cardano_transactions_signing_config: config,
-                        network: CardanoNetwork::TestNet(42),
                         allowed_discriminants,
                     },
                 }
diff --git a/mithril-signer/src/services/epoch_service.rs b/mithril-signer/src/services/epoch_service.rs
index 2b20fc34c69..98f9d0af3a7 100644
--- a/mithril-signer/src/services/epoch_service.rs
+++ b/mithril-signer/src/services/epoch_service.rs
@@ -16,7 +16,7 @@ use mithril_common::entities::{
     SignedEntityTypeDiscriminants, Signer, SignerWithStake,
 };
 use mithril_common::logging::LoggerExtensions;
-use mithril_common::{CardanoNetwork, StdResult};
+use mithril_common::StdResult;
 use mithril_persistence::store::StakeStorer;
 
 /// Errors dedicated to the EpochService.
@@ -289,17 +289,13 @@ impl EpochService for MithrilEpochService {
 /// Needed because the epoch service is wrapped in an Arc<RwLock<>> in the dependencies, making
 /// direct usage of implemented traits methods difficult.
 pub struct SignerSignedEntityConfigProvider {
-    cardano_network: CardanoNetwork,
     epoch_service: EpochServiceWrapper,
 }
 
 impl SignerSignedEntityConfigProvider {
     /// Create a new instance of the `SignerSignedEntityConfigProvider`.
-    pub fn new(cardano_network: CardanoNetwork, epoch_service: EpochServiceWrapper) -> Self {
-        Self {
-            cardano_network,
-            epoch_service,
-        }
+    pub fn new(epoch_service: EpochServiceWrapper) -> Self {
+        Self { epoch_service }
     }
 }
 
@@ -315,7 +311,6 @@ impl SignedEntityConfigProvider for SignerSignedEntityConfigProvider {
 
         Ok(SignedEntityConfig {
             allowed_discriminants: epoch_service.allowed_discriminants()?.clone(),
-            network: self.cardano_network,
             cardano_transactions_signing_config,
         })
     }
@@ -861,7 +856,6 @@ mod tests {
             TestLogger::stdout(),
         )));
         let config_provider = SignerSignedEntityConfigProvider {
-            cardano_network: fake_data::network(),
             epoch_service: epoch_service.clone(),
         };
 
@@ -918,7 +912,6 @@ mod tests {
             assert_eq!(
                 SignedEntityConfig {
                     allowed_discriminants,
-                    network: fake_data::network(),
                     cardano_transactions_signing_config: CardanoTransactionsSigningConfig::dummy(),
                 },
                 config
diff --git a/mithril-signer/tests/test_extensions/state_machine_tester.rs b/mithril-signer/tests/test_extensions/state_machine_tester.rs
index b1149963e85..1915748f8a9 100644
--- a/mithril-signer/tests/test_extensions/state_machine_tester.rs
+++ b/mithril-signer/tests/test_extensions/state_machine_tester.rs
@@ -113,7 +113,6 @@ impl StateMachineTester {
         })?;
         let selected_signer_party_id = selected_signer_with_stake.party_id.clone();
         let config = Configuration::new_sample(&selected_signer_party_id);
-        let network = config.get_network()?;
 
         let logger = stdout_logger();
         let logs_guard = slog_scope::set_global_logger(logger.clone());
@@ -154,7 +153,6 @@ impl StateMachineTester {
         let certificate_handler = Arc::new(FakeAggregator::new(
             SignedEntityConfig {
                 allowed_discriminants: SignedEntityTypeDiscriminants::all(),
-                network,
                 cardano_transactions_signing_config: cardano_transactions_signing_config.clone(),
             },
             ticker_service.clone(),
@@ -261,10 +259,7 @@ impl StateMachineTester {
             Arc::new(SignedBeaconRepository::new(sqlite_connection.clone(), None));
         let certifier = Arc::new(SignerCertifierService::new(
             signed_beacon_repository.clone(),
-            Arc::new(SignerSignedEntityConfigProvider::new(
-                network,
-                epoch_service.clone(),
-            )),
+            Arc::new(SignerSignedEntityConfigProvider::new(epoch_service.clone())),
             signed_entity_type_lock.clone(),
             single_signer.clone(),
             certificate_handler.clone(),

From c7cb4580c54a6a2121982e02897a3b298affbe03 Mon Sep 17 00:00:00 2001
From: DJO <790521+Alenar@users.noreply.github.com>
Date: Thu, 7 Nov 2024 18:32:47 +0100
Subject: [PATCH 3/7] test(aggregator): remove unused network in integration
 tests

---
 .../tests/test_extensions/aggregator_observer.rs              | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mithril-aggregator/tests/test_extensions/aggregator_observer.rs b/mithril-aggregator/tests/test_extensions/aggregator_observer.rs
index 67dd62585be..d6042ad6eb2 100644
--- a/mithril-aggregator/tests/test_extensions/aggregator_observer.rs
+++ b/mithril-aggregator/tests/test_extensions/aggregator_observer.rs
@@ -7,13 +7,12 @@ use mithril_aggregator::{
 use mithril_common::entities::{CardanoTransactionsSnapshot, Certificate, SignedEntity};
 use mithril_common::{
     entities::{Epoch, SignedEntityType, SignedEntityTypeDiscriminants, TimePoint},
-    CardanoNetwork, StdResult, TickerService,
+    StdResult, TickerService,
 };
 use std::sync::Arc;
 
 // An observer that allow to inspect currently available open messages.
 pub struct AggregatorObserver {
-    network: CardanoNetwork,
     certifier_service: Arc<dyn CertifierService>,
     signed_entity_service: Arc<dyn SignedEntityService>,
     ticker_service: Arc<dyn TickerService>,
@@ -24,7 +23,6 @@ impl AggregatorObserver {
     // [AggregatorObserver] factory
     pub async fn new(deps_builder: &mut DependenciesBuilder) -> Self {
         Self {
-            network: deps_builder.configuration.get_network().unwrap(),
             certifier_service: deps_builder.get_certifier_service().await.unwrap(),
             signed_entity_service: deps_builder.get_signed_entity_service().await.unwrap(),
             ticker_service: deps_builder.get_ticker_service().await.unwrap(),

From d2c9aee0dcff4adc96aea85d27f03db1e6f2d342 Mon Sep 17 00:00:00 2001
From: DJO <790521+Alenar@users.noreply.github.com>
Date: Wed, 13 Nov 2024 18:06:08 +0100
Subject: [PATCH 4/7] test(common): enhance cardano db beacon order test

by covering all cases (epoch + 1 > epoch was missing) and epoch priority
over immutable file number.
---
 .../src/entities/cardano_db_beacon.rs         | 95 ++++++++++---------
 1 file changed, 49 insertions(+), 46 deletions(-)

diff --git a/mithril-common/src/entities/cardano_db_beacon.rs b/mithril-common/src/entities/cardano_db_beacon.rs
index b2193f72382..5440ccc4cf9 100644
--- a/mithril-common/src/entities/cardano_db_beacon.rs
+++ b/mithril-common/src/entities/cardano_db_beacon.rs
@@ -54,59 +54,62 @@ impl CardanoDbBeacon {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use std::cmp::Ordering;
 
-    #[test]
-    fn test_beacon_partial_ord_equal() {
-        let beacon1: CardanoDbBeacon = CardanoDbBeacon {
-            epoch: Epoch(0),
-            immutable_file_number: 0,
-        };
-
-        assert_eq!(Some(Ordering::Equal), beacon1.partial_cmp(&beacon1));
-    }
-
-    #[test]
-    fn test_beacon_partial_ord_same_epoch_less() {
-        let beacon1: CardanoDbBeacon = CardanoDbBeacon {
-            epoch: Epoch(0),
-            immutable_file_number: 0,
-        };
-        let beacon2: CardanoDbBeacon = CardanoDbBeacon {
-            epoch: Epoch(0),
-            immutable_file_number: 1,
-        };
-
-        assert_eq!(Some(Ordering::Less), beacon1.partial_cmp(&beacon2));
-    }
+    use super::*;
 
     #[test]
-    fn test_beacon_partial_ord_same_epoch_greater() {
-        let beacon1: CardanoDbBeacon = CardanoDbBeacon {
-            epoch: Epoch(0),
-            immutable_file_number: 1,
+    fn test_order() {
+        let beacon: CardanoDbBeacon = CardanoDbBeacon {
+            epoch: Epoch(10),
+            immutable_file_number: 75,
         };
-        let beacon2: CardanoDbBeacon = CardanoDbBeacon {
-            epoch: Epoch(0),
-            immutable_file_number: 0,
-        };
-
-        assert_eq!(Some(Ordering::Greater), beacon1.partial_cmp(&beacon2));
-    }
 
-    #[test]
-    fn test_beacon_partial_ord_cmp_epochs_less() {
-        let beacon1: CardanoDbBeacon = CardanoDbBeacon {
-            epoch: Epoch(0),
-            immutable_file_number: 99,
-        };
-        let beacon2: CardanoDbBeacon = CardanoDbBeacon {
-            epoch: Epoch(1),
-            immutable_file_number: 99,
-        };
+        assert_eq!(Ordering::Equal, beacon.cmp(&beacon));
+        assert_eq!(
+            Ordering::Less,
+            beacon.cmp(&CardanoDbBeacon {
+                epoch: beacon.epoch + 1,
+                ..beacon.clone()
+            })
+        );
+        assert_eq!(
+            Ordering::Greater,
+            beacon.cmp(&CardanoDbBeacon {
+                epoch: beacon.epoch - 1,
+                ..beacon.clone()
+            })
+        );
+        assert_eq!(
+            Ordering::Less,
+            beacon.cmp(&CardanoDbBeacon {
+                immutable_file_number: beacon.immutable_file_number + 1,
+                ..beacon.clone()
+            })
+        );
+        assert_eq!(
+            Ordering::Greater,
+            beacon.cmp(&CardanoDbBeacon {
+                immutable_file_number: beacon.immutable_file_number - 1,
+                ..beacon.clone()
+            })
+        );
 
-        assert_eq!(Some(Ordering::Less), beacon1.partial_cmp(&beacon2));
+        // Epoch has higher priority than immutable_file_number
+        assert_eq!(
+            Ordering::Less,
+            beacon.cmp(&CardanoDbBeacon {
+                epoch: beacon.epoch + 1,
+                immutable_file_number: beacon.immutable_file_number - 1,
+            })
+        );
+        assert_eq!(
+            Ordering::Greater,
+            beacon.cmp(&CardanoDbBeacon {
+                epoch: beacon.epoch - 1,
+                immutable_file_number: beacon.immutable_file_number + 1,
+            })
+        )
     }
 
     #[test]

From 5a424cbed51191e6ec8bd14bda8b8740dddefeba Mon Sep 17 00:00:00 2001
From: DJO <790521+Alenar@users.noreply.github.com>
Date: Thu, 14 Nov 2024 11:50:34 +0100
Subject: [PATCH 5/7] doc: adapt to cardano db beacon `network` removal

---
 docs/website/root/glossary.md                 |   2 +-
 .../root/manual/develop/run-mithril-devnet.md | 520 ++++++++++--------
 2 files changed, 301 insertions(+), 221 deletions(-)

diff --git a/docs/website/root/glossary.md b/docs/website/root/glossary.md
index 819132024e1..17888fc2444 100644
--- a/docs/website/root/glossary.md
+++ b/docs/website/root/glossary.md
@@ -8,7 +8,7 @@ Below is a comprehensive list of definitions for some common terms used in the M
 
 ## Beacon
 
-A beacon represents a point of the blockchain for which a [Mithril certificate](#certificate) is created. It embeds at least the version of the [Cardano network](#cardano-network) that is targeted, the associated [epoch](#epoch), and the [immutable file number](#immutable-file-number).
+A beacon represents a point of the blockchain for which a [Mithril certificate](#certificate) is created. It embeds the [epoch](#epoch) of the [Cardano network](#cardano-network) that is targeted, and either the block number or the [immutable file number](#immutable-file-number).
 
 ## Cardano network
 
diff --git a/docs/website/root/manual/develop/run-mithril-devnet.md b/docs/website/root/manual/develop/run-mithril-devnet.md
index 4022e6a1942..1045c90f9e4 100644
--- a/docs/website/root/manual/develop/run-mithril-devnet.md
+++ b/docs/website/root/manual/develop/run-mithril-devnet.md
@@ -102,22 +102,79 @@ You should see the following information displayed:
  Bootstrap Mithril/Cardano devnet
 =====================================================================
 
->> Directory: artifacts
->> Cardano Full nodes: 1
->> Cardano SPO nodes: 2
->> Info: Mithril aggregator will be attached to the first Cardano Full node
->> Info: Mithril signers will be attached to each Cardano SPO node
+>> The artifacts directory was force deleted
+>> Devnet Version: 0.4.6
+>> Artifacts Directory[env::ARTIFACTS_DIR]: artifacts
+>> Cardano Full nodes [env::NUM_FULL_NODES]: 1
+>> Cardano SPO nodes [env::NUM_POOL_NODES]: 2
+>> Cardano Node Version [env::CARDANO_NODE_VERSION]: 10.1.2
+>> Cardano Network Magic [env::NETWORK_MAGIC]: 42
+>> Cardano Hard Fork Babbage At Epoch [env::HARD_FORK_BABBAGE_AT_EPOCH]: 0
+>> Cardano Hard Fork Conway At Epoch [env::HARD_FORK_CONWAY_AT_EPOCH]: 0
+>> Cardano Slot Length [env::SLOT_LENGTH]: 0.75s
+>> Cardano Epoch Length [env::EPOCH_LENGTH]: 100s
+>> Cardano Listening Address [env::LISTENING_ADDR]: 127.0.0.1
+>> Creating artifacts directory...
+>> Downloading cardano-cli & cardano-node...
+>> Extracting cardano-cli & cardano-node...
+generated genesis with: 3 genesis keys, 2 non-delegating UTxO keys, 2 stake pools, 2 delegating UTxO keys, 2 delegation map entries,
 
 =====================================================================
  Start Cardano nodes
 =====================================================================
 
 >> Start Cardano network
-cardano-node: no process found
+cardano-cli 10.1.1.0 - linux-x86_64 - ghc-8.10
+git rev 01bda2e2cb0a70cd95067d696dbb44665f1d680a
+cardano-node 10.1.2 - linux-x86_64 - ghc-8.10
+git rev 01bda2e2cb0a70cd95067d696dbb44665f1d680a
 >> Starting Cardano node 'node-full1'
 >> Starting Cardano node 'node-pool1'
 >> Starting Cardano node 'node-pool2'
->> Wait for the Cardano network to be ready
+>> Wait for Cardano network to be ready
+>>>> Cardano network is not ready yet... [attempt 1]
+>>>> Cardano network is not ready yet... [attempt 2]
+>>>> Cardano network is not ready yet... [attempt 3]
+>>>> Cardano network is ready!
+>> Wait for Cardano nodes to have enough immutable files
+>> Wait for node-full1 to have enough immutable files
+>>>> node-full1 has not enough immutable files yet... [attempt 1]
+>>>> node-full1 has not enough immutable files yet... [attempt 2]
+>>>> node-full1 has not enough immutable files yet... [attempt 3]
+>>>> node-full1 has not enough immutable files yet... [attempt 4]
+>>>> node-full1 has not enough immutable files yet... [attempt 5]
+>>>> node-full1 has not enough immutable files yet... [attempt 6]
+>>>> node-full1 has not enough immutable files yet... [attempt 7]
+>>>> node-full1 has not enough immutable files yet... [attempt 8]
+>>>> node-full1 has not enough immutable files yet... [attempt 9]
+>>>> node-full1 has not enough immutable files yet... [attempt 10]
+>>>> node-full1 has not enough immutable files yet... [attempt 11]
+>>>> node-full1 has enough immutable files!
+>> Wait for node-pool1 to have enough immutable files
+>>>> node-pool1 has enough immutable files!
+>> Wait for node-pool2 to have enough immutable files
+>>>> node-pool2 has enough immutable files!
+
+>> Info: Mithril Aggregator will be attached to the first Cardano Full node
+>> Info: Mithril Signers will be attached to each Cardano SPO node
+=====================================================================
+ Start Mithril nodes
+=====================================================================
+
+>> Start Mithril network
+Going to remove artifacts_mithril-aggregator-genesis_run_48d3af826a41
+[+] Running 1/0
+ ⠿ Container artifacts_mithril-aggregator-genesis_run_48d3af826a41  Removed                                                       0.0s
+[+] Running 4/4
+ ⠿ Network artifacts_mithril_network                Created                                                                       0.1s
+ ⠿ Container artifacts-mithril-signer-node-pool1-1  Started                                                                       0.4s
+ ⠿ Container artifacts-mithril-aggregator-1         Started                                                                       0.5s
+ ⠿ Container artifacts-mithril-signer-node-pool2-1  Started                                                                       0.5s
+>> List of Mithril signers
+--------  --------------------------------------------------------  -----------------------------------
+Signer 1  pool1vtck0eeqq2x3d5avpxhd904y73syn4l00yurvl0teg7u6nh3afv  Certified PoolId
+Signer 2  pool1y3pxhtqytcwy3mmnawqf2ej0x9sz5frkkwkz6scfqmzyyw8u38v  Certified PoolId
+>> Wait for Mithril signers to be registered
 >>>> Not ready yet
 >>>> Not ready yet
 >>>> Not ready yet
@@ -131,76 +188,25 @@ cardano-node: no process found
 >>>> Not ready yet
 >>>> Not ready yet
 >>>> Ready!
->> Activate Cardano pools
-Estimated transaction fee: Lovelace 843
-Transaction successfully submitted.
-Estimated transaction fee: Lovelace 843
-Transaction successfully submitted.
->> Wait for Cardano pools to be activated
->>>> Not activated yet
->>>> Not activated yet
->>>> Not activated yet
->>>> Not activated yet
->>>> Not activated yet
->>>> Not activated yet
->>>> Not activated yet
->>>> Not activated yet
->>>> Not activated yet
->>>> Not activated yet
->>>> Activated!
->>>> Found PoolId: pool1v55rfy864kslz86u45w4juahtuqr7cy282rffdnpc9exjlguvys
->>>> Found PoolId: pool1c56jqj5qsala8c24829sxqp0fcrtrrtcmezgrs6w60hl2nwsvav
+>> Bootstrap the Genesis certificate
+{"msg":"Started","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.953666896Z","hostname":"c993b6b764f2","pid":1,"node_version":"0.5.110+e2fa1e0","run_mode":"dev"}
+{Genesis bootstrap for test only!
+"msg":"BOOTSTRAP GENESIS command","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.95394937Z","hostname":"c993b6b764f2","pid":1,"config":"Configuration { environment: Production, cardano_cli_path: \"/app/bin/cardano-cli\", cardano_node_socket_path: \"/data/ipc/node.sock\", cardano_node_version: \"10.1.2\", network_magic: Some(42), network: \"devnet\", chain_observer_type: Pallas, protocol_parameters: ProtocolParameters { k: 5, m: 100, phi_f: 0.65 }, snapshot_uploader_type: Local, snapshot_bucket_name: None, snapshot_use_cdn_domain: false, server_ip: \"0.0.0.0\", server_port: 8080, run_interval: 1000, db_directory: \"/data/db\", snapshot_directory: \".\", data_stores_directory: \"/data/mithril/aggregator/stores\", genesis_verification_key: \"5b33322c3235332c3138362c3230312c3137372c31312c3131372c3133352c3138372c3136372c3138312c3138382c32322c35392c3230362c3130352c3233312c3135302c3231352c33302c37382c3231322c37362c31362c3235322c3138302c37322c3133342c3133372c3234372c3136312c36385d\", reset_digests_cache: false, disable_digests_cache: false, store_retention_limit: None, era_reader_adapter_type: Bootstrap, era_reader_adapter_params: None, signed_entity_types: None, snapshot_compression_algorithm: Zstandard, zstandard_parameters: None, cexplorer_pools_url: None, signer_importer_run_interval: 720, allow_unparsable_block: false, cardano_transactions_prover_cache_pool_size: 10, cardano_transactions_database_connection_pool_size: 10, cardano_transactions_signing_config: CardanoTransactionsSigningConfig { security_parameter: BlockNumber(3000), step: BlockNumber(120) }, cardano_transactions_prover_max_hashes_allowed_by_request: 100, cardano_transactions_block_streamer_max_roll_forwards_per_poll: 10000, enable_metrics_server: false, metrics_server_ip: \"0.0.0.0\", metrics_server_port: 9090, persist_usage_report_interval_in_seconds: 10 }"}
+{"msg":"Opening SQLite connection","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.954098066Z","hostname":"c993b6b764f2","pid":1,"src":"ConnectionBuilder","path":"/data/mithril/aggregator/stores/aggregator.sqlite3"}
+{"msg":"Enabling SQLite Write Ahead Log journal mode","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.954185725Z","hostname":"c993b6b764f2","pid":1,"src":"ConnectionBuilder"}
+{"msg":"Enabling SQLite foreign key support","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.954483371Z","hostname":"c993b6b764f2","pid":1,"src":"ConnectionBuilder"}
+{"msg":"Applying database migrations","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.954561009Z","hostname":"c993b6b764f2","pid":1,"src":"ConnectionBuilder"}
+{"msg":"Check database version","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.954635652Z","hostname":"c993b6b764f2","pid":1,"src":"DatabaseVersionChecker"}
+{"msg":"database up to date","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.954704978Z","hostname":"c993b6b764f2","pid":1,"src":"DatabaseVersionChecker"}
+{"msg":"New MithrilCertificateVerifier created","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.954756269Z","hostname":"c993b6b764f2","pid":1}
+{"msg":"Handle discrepancies at startup of epoch settings store, will record epoch settings from the configuration for epoch 3","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:29:07.956326275Z","hostname":"c993b6b764f2","pid":1,"epoch_settings_configuration":"AggregatorEpochSettings { protocol_parameters: ProtocolParameters { k: 5, m: 100, phi_f: 0.65 }, cardano_transactions_signing_config: CardanoTransactionsSigningConfig { security_parameter: BlockNumber(3000), step: BlockNumber(120) } }"}
 
 =====================================================================
- Start Mithril nodes
+ Schedule Cardano Stake Delegation
 =====================================================================
 
->> Start the Mithril network
->> Build Mithril node Docker images
->>>> Building Mithril aggregator node Docker image
->>>> Building Mithril client node Docker image
->>>> Building Mithril signer node Docker image
-No stopped containers
-Creating network "artifacts_cardano_network" with driver "bridge"
-Creating network "artifacts_mithril_network" with driver "bridge"
-Creating artifacts_mithril-aggregator_1        ... done
-Creating artifacts_mithril-signer-node-pool1_1 ... done
-Creating artifacts_mithril-signer-node-pool2_1 ... done
-Creating artifacts_mithril-aggregator-genesis_run ... done
-{"msg":"Started","v":0,"name":"slog-rs","level":20,"time":"2022-09-06T09:24:31.925641527Z","hostname":"e932dff845aa","pid":1,"config":"Configuration { cardano_cli_path: \"/app/bin/cardano-cli\", cardano_node_socket_path: \"/data/ipc/node.sock\", network_magic: Some(42), network: \"devnet\", protocol_parameters: ProtocolParameters { k: 5, m: 100, phi_f: 0.65 }, snapshot_store_type: Local, snapshot_uploader_type: Local, server_url: \"http://0.0.0.0:8080/\", run_interval: 1000, db_directory: \"/data/db\", snapshot_directory: \"/data/mithril/aggregator\", data_stores_directory: \"/data/mithril/aggregator/stores\", genesis_verification_key: \"5b33322c3235332c3138362c3230312c3137372c31312c3131372c3133352c3138372c3136372c3138312c3138382c32322c35392c3230362c3130352c3233312c3135302c3231352c33302c37382c3231322c37362c31362c3235322c3138302c37322c3133342c3133372c3234372c3136312c36385d\" }","run_mode":"dev"}
-{"msg":"New LocalSnapshotUploader created","v":0,"name":"slog-rs","level":20Genesis bootstrap for test only
-,"time":"2022-09-06T09:24:31.925683285Z","hostname":"e932dff845aa","pid":1,"snapshot_server_url":"http://0.0.0.0:8080/"}
-{"msg":"New MultiSignerImpl created","v":0,"name":"slog-rs","level":20,"time":"2022-09-06T09:24:31.925711468Z","hostname":"e932dff845aa","pid":1}
-{"msg":"New MithrilCertificateVerifier created","v":0,"name":"slog-rs","level":20,"time":"2022-09-06T09:24:31.925736796Z","hostname":"e932dff845aa","pid":1}
-{"msg":"Update current_beacon to Beacon { network: \"devnet\", epoch: Epoch(10), immutable_file_number: 47 }","v":0,"name":"slog-rs","level":20,"time":"2022-09-06T09:24:31.938337155Z","hostname":"e932dff845aa","pid":1}
-{"msg":"Get next signers with stake","v":0,"name":"slog-rs","level":20,"time":"2022-09-06T09:24:31.938384324Z","hostname":"e932dff845aa","pid":1}
-{"msg":"Get next stake distribution","v":0,"name":"slog-rs","level":20,"time":"2022-09-06T09:24:31.938422585Z","hostname":"e932dff845aa","pid":1}
-{"msg":"Get stake distribution with epoch offset","v":0,"name":"slog-rs","level":20,"time":"2022-09-06T09:24:31.938459565Z","hostname":"e932dff845aa","pid":1,"epoch_offset":0}
-{"msg":"Get next protocol parameters","v":0,"name":"slog-rs","level":20,"time":"2022-09-06T09:24:31.938500461Z","hostname":"e932dff845aa","pid":1}
-{"msg":"Get protocol parameters with epoch offset","v":0,"name":"slog-rs","level":20,"time":"2022-09-06T09:24:31.938535367Z","hostname":"e932dff845aa","pid":1,"epoch_offset":0}
-{"msg":"Create clerk","v":0,"name":"slog-rs","level":20,"time":"2022-09-06T09:24:31.93856896Z","hostname":"e932dff845aa","pid":1}
-Verify genesis certificate #86a4c56d957636740a75c250fdd9d3b9a9f1539dc93449b1f80fcab49e279d6d @ epoch #10
-
-=====================================================================
- Schedule Cardano stake delegation
-=====================================================================
-
->> Begin scheduled delegation
->> 11:24:32: Wait 180s until next delegation round...
->> Run delegation round #1!
->>>> Current Epoch: 12
-Estimated transaction fee: Lovelace 436
-Transaction successfully submitted.
-Estimated transaction fee: Lovelace 436
-Transaction successfully submitted.
->> 11:27:32: Wait 180s until next delegation round...
->> Run delegation round #2!
->>>> Current Epoch: 14
-Estimated transaction fee: Lovelace 436
-Transaction successfully submitted.
-Estimated transaction fee: Lovelace 436
-Transaction successfully submitted.
->> 11:30:32: Wait 180s until next delegation round...
+>> Begin scheduled stakes delegation
+>> 11:29:08: Wait 180s until next stakes delegation round...
 ```
 
 ### Step 2: Query the devnet
@@ -222,87 +228,194 @@ The networks will be queried every second and will display:
 =====================================================================
 
 =====================================================================
-=== Mithril network
+=== Mithril Network
 =====================================================================
 
 >> Query pending certificate
-{
-  "beacon": {
-    "network": "devnet",
-    "epoch": 2,
-    "immutable_file_number": 6
-  },
-  "protocol": {
-    "k": 5,
-    "m": 100,
-    "phi_f": 0.65
+
+>> Query latest certificates
+[
+  {
+    "hash": "cbbf3fc1165ff41f2f0691643febe7f8c2d4f99b5c551d01d5f6cca538db0cd4",
+    "previous_hash": "3d1ceee23e79b1f510c7a6ce4503552495c6f7134afd04a88042d99264da8515",
+    "epoch": 15,
+    "signed_entity_type": {
+      "CardanoTransactions": [
+        15,
+        1589
+      ]
+    },
+    "metadata": {
+      "network": "devnet",
+      "version": "0.1.0",
+      "parameters": {
+        "k": 5,
+        "m": 100,
+        "phi_f": 0.65
+      },
+      "initiated_at": "2024-11-14T10:45:15.434075727Z",
+      "sealed_at": "2024-11-14T10:45:16.441653366Z",
+      "total_signers": 2
+    },
+    "protocol_message": {
+      "message_parts": {
+        "cardano_transactions_merkle_root": "ecfeb3584f505906de1fadcc6f4acaa9fda55da82c771073a83bbb288bb62b6e",
+        "next_aggregate_verification_key": "7b226d745f636f6d6d69746d656e74223a7b22726f6f74223a5b3137382c39342c33322c3132392c3132302c3132382c31372c3232352c37332c3135372c3136362c3132342c3234362c3130362c35352c33362c3135372c332c3137372c3231392c35332c3139342c3139322c39342c3133382c36332c3134332c3233312c3230332c3138362c36342c3134335d2c226e725f6c6561766573223a322c22686173686572223a6e756c6c7d2c22746f74616c5f7374616b65223a3230323830313337303631347d",
+        "latest_block_number": "1589"
+      }
+    },
+    "signed_message": "3b2242e276f1d1e8f28e5ffeb0f0c666ef3d5a5b2c8bf827576d4a513ab2de29",
+    "aggregate_verification_key": "7b226d745f636f6d6d69746d656e74223a7b22726f6f74223a5b3233322c33332c3132362c38392c3134332c3138312c32362c3130362c3131362c37392c3230392c34382c3232302c3136332c3133322c3232302c33312c3136392c3131312c3133382c3130332c39382c37332c37312c3135322c3235352c34352c3138322c39362c32382c3137362c3136355d2c226e725f6c6561766573223a322c22686173686572223a6e756c6c7d2c22746f74616c5f7374616b65223a3139303036353437303735387d"
   },
-  "signers": []
-}
+  {
+    "hash": "47068954d8600c214a194be00790a6108c7b397fc91f950f063c7877d8121b92",
+    "previous_hash": "3d1ceee23e79b1f510c7a6ce4503552495c6f7134afd04a88042d99264da8515",
+    "epoch": 15,
+    "signed_entity_type": {
+      "CardanoTransactions": [
+        15,
+        1574
+      ]
+    },
+    "metadata": {
+      "network": "devnet",
+      "version": "0.1.0",
+      "parameters": {
+        "k": 5,
+        "m": 100,
+        "phi_f": 0.65
+      },
+      "initiated_at": "2024-11-14T10:45:04.382631109Z",
+      "sealed_at": "2024-11-14T10:45:05.394615861Z",
+      "total_signers": 2
+    },
+    "protocol_message": {
+      "message_parts": {
+        "cardano_transactions_merkle_root": "ecfeb3584f505906de1fadcc6f4acaa9fda55da82c771073a83bbb288bb62b6e",
+        "next_aggregate_verification_key": "7b226d745f636f6d6d69746d656e74223a7b22726f6f74223a5b3137382c39342c33322c3132392c3132302c3132382c31372c3232352c37332c3135372c3136362c3132342c3234362c3130362c35352c33362c3135372c332c3137372c3231392c35332c3139342c3139322c39342c3133382c36332c3134332c3233312c3230332c3138362c36342c3134335d2c226e725f6c6561766573223a322c22686173686572223a6e756c6c7d2c22746f74616c5f7374616b65223a3230323830313337303631347d",
+        "latest_block_number": "1574"
+      }
+    },
+    "signed_message": "ed76b5a8b41e4800fd4babc5bcffe483fe9daf43342aaddefe1f197907f0af06",
+    "aggregate_verification_key": "7b226d745f636f6d6d69746d656e74223a7b22726f6f74223a5b3233322c33332c3132362c38392c3134332c3138312c32362c3130362c3131362c37392c3230392c34382c3232302c3136332c3133322c3232302c33312c3136392c3131312c3133382c3130332c39382c37332c37312c3135322c3235352c34352c3138322c39362c32382c3137362c3136355d2c226e725f6c6561766573223a322c22686173686572223a6e756c6c7d2c22746f74616c5f7374616b65223a3139303036353437303735387d"
+  }
+]
 
->> Query snapshots
+>> Query latest mithril stake distributions
 [
   {
-    "digest": "224b77ad9cbe7fc81e6808940d391b299c27e77d9978641025f382e2e5ddd2ac",
-    "certificate_hash": "5b29543c4af0f369d40e1da53451ebd8a39c4263df1585eb072f54511c1e3333",
-    "size": 7986,
-    "created_at": "2022-07-05T11:26:55.855498395Z",
-    "locations": [
-      "http://0.0.0.0:8080/aggregator/snapshot/224b77ad9cbe7fc81e6808940d391b299c27e77d9978641025f382e2e5ddd2ac/download"
-    ]
+    "epoch": 15,
+    "hash": "61239e7ea3388238aae9336ccbce50c477ad42478f6fc1642210708118c7ca00",
+    "certificate_hash": "3d1ceee23e79b1f510c7a6ce4503552495c6f7134afd04a88042d99264da8515",
+    "created_at": "2024-11-14T10:44:11.099191475Z"
   },
   {
-    "digest": "1a39f57c906133421ab7b5c782762b6abff4771b5e9158a977e58db1edc26bd0",
-    "certificate_hash": "be758b84a4b495e82af48747356946efb509ccbc4b44a9c985e3cb3099e35c94",
-    "size": 6743,
-    "created_at": "2022-07-05T11:26:35.658661878Z",
+    "epoch": 14,
+    "hash": "0c1962696593e52c21683287df30f47027ae5d5f669384f5534784e6f51cdd33",
+    "certificate_hash": "fa6fc82a1a2bf93a81f5920f1d0ac143aa73183b4b8226a54f3e16741f3705a1",
+    "created_at": "2024-11-14T10:42:55.567493973Z"
+  }
+]
+
+>> Query latest snapshots
+[
+  {
+    "digest": "4c7b06dd2bef1416391b92a46dae7d2f606ced2954b628f844b021ba5b52b15f",
+    "network": "devnet",
+    "beacon": {
+      "network": "devnet",
+      "epoch": 15,
+      "immutable_file_number": 14
+    },
+    "certificate_hash": "f601ab107b546d8791075916b9fd6ba374b30a7ce6030549e140bac04078b3b6",
+    "size": 519351,
+    "created_at": "2024-11-14T10:44:17.153390171Z",
     "locations": [
-      "http://0.0.0.0:8080/aggregator/snapshot/1a39f57c906133421ab7b5c782762b6abff4771b5e9158a977e58db1edc26bd0/download"
-    ]
+      "http://0.0.0.0:8080/aggregator/artifact/snapshot/4c7b06dd2bef1416391b92a46dae7d2f606ced2954b628f844b021ba5b52b15f/download"
+    ],
+    "compression_algorithm": "zstandard",
+    "cardano_node_version": "10.1.2"
   },
   {
-    "digest": "fd1a39d28998ba18c96547f62d308c57612ed348be058f615c14db5228a947c1",
-    "certificate_hash": "4254a6176afbe17967ad1671e4619e9a3f3412115a63dd0eb0f5e8b64094128a",
-    "size": 6199,
-    "created_at": "2022-07-05T11:26:20.470029035Z",
+    "digest": "b98b25f505401e967df1012a4c13385290db15d157d0292e9f8290bd9933a66e",
+    "network": "devnet",
+    "beacon": {
+      "network": "devnet",
+      "epoch": 14,
+      "immutable_file_number": 13
+    },
+    "certificate_hash": "1ec38ed6f158664bf792fb2fddd08e49b52232023b4130b3ebd92e90d659f200",
+    "size": 469807,
+    "created_at": "2024-11-14T10:43:01.620428990Z",
     "locations": [
-      "http://0.0.0.0:8080/aggregator/snapshot/fd1a39d28998ba18c96547f62d308c57612ed348be058f615c14db5228a947c1/download"
-    ]
+      "http://0.0.0.0:8080/aggregator/artifact/snapshot/b98b25f505401e967df1012a4c13385290db15d157d0292e9f8290bd9933a66e/download"
+    ],
+    "compression_algorithm": "zstandard",
+    "cardano_node_version": "10.1.2"
   }
 ]
 
+
 =====================================================================
-=== Cardano network
+=== Cardano Network
 =====================================================================
 
 >> Query chain tip
 {
-    "era": "Alonzo",
-    "syncProgress": "100.00",
-    "hash": "075fc8366d353b45debedfc6faa92148c8fad584d81dbb4ea7b8b4d121489452",
-    "epoch": 2,
-    "slot": 219,
-    "block": 9
+  "block": 1599,
+  "epoch": 15,
+  "era": "Conway",
+  "hash": "1d46bbd5179968366568822961f8df9d0e0ea0d74bcf1b371402ddeee315ea41",
+  "slot": 1599,
+  "slotInEpoch": 99,
+  "slotsToEpochEnd": 1,
+  "syncProgress": "100.00"
 }
 
->> Query the whole UTXO
+>> Query whole utxo
                            TxHash                                 TxIx        Amount
 --------------------------------------------------------------------------------------
-4980fb7c90bc003f6af65778008732cd1b1a8c0873b7d622bfb7442f1312c9b5     0        447999157 lovelace + TxOutDatumNone
-4980fb7c90bc003f6af65778008732cd1b1a8c0873b7d622bfb7442f1312c9b5     1        2000000 lovelace + TxOutDatumNone
-c31e535531c9eb32bdd8f05e25204186333262674d24c6a770b6b120f020d9a9     0        448999157 lovelace + TxOutDatumNone
-c31e535531c9eb32bdd8f05e25204186333262674d24c6a770b6b120f020d9a9     1        1000000 lovelace + TxOutDatumNone
-ed265b672873192ea1e9c19092e8f41947c28977438bcff580312de37cfbd46c     0        1002000000 lovelace + TxOutDatumNone
+0227b08e4971e69af83e4f7f37f9b6db11a4e5b0293259bcbc18b960cca2aa34     0        2000003 lovelace + TxOutDatumNone
+07ccbb09c88f1789512879adc5c46b70f746d27fc77a938d879b0235ffd06e10     0        20000000001 lovelace + TxOutDatumNone
+08823e13632b63dcd2eaf6f064c960b94f1d51652dc218e306305ee13fec5d9f     0        2000002 lovelace + TxOutDatumNone
+099b200f28beedd811298150f55f96e3f9c100975dd1b978040e8cc667d44093     0        1000001 lovelace + TxOutDatumNone
+13c36c25cbd8afb893813f996907ab13f9f89fd46b5c9a79710996869311ae83     0        6000000 lovelace + TxOutDatumNone
+22d4daa27b05d1045f788ae981297ec6038c0856c974f8042be7209b8e6d94db     0        1000002 lovelace + TxOutDatumNone
+46e00ecedaa75c64bf23b9c4d95b74e1432570feb800ecb0ab5eb1de05a6e4f1     0        2000004 lovelace + TxOutDatumNone
+4a1c33bb474d27398bcd2d79ffca99e675850cba01655a7a7fc1110b3a0b85e3     0        1000003 lovelace + TxOutDatumNone
+993b375acdd9f28ce1e7eab5a870d382d090b6ec1ce3372581c7c8b03e356d3b     0        2000001 lovelace + TxOutDatumNone
+b9b28ace208bd3fb5feda08e6978ea274be8c2f8d8852ac8ea08dd27cd99133e     0        6000000 lovelace + TxOutDatumNone
+bf208279833e96f02cf5d91805898b40784a9516f7f122edcf1fb2c773019861     0        1000005 lovelace + TxOutDatumNone
+bf208279833e96f02cf5d91805898b40784a9516f7f122edcf1fb2c773019861     1        899993679904 lovelace + TxOutDatumNone
+e0e68233e335f20b319d220a4e3e0fbca8f4b0c493a2ba216fa81a17520de4a4     0        20000000001 lovelace + TxOutDatumNone
+e9ca751d4fc6bd00203d36184de814f6687f017ec6a4c6e481e1e188208c8b1f     0        2000005 lovelace + TxOutDatumNone
+e9ca751d4fc6bd00203d36184de814f6687f017ec6a4c6e481e1e188208c8b1f     1        899988679904 lovelace + TxOutDatumNone
+f5f61cdd76949003172e85941f4aae85ce99764b4a66e378dfb1e1f7fd1abde7     0        1000004 lovelace + TxOutDatumNone
 
 >> Query stake pools
-pool1v55rfy864kslz86u45w4juahtuqr7cy282rffdnpc9exjlguvys
-pool1c56jqj5qsala8c24829sxqp0fcrtrrtcmezgrs6w60hl2nwsvav
+pool1y3pxhtqytcwy3mmnawqf2ej0x9sz5frkkwkz6scfqmzyyw8u38v
+pool1vtck0eeqq2x3d5avpxhd904y73syn4l00yurvl0teg7u6nh3afv
 
 >> Query stake distribution
-                           PoolId                                 Stake frac
-------------------------------------------------------------------------------
-pool1v55rfy864kslz86u45w4juahtuqr7cy282rffdnpc9exjlguvys   1.052e-3
-pool1c56jqj5qsala8c24829sxqp0fcrtrrtcmezgrs6w60hl2nwsvav   5.258e-4
+{
+  "pools": {
+    "24426bac045e1c48ef73eb8095664f31602a2476b3ac2d430906c442": {
+      "stakeGo": 96954320166,
+      "stakeMark": 110102978737,
+      "stakeSet": 103772355610
+    },
+    "62f167e720028d16d3ac09aed2bea4f46049d7ef7938367debca3dcd": {
+      "stakeGo": 93111150592,
+      "stakeMark": 105309514088,
+      "stakeSet": 99029015004
+    }
+  },
+  "total": {
+    "stakeGo": 190065470758,
+    "stakeMark": 215412492825,
+    "stakeSet": 202801370614
+  }
+}
 ```
 
 ### Step 3: Observe the devnet
@@ -310,7 +423,7 @@ pool1c56jqj5qsala8c24829sxqp0fcrtrrtcmezgrs6w60hl2nwsvav   5.258e-4
 Open a third terminal window. Watch the logs of each devnet node:
 
 ```bash
-watch -n 1 LINES=5 ./devnet-log.sh
+watch -n 1 `LINES=5 ./devnet-log.sh`
 ```
 
 The nodes will be queried every second and will display thus:
@@ -321,107 +434,74 @@ The nodes will be queried every second and will display thus:
 =====================================================================
 
 =====================================================================
---  docker compose logs --tail=5
+=== Mithril Network
 =====================================================================
-Attaching to artifacts_mithril-signer-node-pool1_1, artifacts_mithril-signer-node-pool2_1, artifacts_mithril-aggregator_1
-mithril-aggregator_1         | {"msg":"Epoch computation is not final and needs to be fixed: 4","v":0,"name":"slog-rs","level":40,"time":"2022-07-05T11:29:32.726760492Z","hostname":"ba17593540ac","pid":1}
-mithril-aggregator_1         | {"msg":"Get signer pool1c56jqj5qsala8c24829sxqp0fcrtrrtcmezgrs6w60hl2nwsvav","v":0,"name":"slog-rs","level":20,"time":"2022-07-05T11:29:32.72678048Z","hostname":"ba17593540ac","pid":1}
-mithril-aggregator_1         | {"msg":"Epoch computation is not final and needs to be fixed: 4","v":0,"name":"slog-rs","level":40,"time":"2022-07-05T11:29:32.72679661Z","hostname":"ba17593540ac","pid":1}
-mithril-aggregator_1         | {"msg":"Get signer pool1v55rfy864kslz86u45w4juahtuqr7cy282rffdnpc9exjlguvys","v":0,"name":"slog-rs","level":20,"time":"2022-07-05T11:29:32.734529107Z","hostname":"ba17593540ac","pid":1}
-mithril-aggregator_1         | {"msg":"Epoch computation is not final and needs to be fixed: 4","v":0,"name":"slog-rs","level":40,"time":"2022-07-05T11:29:32.734553714Z","hostname":"ba17593540ac","pid":1}
-mithril-signer-node-pool1_1  | {"msg":"Signing digest","v":0,"name":"slog-rs","level":30,"time":"2022-07-05T11:29:32.744124074Z","hostname":"4fc53f5ce413","pid":1,"digester_result":"DigesterResult {\n    digest: \"e5ac1579a3fff12bf19ef88b0d9ec9d8a1c53e4d74c38c023b2e33638f454d67\",\n    last_immutable_file_number: 17,\n}"}
-mithril-signer-node-pool1_1  | {"msg":"Register signatures","v":0,"name":"slog-rs","level":30,"time":"2022-07-05T11:29:32.744140625Z","hostname":"4fc53f5ce413","pid":1}
-mithril-signer-node-pool1_1  | {"msg":"Epoch computation is not final and needs to be fixed: 4","v":0,"name":"slog-rs","level":40,"time":"2022-07-05T11:29:32.744155293Z","hostname":"4fc53f5ce413","pid":1}
-mithril-signer-node-pool1_1  | {"msg":"SingleSignaturesComputeFailed(UnregisteredVerificationKey)","v":0,"name":"slog-rs","level":50,"time":"2022-07-05T11:29:32.744336041Z","hostname":"4fc53f5ce413","pid":1}
-mithril-signer-node-pool1_1  | {"msg":"Sleeping for 1000","v":0,"name":"slog-rs","level":30,"time":"2022-07-05T11:29:32.744352051Z","hostname":"4fc53f5ce413","pid":1}
-mithril-signer-node-pool2_1  | {"msg":"Signing digest","v":0,"name":"slog-rs","level":30,"time":"2022-07-05T11:29:32.73359119Z","hostname":"1c671096ee3f","pid":1,"digester_result":"DigesterResult {\n    digest: \"e5ac1579a3fff12bf19ef88b0d9ec9d8a1c53e4d74c38c023b2e33638f454d67\",\n    last_immutable_file_number: 17,\n}"}
-mithril-signer-node-pool2_1  | {"msg":"Register signatures","v":0,"name":"slog-rs","level":30,"time":"2022-07-05T11:29:32.733607821Z","hostname":"1c671096ee3f","pid":1}
-mithril-signer-node-pool2_1  | {"msg":"Epoch computation is not final and needs to be fixed: 4","v":0,"name":"slog-rs","level":40,"time":"2022-07-05T11:29:32.733623511Z","hostname":"1c671096ee3f","pid":1}
-mithril-signer-node-pool2_1  | {"msg":"SingleSignaturesComputeFailed(UnregisteredVerificationKey)","v":0,"name":"slog-rs","level":50,"time":"2022-07-05T11:29:32.733786246Z","hostname":"1c671096ee3f","pid":1}
-mithril-signer-node-pool2_1  | {"msg":"Sleeping for 1000","v":0,"name":"slog-rs","level":30,"time":"2022-07-05T11:29:32.733802416Z","hostname":"1c671096ee3f","pid":1}
 
-=====================================================================
-=====================================================================
-tail -n 22 ./node-full1/node.log
-=====================================================================
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:27:28.01 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 219, dsSuffix = Nothing} at 075fc8366d353b45debedfc6faa92148c8fad584d81dbb4ea7b8b4d121489452 at slot 219
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:27:40.76 UTC] Chain extended, new tip: af93c6964de49d0696bf194c222f6e5a40e5123ef688a20613a33a705b6b736a at slot 253
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:27:40.76 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 228, dsSuffix = Nothing} at 720c625a259a23f21926fe7a30dad9b7a4b50958a508c8cfdc96a94625fbf00d at slot 228
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:27:43.75 UTC] Chain extended, new tip: 9f141fe78c0baa433c2554d3a09a9b43c47faa7b740be254893000310e5bad3b at slot 257
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:27:52.76 UTC] Chain extended, new tip: bfc0b2c1c4d06699efcdf6ad7b33c48cea722fb4bb5c5d6761a3768609cf77a4 at slot 269
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:27:52.76 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 253, dsSuffix = Nothing} at af93c6964de49d0696bf194c222f6e5a40e5123ef688a20613a33a705b6b736a at slot 253
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:03.26 UTC] Chain extended, new tip: c6238e98f186278eeef86d13f3482ebfb9b1d01d2a28da78282bfd241524eccd at slot 283
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:28:03.26 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 257, dsSuffix = Nothing} at 9f141fe78c0baa433c2554d3a09a9b43c47faa7b740be254893000310e5bad3b at slot 257
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:04.75 UTC] Chain extended, new tip: ac332aea5f043b3fd5ac68a04225932a21935ad7e5c5cfbb7e5b0b00df713bff at slot 285
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:16.00 UTC] Chain extended, new tip: e68d08e0c127a5346a74dd06713d8de0b4e37e338a0e03987da356bb70892b99 at slot 300
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:28:16.00 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 283, dsSuffix = Nothing} at c6238e98f186278eeef86d13f3482ebfb9b1d01d2a28da78282bfd241524eccd at slot 283
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:18.25 UTC] Chain extended, new tip: bc07b985d7f76bacc0a726b2dc5aa76a7254f1e4548a633cdfd62c31e022b3a5 at slot 303
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:37.00 UTC] Chain extended, new tip: 7d53c5eba9679c96ba32d79a02cfd953280b3477f1dd8eeb18447638c8a30e20 at slot 328
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:28:37.00 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 300, dsSuffix = Nothing} at e68d08e0c127a5346a74dd06713d8de0b4e37e338a0e03987da356bb70892b99 at slot 300
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:58.75 UTC] Chain extended, new tip: 3e9734018c585eea160a33accf82f758713f0e7aae1fab4dc40bccd859b8066f at slot 357
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:28:58.75 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 303, dsSuffix = Nothing} at bc07b985d7f76bacc0a726b2dc5aa76a7254f1e4548a633cdfd62c31e022b3a5 at slot 303
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:29:05.50 UTC] Chain extended, new tip: 8876850840ae52ca240d517def4b9c8a5db98e2e7db17f8abf87e4f12db13d15 at slot 366
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:29:05.50 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 328, dsSuffix = Nothing} at 7d53c5eba9679c96ba32d79a02cfd953280b3477f1dd8eeb18447638c8a30e20 at slot 328
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:29:19.75 UTC] Chain extended, new tip: 5733ec701db5c9dc253dd4b611421de0c2d223e6ee99c8d61010a9fea42d504b at slot 385
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:29:19.75 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 357, dsSuffix = Nothing} at 3e9734018c585eea160a33accf82f758713f0e7aae1fab4dc40bccd859b8066f at slot 357
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:29:31.00 UTC] Chain extended, new tip: 331c824ebee92dee7717f7bcc1457ac89b0de33d76073e6edd97a28770fa364b at slot 400
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:29:31.00 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 366, dsSuffix = Nothing} at 8876850840ae52ca240d517def4b9c8a5db98e2e7db17f8abf87e4f12db13d15 at slot 366
-=====================================================================
+---------------------------------------------------------------------
+docker logs -n 5 artifacts-mithril-aggregator-1
+---------------------------------------------------------------------
+{"msg":"Marked expired open messages","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:45:00.368456608Z","hostname":"bd8372c8c9d5","pid":1,"src":"AggregatorRunner","expired_open_message":"None"}
+{"msg":">> get_open_message(signed_entity_type: CardanoTransactions(Epoch(15), BlockNumber(1559)))","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:45:00.368471645Z","hostname":"bd8372c8c9d5","pid":1,"src":"MithrilCertifierService"}
+{"msg":" ⋅ No open message to certify, waiting…","v":0,"name":"mithril-aggregator","level":30,"time":"2024-11-14T10:45:00.36863267Z","hostname":"bd8372c8c9d5","pid":1,"src":"AggregatorRuntime","time_point":"TimePoint { epoch: Epoch(15), immutable_file_number: 14, chain_point: ChainPoint { slot_number: SlotNumber(1569), block_number: BlockNumber(1569), block_hash: \"6aadd9a1c21c53f79b703cabfc2a49032dcde2464b94ab578719b6aadb222f23\" } }"}
+{"msg":"Incrementing 'mithril_aggregator_runtime_cycle_success_since_startup' counter","v":0,"name":"mithril-aggregator","level":20,"time":"2024-11-14T10:45:00.368647673Z","hostname":"bd8372c8c9d5","pid":1,"src":"MetricsService"}
+{"msg":"… Cycle finished, Sleeping for 1000 ms","v":0,"name":"mithril-aggregator","level":30,"time":"2024-11-14T10:45:00.368664195Z","hostname":"bd8372c8c9d5","pid":1,"src":"AggregatorRuntime"}
+---------------------------------------------------------------------
+
+---------------------------------------------------------------------
+docker logs -n 5 artifacts-mithril-signer-node-pool1-1
+---------------------------------------------------------------------
+{"msg":">> get_current_time_point","v":0,"name":"mithril-signer","level":20,"time":"2024-11-14T10:45:00.5408476Z","hostname":"143e20c318ed","pid":1,"src":"SignerRunner"}
+{"msg":">> get_beacon_to_sign(time_point: TimePoint (epoch: 15, immutable_file_number: 14, chain_point: ChainPoint (slot_number: 1571, block_number: 1571, block_hash: 50640d2cbcc7a36cda9bb42b127769448b3799b95613ebcc021b0b416b793942)))","v":0,"name":"mithril-signer","level":20,"time":"2024-11-14T10:45:00.541841221Z","hostname":"143e20c318ed","pid":1,"src":"SignerRunner"}
+{"msg":" ⋅ No beacon to sign, waiting…","v":0,"name":"mithril-signer","level":30,"time":"2024-11-14T10:45:00.541994982Z","hostname":"143e20c318ed","pid":1,"src":"StateMachine"}
+{"msg":"Incrementing 'mithril_signer_runtime_cycle_success_since_startup' counter","v":0,"name":"mithril-signer","level":20,"time":"2024-11-14T10:45:00.542006483Z","hostname":"143e20c318ed","pid":1,"src":"MetricsService"}
+{"msg":"… Cycle finished, Sleeping for 700 ms","v":0,"name":"mithril-signer","level":30,"time":"2024-11-14T10:45:00.542022062Z","hostname":"143e20c318ed","pid":1,"src":"StateMachine"}
+---------------------------------------------------------------------
+
+---------------------------------------------------------------------
+docker logs -n 5 artifacts-mithril-signer-node-pool2-1
+---------------------------------------------------------------------
+{"msg":">> get_current_time_point","v":0,"name":"mithril-signer","level":20,"time":"2024-11-14T10:45:00.526442506Z","hostname":"b675f9c9de52","pid":1,"src":"SignerRunner"}
+{"msg":">> get_beacon_to_sign(time_point: TimePoint (epoch: 15, immutable_file_number: 14, chain_point: ChainPoint (slot_number: 1571, block_number: 1571, block_hash: 50640d2cbcc7a36cda9bb42b127769448b3799b95613ebcc021b0b416b793942)))","v":0,"name":"mithril-signer","level":20,"time":"2024-11-14T10:45:00.527386742Z","hostname":"b675f9c9de52","pid":1,"src":"SignerRunner"}
+{"msg":" ⋅ No beacon to sign, waiting…","v":0,"name":"mithril-signer","level":30,"time":"2024-11-14T10:45:00.527529799Z","hostname":"b675f9c9de52","pid":1,"src":"StateMachine"}
+{"msg":"Incrementing 'mithril_signer_runtime_cycle_success_since_startup' counter","v":0,"name":"mithril-signer","level":20,"time":"2024-11-14T10:45:00.527539103Z","hostname":"b675f9c9de52","pid":1,"src":"MetricsService"}
+{"msg":"… Cycle finished, Sleeping for 700 ms","v":0,"name":"mithril-signer","level":30,"time":"2024-11-14T10:45:00.527547906Z","hostname":"b675f9c9de52","pid":1,"src":"StateMachine"}
+---------------------------------------------------------------------
 
-=====================================================================
-tail -n 22 ./node-pool1/node.log
-=====================================================================
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:27:28.00 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 219, dsSuffix = Nothing} at 075fc8366d353b45debedfc6faa92148c8fad584d81dbb4ea7b8b4d121489452 at slot 219
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:27:40.76 UTC] Chain extended, new tip: af93c6964de49d0696bf194c222f6e5a40e5123ef688a20613a33a705b6b736a at slot 253
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:27:40.76 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 228, dsSuffix = Nothing} at 720c625a259a23f21926fe7a30dad9b7a4b50958a508c8cfdc96a94625fbf00d at slot 228
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:27:43.76 UTC] Chain extended, new tip: 9f141fe78c0baa433c2554d3a09a9b43c47faa7b740be254893000310e5bad3b at slot 257
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:27:52.75 UTC] Chain extended, new tip: bfc0b2c1c4d06699efcdf6ad7b33c48cea722fb4bb5c5d6761a3768609cf77a4 at slot 269
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:27:52.75 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 253, dsSuffix = Nothing} at af93c6964de49d0696bf194c222f6e5a40e5123ef688a20613a33a705b6b736a at slot 253
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:03.26 UTC] Chain extended, new tip: c6238e98f186278eeef86d13f3482ebfb9b1d01d2a28da78282bfd241524eccd at slot 283
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:28:03.26 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 257, dsSuffix = Nothing} at 9f141fe78c0baa433c2554d3a09a9b43c47faa7b740be254893000310e5bad3b at slot 257
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:04.75 UTC] Chain extended, new tip: ac332aea5f043b3fd5ac68a04225932a21935ad7e5c5cfbb7e5b0b00df713bff at slot 285
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:16.00 UTC] Chain extended, new tip: e68d08e0c127a5346a74dd06713d8de0b4e37e338a0e03987da356bb70892b99 at slot 300
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:28:16.01 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 283, dsSuffix = Nothing} at c6238e98f186278eeef86d13f3482ebfb9b1d01d2a28da78282bfd241524eccd at slot 283
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:18.25 UTC] Chain extended, new tip: bc07b985d7f76bacc0a726b2dc5aa76a7254f1e4548a633cdfd62c31e022b3a5 at slot 303
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:37.00 UTC] Chain extended, new tip: 7d53c5eba9679c96ba32d79a02cfd953280b3477f1dd8eeb18447638c8a30e20 at slot 328
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:28:37.00 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 300, dsSuffix = Nothing} at e68d08e0c127a5346a74dd06713d8de0b4e37e338a0e03987da356bb70892b99 at slot 300
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:58.76 UTC] Chain extended, new tip: 3e9734018c585eea160a33accf82f758713f0e7aae1fab4dc40bccd859b8066f at slot 357
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:28:58.76 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 303, dsSuffix = Nothing} at bc07b985d7f76bacc0a726b2dc5aa76a7254f1e4548a633cdfd62c31e022b3a5 at slot 303
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:29:05.50 UTC] Chain extended, new tip: 8876850840ae52ca240d517def4b9c8a5db98e2e7db17f8abf87e4f12db13d15 at slot 366
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:29:05.51 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 328, dsSuffix = Nothing} at 7d53c5eba9679c96ba32d79a02cfd953280b3477f1dd8eeb18447638c8a30e20 at slot 328
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:29:19.75 UTC] Chain extended, new tip: 5733ec701db5c9dc253dd4b611421de0c2d223e6ee99c8d61010a9fea42d504b at slot 385
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:29:19.76 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 357, dsSuffix = Nothing} at 3e9734018c585eea160a33accf82f758713f0e7aae1fab4dc40bccd859b8066f at slot 357
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:29:31.00 UTC] Chain extended, new tip: 331c824ebee92dee7717f7bcc1457ac89b0de33d76073e6edd97a28770fa364b at slot 400
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:29:31.00 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 366, dsSuffix = Nothing} at 8876850840ae52ca240d517def4b9c8a5db98e2e7db17f8abf87e4f12db13d15 at slot 366
-=====================================================================
 
 =====================================================================
-tail -n 22 ./node-pool2/node.log
-=====================================================================
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:27:28.00 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 219, dsSuffix = Nothing} at 075fc8366d353b45debedfc6faa92148c8fad584d81dbb4ea7b8b4d121489452 at slot 219
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:27:40.75 UTC] Chain extended, new tip: af93c6964de49d0696bf194c222f6e5a40e5123ef688a20613a33a705b6b736a at slot 253
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:27:40.75 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 228, dsSuffix = Nothing} at 720c625a259a23f21926fe7a30dad9b7a4b50958a508c8cfdc96a94625fbf00d at slot 228
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:27:43.76 UTC] Chain extended, new tip: 9f141fe78c0baa433c2554d3a09a9b43c47faa7b740be254893000310e5bad3b at slot 257
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:27:52.75 UTC] Chain extended, new tip: bfc0b2c1c4d06699efcdf6ad7b33c48cea722fb4bb5c5d6761a3768609cf77a4 at slot 269
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:27:52.76 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 253, dsSuffix = Nothing} at af93c6964de49d0696bf194c222f6e5a40e5123ef688a20613a33a705b6b736a at slot 253
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:03.25 UTC] Chain extended, new tip: c6238e98f186278eeef86d13f3482ebfb9b1d01d2a28da78282bfd241524eccd at slot 283
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:28:03.25 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 257, dsSuffix = Nothing} at 9f141fe78c0baa433c2554d3a09a9b43c47faa7b740be254893000310e5bad3b at slot 257
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:04.75 UTC] Chain extended, new tip: ac332aea5f043b3fd5ac68a04225932a21935ad7e5c5cfbb7e5b0b00df713bff at slot 285
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:16.00 UTC] Chain extended, new tip: e68d08e0c127a5346a74dd06713d8de0b4e37e338a0e03987da356bb70892b99 at slot 300
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:28:16.01 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 283, dsSuffix = Nothing} at c6238e98f186278eeef86d13f3482ebfb9b1d01d2a28da78282bfd241524eccd at slot 283
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:18.25 UTC] Chain extended, new tip: bc07b985d7f76bacc0a726b2dc5aa76a7254f1e4548a633cdfd62c31e022b3a5 at slot 303
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:37.00 UTC] Chain extended, new tip: 7d53c5eba9679c96ba32d79a02cfd953280b3477f1dd8eeb18447638c8a30e20 at slot 328
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:28:37.00 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 300, dsSuffix = Nothing} at e68d08e0c127a5346a74dd06713d8de0b4e37e338a0e03987da356bb70892b99 at slot 300
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:28:58.76 UTC] Chain extended, new tip: 3e9734018c585eea160a33accf82f758713f0e7aae1fab4dc40bccd859b8066f at slot 357
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:28:58.76 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 303, dsSuffix = Nothing} at bc07b985d7f76bacc0a726b2dc5aa76a7254f1e4548a633cdfd62c31e022b3a5 at slot 303
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:29:05.50 UTC] Chain extended, new tip: 8876850840ae52ca240d517def4b9c8a5db98e2e7db17f8abf87e4f12db13d15 at slot 366
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:29:05.50 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 328, dsSuffix = Nothing} at 7d53c5eba9679c96ba32d79a02cfd953280b3477f1dd8eeb18447638c8a30e20 at slot 328
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:29:19.75 UTC] Chain extended, new tip: 5733ec701db5c9dc253dd4b611421de0c2d223e6ee99c8d61010a9fea42d504b at slot 385
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:29:19.76 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 357, dsSuffix = Nothing} at 3e9734018c585eea160a33accf82f758713f0e7aae1fab4dc40bccd859b8066f at slot 357
-[jp:cardano.node.ChainDB:Notice:21] [2022-07-05 11:29:31.00 UTC] Chain extended, new tip: 331c824ebee92dee7717f7bcc1457ac89b0de33d76073e6edd97a28770fa364b at slot 400
-[jp:cardano.node.ChainDB:Info:25] [2022-07-05 11:29:31.00 UTC] Took ledger snapshot DiskSnapshot {dsNumber = 366, dsSuffix = Nothing} at 8876850840ae52ca240d517def4b9c8a5db98e2e7db17f8abf87e4f12db13d15 at slot 366
+=== Cardano Network
 =====================================================================
 
+---------------------------------------------------------------------
+tail -n 5 ./node-full1/node.log
+---------------------------------------------------------------------
+[denis-XP:cardano.node.LocalErrorPolicy:Error:63] [2024-11-14 10:45:00.36 UTC] IP LocalAddress "node-full1/ipc/node.sock@2660" ErrorPolicyUnhandledApplicationException (MuxError MuxBearerClosed "<socket: 28> closed when reading data, waiting on next header True")
+[denis-XP:cardano.node.LocalErrorPolicy:Error:63] [2024-11-14 10:45:00.36 UTC] IP LocalAddress "node-full1/ipc/node.sock@2659" ErrorPolicyUnhandledApplicationException (MuxError MuxBearerClosed "<socket: 27> closed when reading data, waiting on next header True")
+[denis-XP:cardano.node.ChainDB:Notice:23] [2024-11-14 10:45:01.00 UTC] Chain extended, new tip: d710c33fa606ae604b9de61eb10e83cd937ef4ab33cfb5afdce42e782b752a0a at slot 1572
+[denis-XP:cardano.node.Mempool:Info:31] [2024-11-14 10:45:01.00 UTC] fromList [("enclosingTime",Object (fromList [("tag",String "RisingEdge")])),("kind",String "TraceMempoolSynced")]
+[denis-XP:cardano.node.Mempool:Info:31] [2024-11-14 10:45:01.00 UTC] fromList [("enclosingTime",Object (fromList [("contents",Number 6.8471e-5),("tag",String "FallingEdgeWith")])),("kind",String "TraceMempoolSynced")]
+---------------------------------------------------------------------
+
+---------------------------------------------------------------------
+tail -n 5 ./node-pool1/node.log
+---------------------------------------------------------------------
+[denis-XP:cardano.node.LocalErrorPolicy:Error:64] [2024-11-14 10:45:00.83 UTC] IP LocalAddress "node-pool1/ipc/node.sock@3353" ErrorPolicyUnhandledApplicationException (MuxError MuxBearerClosed "<socket: 31> closed when reading data, waiting on next header True")
+[denis-XP:cardano.node.LocalErrorPolicy:Error:64] [2024-11-14 10:45:00.83 UTC] IP LocalAddress "node-pool1/ipc/node.sock@3352" ErrorPolicyUnhandledApplicationException (MuxError MuxBearerClosed "<socket: 30> closed when reading data, waiting on next header True")
+[denis-XP:cardano.node.ChainDB:Notice:22] [2024-11-14 10:45:01.00 UTC] Chain extended, new tip: d710c33fa606ae604b9de61eb10e83cd937ef4ab33cfb5afdce42e782b752a0a at slot 1572
+[denis-XP:cardano.node.Mempool:Info:30] [2024-11-14 10:45:01.00 UTC] fromList [("enclosingTime",Object (fromList [("tag",String "RisingEdge")])),("kind",String "TraceMempoolSynced")]
+[denis-XP:cardano.node.Mempool:Info:30] [2024-11-14 10:45:01.00 UTC] fromList [("enclosingTime",Object (fromList [("contents",Number 6.2125e-5),("tag",String "FallingEdgeWith")])),("kind",String "TraceMempoolSynced")]
+---------------------------------------------------------------------
+
+---------------------------------------------------------------------
+tail -n 5 ./node-pool2/node.log
+---------------------------------------------------------------------
+[denis-XP:cardano.node.Mempool:Info:30] [2024-11-14 10:45:01.00 UTC] fromList [("enclosingTime",Object (fromList [("contents",Number 5.1172e-5),("tag",String "FallingEdgeWith")])),("kind",String "TraceMempoolSynced")]
+[denis-XP:cardano.node.ChainDB:Info:22] [2024-11-14 10:45:01.00 UTC] Block fits onto some fork: d710c33fa606ae604b9de61eb10e83cd937ef4ab33cfb5afdce42e782b752a0a at slot 1572
+[denis-XP:cardano.node.ChainDB:Notice:22] [2024-11-14 10:45:01.00 UTC] Switched to a fork, new tip: d710c33fa606ae604b9de61eb10e83cd937ef4ab33cfb5afdce42e782b752a0a at slot 1572
+[denis-XP:cardano.node.Mempool:Info:30] [2024-11-14 10:45:01.00 UTC] fromList [("enclosingTime",Object (fromList [("tag",String "RisingEdge")])),("kind",String "TraceMempoolSynced")]
+[denis-XP:cardano.node.Mempool:Info:30] [2024-11-14 10:45:01.00 UTC] fromList [("enclosingTime",Object (fromList [("contents",Number 4.089e-5),("tag",String "FallingEdgeWith")])),("kind",String "TraceMempoolSynced")]
+---------------------------------------------------------------------
+
 ```
 
 ## Interact with the Mithril aggregator by using the Mithril client

From 0d0663999790d73167575617a77b111cbab235f9 Mon Sep 17 00:00:00 2001
From: DJO <790521+Alenar@users.noreply.github.com>
Date: Thu, 14 Nov 2024 12:27:10 +0100
Subject: [PATCH 6/7] chore: upgrade crate versions

* mithril-persistence from `0.2.33` to `0.2.34`
* mithril-aggregator from `0.5.110` to `0.5.111`
* mithril-client-cli from `0.10.2` to `0.10.3`
* mithril-common from `0.4.86` to `0.4.87`
* mithril-signer from `0.2.212` to `0.2.213`
* mithril-end-to-end from `0.4.48` to `0.4.49`
---
 Cargo.lock                                     | 12 ++++++------
 internal/mithril-persistence/Cargo.toml        |  2 +-
 mithril-aggregator/Cargo.toml                  |  2 +-
 mithril-client-cli/Cargo.toml                  |  2 +-
 mithril-common/Cargo.toml                      |  2 +-
 mithril-signer/Cargo.toml                      |  2 +-
 mithril-test-lab/mithril-end-to-end/Cargo.toml |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ed2ad7e6606..a6d03638bc6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3588,7 +3588,7 @@ dependencies = [
 
 [[package]]
 name = "mithril-aggregator"
-version = "0.5.110"
+version = "0.5.111"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3700,7 +3700,7 @@ dependencies = [
 
 [[package]]
 name = "mithril-client-cli"
-version = "0.10.2"
+version = "0.10.3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3745,7 +3745,7 @@ dependencies = [
 
 [[package]]
 name = "mithril-common"
-version = "0.4.86"
+version = "0.4.87"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3816,7 +3816,7 @@ dependencies = [
 
 [[package]]
 name = "mithril-end-to-end"
-version = "0.4.48"
+version = "0.4.49"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -3859,7 +3859,7 @@ dependencies = [
 
 [[package]]
 name = "mithril-persistence"
-version = "0.2.33"
+version = "0.2.34"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3903,7 +3903,7 @@ dependencies = [
 
 [[package]]
 name = "mithril-signer"
-version = "0.2.212"
+version = "0.2.213"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/internal/mithril-persistence/Cargo.toml b/internal/mithril-persistence/Cargo.toml
index 6c1d9df4c44..9b8d2333e32 100644
--- a/internal/mithril-persistence/Cargo.toml
+++ b/internal/mithril-persistence/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-persistence"
-version = "0.2.33"
+version = "0.2.34"
 description = "Common types, interfaces, and utilities to persist data for Mithril nodes."
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/mithril-aggregator/Cargo.toml b/mithril-aggregator/Cargo.toml
index 18a714f517d..13d15c1109e 100644
--- a/mithril-aggregator/Cargo.toml
+++ b/mithril-aggregator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.5.110"
+version = "0.5.111"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/mithril-client-cli/Cargo.toml b/mithril-client-cli/Cargo.toml
index 3f31624bd4f..b0d374fde20 100644
--- a/mithril-client-cli/Cargo.toml
+++ b/mithril-client-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-client-cli"
-version = "0.10.2"
+version = "0.10.3"
 description = "A Mithril Client"
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/mithril-common/Cargo.toml b/mithril-common/Cargo.toml
index 80d7ac8e2a4..4906dbd8a50 100644
--- a/mithril-common/Cargo.toml
+++ b/mithril-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-common"
-version = "0.4.86"
+version = "0.4.87"
 description = "Common types, interfaces, and utilities for Mithril nodes."
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/mithril-signer/Cargo.toml b/mithril-signer/Cargo.toml
index d0b3be3ac47..1b72042df8a 100644
--- a/mithril-signer/Cargo.toml
+++ b/mithril-signer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-signer"
-version = "0.2.212"
+version = "0.2.213"
 description = "A Mithril Signer"
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/mithril-test-lab/mithril-end-to-end/Cargo.toml b/mithril-test-lab/mithril-end-to-end/Cargo.toml
index 9420b6a5ce2..27a1425bbfb 100644
--- a/mithril-test-lab/mithril-end-to-end/Cargo.toml
+++ b/mithril-test-lab/mithril-end-to-end/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-end-to-end"
-version = "0.4.48"
+version = "0.4.49"
 authors = { workspace = true }
 edition = { workspace = true }
 documentation = { workspace = true }

From 1dfedf132ba40612a6911f5387f9259022a8d804 Mon Sep 17 00:00:00 2001
From: DJO <790521+Alenar@users.noreply.github.com>
Date: Thu, 14 Nov 2024 12:35:25 +0100
Subject: [PATCH 7/7] chore: update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c972ebde872..b1475e79a6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,11 @@ As a minor extension, we have adopted a slightly different versioning convention
 
 - Implement the `/status` route on the aggregator's REST API to provide information about its current status.
 
+- Deprecate the `network` field in all messages that contain a `CardanoDbBeacon` field.
+
+- **BREAKING** Remove the `network` field from the internal `CardanoDbBeacon` struct, Certificates of types `CardanoImmutableFilesFull`
+  must have their hashes recomputed in order to stay valid (procedure detailed in the [`recompute-certificates-hash`](./docs/runbook/recompute-certificates-hash) runbook).
+
 - Crates versions:
 
 | Crate | Version |