Merge pull request #885 from input-output-hk/jpraynaud/851-signable-artifact-builder-mithril-stake-distribution-signer

Mithril Stake Distribution Signable builder

Author: jpraynaud

Cargo.lock

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

mithril-aggregator/Cargo.toml

@@ -48,7 +48,7 @@ impl ArtifactBuilder<Epoch, MithrilStakeDistribution> for MithrilStakeDistributi
     ) -> StdResult<MithrilStakeDistribution> {
         let multi_signer = self.multi_signer.read().await;
         Ok(MithrilStakeDistribution::new(
-            multi_signer.get_signers_with_stake().await?,
+            multi_signer.get_next_signers_with_stake().await?,
         ))
     }
 }
@@ -68,7 +68,7 @@ mod tests {
         let certificate = fake_data::certificate("cert-123".to_string());
         let mut mock_multi_signer = MockMultiSigner::new();
         mock_multi_signer
-            .expect_get_signers_with_stake()
+            .expect_get_next_signers_with_stake()
             .return_once(move || Ok(signers_with_stake_clone));
         let mithril_stake_distribution_artifact_builder =
             MithrilStakeDistributionArtifactBuilder::new(Arc::new(RwLock::new(mock_multi_signer)));

mithril-aggregator/src/artifact_builder/mithril_stake_distribution.rs

@@ -16,7 +16,9 @@ use mithril_common::{
         adapters::{EraReaderAdapterBuilder, EraReaderDummyAdapter},
         EraChecker, EraMarker, EraReader, EraReaderAdapter, SupportedEra,
     },
-    signable_builder::CardanoImmutableFilesFullSignableBuilder,
+    signable_builder::{
+        CardanoImmutableFilesFullSignableBuilder, MithrilStakeDistributionSignableBuilder,
+    },
     store::adapter::{MemoryAdapter, SQLiteAdapter, StoreAdapter},
     BeaconProvider, BeaconProviderImpl,
 };
@@ -46,7 +48,7 @@ use crate::{
     },
     event_store::{EventMessage, EventStore, TransmitterService},
     http_server::routes::router,
-    signable_builder::{MithrilStakeDistributionSignableBuilder, SignableBuilderService},
+    signable_builder::SignableBuilderService,
     signer_registerer::SignerRecorder,
     stake_distribution_service::{MithrilStakeDistributionService, StakeDistributionService},
     ticker_service::{MithrilTickerService, TickerService},
@@ -876,9 +878,7 @@ impl DependenciesBuilder {
     }
 
     async fn build_signable_builder_service(&mut self) -> Result<Arc<SignableBuilderService>> {
-        let multi_signer = self.get_multi_signer().await?;
-        let mithril_stake_distribution_builder =
-            MithrilStakeDistributionSignableBuilder::new(multi_signer);
+        let mithril_stake_distribution_builder = MithrilStakeDistributionSignableBuilder::default();
         let immutable_signable_builder = CardanoImmutableFilesFullSignableBuilder::new(
             self.get_immutable_digester().await?,
             self.get_logger().await?,

mithril-aggregator/src/dependency_injection/builder.rs

@@ -39,9 +39,7 @@ pub use crate::configuration::{
     Configuration, DefaultConfiguration, ExecutionEnvironment, SnapshotUploaderType,
 };
 pub use crate::multi_signer::{MultiSigner, MultiSignerImpl, ProtocolError};
-pub use crate::signable_builder::{
-    MithrilStakeDistributionSignableBuilder, SignableBuilderService,
-};
+pub use crate::signable_builder::SignableBuilderService;
 pub use crate::snapshot_stores::{LocalSnapshotStore, SnapshotStore};
 pub use command_args::MainOpts;
 pub use dependency::DependencyManager;

mithril-aggregator/src/lib.rs

@@ -1,7 +1,5 @@
 //! The module used for building signables
 
-mod mithril_stake_distribution;
 mod signable_builder_service;
 
-pub use mithril_stake_distribution::*;
 pub use signable_builder_service::*;

mithril-aggregator/src/signable_builder/mithril_stake_distribution.rs

@@ -2,12 +2,13 @@ use std::sync::Arc;
 
 use mithril_common::{
     entities::SignedEntityType,
-    signable_builder::{CardanoImmutableFilesFullSignableBuilder, Signable, SignableBuilder},
+    signable_builder::{
+        CardanoImmutableFilesFullSignableBuilder, MithrilStakeDistributionSignableBuilder,
+        Signable, SignableBuilder,
+    },
     StdResult,
 };
 
-use super::MithrilStakeDistributionSignableBuilder;
-
 /// SignableBuilder Service
 pub struct SignableBuilderService {
     mithril_stake_distribution_builder: MithrilStakeDistributionSignableBuilder,

mithril-aggregator/src/signable_builder/mod.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-common"
-version = "0.2.46"
+version = "0.2.47"
 authors = { workspace = true }
 edition = { workspace = true }
 documentation = { workspace = true }

mithril-aggregator/src/signable_builder/signable_builder_service.rs

@@ -0,0 +1,36 @@
+use async_trait::async_trait;
+
+use crate::{
+    entities::{Epoch, ProtocolMessage},
+    signable_builder::SignableBuilder,
+    StdResult,
+};
+
+/// A [MithrilStakeDistributionSignableBuilder] builder
+#[derive(Default)]
+pub struct MithrilStakeDistributionSignableBuilder {}
+
+#[async_trait]
+impl SignableBuilder<Epoch, ProtocolMessage> for MithrilStakeDistributionSignableBuilder {
+    // We just need to return an empty protocol message as the next AVK will be appended by the signing engine automatically
+    async fn compute_signable(&self, _beacon: Epoch) -> StdResult<ProtocolMessage> {
+        Ok(ProtocolMessage::new())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn test_compute_signable() {
+        let mithril_stake_distribution_signable_builder =
+            MithrilStakeDistributionSignableBuilder::default();
+        let signable = mithril_stake_distribution_signable_builder
+            .compute_signable(Epoch(1))
+            .await
+            .unwrap();
+        let signable_expected = ProtocolMessage::new();
+        assert_eq!(signable_expected, signable);
+    }
+}