WIP: make protocol_parameters and cardano_transaction_signing_config optionnal (mandatory for leader)

Author: turmelclem

mithril-aggregator/src/configuration.rs

@@ -109,7 +109,7 @@ pub trait ConfigurationSource {
     }
 
     /// Protocol parameters
-    fn protocol_parameters(&self) -> ProtocolParameters {
+    fn protocol_parameters(&self) -> Option<ProtocolParameters> {
         panic!("protocol_parameters is not implemented.");
     }
 
@@ -251,7 +251,7 @@ pub trait ConfigurationSource {
     }
 
     /// Cardano transactions signing configuration
-    fn cardano_transactions_signing_config(&self) -> CardanoTransactionsSigningConfig {
+    fn cardano_transactions_signing_config(&self) -> Option<CardanoTransactionsSigningConfig> {
         panic!("cardano_transactions_signing_config is not implemented.");
     }
 
@@ -373,12 +373,20 @@ pub trait ConfigurationSource {
         }
     }
 
-    /// Infer the [AggregatorEpochSettings] from the configuration.
-    fn get_epoch_settings_configuration(&self) -> AggregatorEpochSettings {
-        AggregatorEpochSettings {
-            protocol_parameters: self.protocol_parameters(),
-            cardano_transactions_signing_config: self.cardano_transactions_signing_config(),
-        }
+    /// `leader aggregator only` Infer the [AggregatorEpochSettings] from the configuration.
+    fn get_leader_aggregator_epoch_settings_configuration(
+        &self,
+    ) -> StdResult<AggregatorEpochSettings> {
+        Ok(AggregatorEpochSettings {
+            protocol_parameters: self.protocol_parameters().with_context(
+                || "Configuration `protocol_parameter` is mandatory for a Leader Aggregator",
+            )?,
+            cardano_transactions_signing_config: self
+                .cardano_transactions_signing_config()
+                .with_context(
+                || "Configuration `cardano_transactions_signing_config` is mandatory for a Leader Aggregator",
+                )?,
+        })
     }
 
     /// Check if the aggregator is running in follower mode.
@@ -453,7 +461,7 @@ pub struct ServeCommandConfiguration {
 
     /// Protocol parameters
     #[example = "`{ k: 5, m: 100, phi_f: 0.65 }`"]
-    pub protocol_parameters: ProtocolParameters,
+    pub protocol_parameters: Option<ProtocolParameters>,
 
     /// Type of snapshot uploader to use
     #[example = "`gcp` or `local`"]
@@ -556,7 +564,7 @@ pub struct ServeCommandConfiguration {
 
     /// Cardano transactions signing configuration
     #[example = "`{ security_parameter: 3000, step: 120 }`"]
-    pub cardano_transactions_signing_config: CardanoTransactionsSigningConfig,
+    pub cardano_transactions_signing_config: Option<CardanoTransactionsSigningConfig>,
 
     /// Maximum number of transactions hashes allowed by request to the prover of the Cardano transactions
     pub cardano_transactions_prover_max_hashes_allowed_by_request: usize,
@@ -672,11 +680,11 @@ impl ServeCommandConfiguration {
             network_magic: Some(42),
             dmq_network_magic: Some(3141592),
             chain_observer_type: ChainObserverType::Fake,
-            protocol_parameters: ProtocolParameters {
+            protocol_parameters: Some(ProtocolParameters {
                 k: 5,
                 m: 100,
                 phi_f: 0.95,
-            },
+            }),
             snapshot_uploader_type: SnapshotUploaderType::Local,
             snapshot_bucket_name: None,
             snapshot_use_cdn_domain: false,
@@ -710,10 +718,10 @@ impl ServeCommandConfiguration {
             allow_unparsable_block: false,
             cardano_transactions_prover_cache_pool_size: 3,
             cardano_transactions_database_connection_pool_size: 5,
-            cardano_transactions_signing_config: CardanoTransactionsSigningConfig {
+            cardano_transactions_signing_config: Some(CardanoTransactionsSigningConfig {
                 security_parameter: BlockNumber(120),
                 step: BlockNumber(15),
-            },
+            }),
             cardano_transactions_prover_max_hashes_allowed_by_request: 100,
             cardano_transactions_block_streamer_max_roll_forwards_per_poll: 1000,
             enable_metrics_server: true,
@@ -773,7 +781,7 @@ impl ConfigurationSource for ServeCommandConfiguration {
         self.chain_observer_type.clone()
     }
 
-    fn protocol_parameters(&self) -> ProtocolParameters {
+    fn protocol_parameters(&self) -> Option<ProtocolParameters> {
         self.protocol_parameters.clone()
     }
 
@@ -877,7 +885,7 @@ impl ConfigurationSource for ServeCommandConfiguration {
         self.cardano_transactions_database_connection_pool_size
     }
 
-    fn cardano_transactions_signing_config(&self) -> CardanoTransactionsSigningConfig {
+    fn cardano_transactions_signing_config(&self) -> Option<CardanoTransactionsSigningConfig> {
         self.cardano_transactions_signing_config.clone()
     }
 

mithril-aggregator/src/dependency_injection/builder/enablers/cardano_node.rs

@@ -136,7 +136,9 @@ impl DependenciesBuilder {
             self.get_transactions_importer().await?,
             self.configuration
                 .cardano_transactions_signing_config()
-                .security_parameter,
+                // Todo: should we replace this with a new `preload_security_parameter` like the signer ?
+                .map(|c| c.security_parameter)
+                .unwrap_or(mithril_common::entities::BlockNumber(3000)),
             self.get_chain_observer().await?,
             self.root_logger(),
             Arc::new(CardanoTransactionsPreloaderActivation::new(activation)),

mithril-aggregator/src/dependency_injection/builder/enablers/epoch.rs

@@ -53,7 +53,8 @@ impl DependenciesBuilder {
                 ))
             } else {
                 Arc::new(LocalMithrilNetworkConfigurationProvider::new(
-                    self.configuration.get_epoch_settings_configuration(),
+                    self.configuration
+                        .get_leader_aggregator_epoch_settings_configuration()?,
                     self.configuration
                         .compute_allowed_signed_entity_types_discriminants()?,
                     self.get_epoch_settings_store().await?,

mithril-aggregator/src/dependency_injection/builder/support/stores.rs

@@ -115,7 +115,9 @@ impl DependenciesBuilder {
                 error: Some(e.into()),
             })?;
 
-        let epoch_settings_configuration = self.configuration.get_epoch_settings_configuration();
+        let epoch_settings_configuration = self
+            .configuration
+            .get_leader_aggregator_epoch_settings_configuration()?;
         debug!(
             logger,
             "Handle discrepancies at startup of epoch settings store, will record epoch settings from the configuration for epoch {retrieval_epoch}";

mithril-aggregator/src/services/certifier/certifier_service.rs

@@ -481,7 +481,7 @@ mod tests {
         dependency_manager
             .init_state_from_fixture(
                 fixture,
-                &cardano_transactions_signing_config,
+                &cardano_transactions_signing_config.unwrap(),
                 epochs_with_signers,
             )
             .await;

mithril-aggregator/tests/cardano_stake_distribution_verify_stakes.rs

@@ -22,7 +22,7 @@ async fn cardano_stake_distribution_verify_stakes() {
         phi_f: 0.95,
     };
     let configuration = ServeCommandConfiguration {
-        protocol_parameters: protocol_parameters.clone(),
+        protocol_parameters: Some(protocol_parameters.clone()),
         signed_entity_types: Some(
             SignedEntityTypeDiscriminants::CardanoStakeDistribution.to_string(),
         ),

mithril-aggregator/tests/certificate_chain.rs

@@ -22,7 +22,7 @@ async fn certificate_chain() {
         phi_f: 0.95,
     };
     let configuration = ServeCommandConfiguration {
-        protocol_parameters: protocol_parameters.clone(),
+        protocol_parameters: Some(protocol_parameters.clone()),
         data_stores_directory: get_test_dir("certificate_chain"),
         signed_entity_types: Some(SignedEntityTypeDiscriminants::CardanoDatabase.to_string()),
         ..ServeCommandConfiguration::new_sample(temp_dir!())

mithril-aggregator/tests/create_certificate.rs

@@ -22,7 +22,7 @@ async fn create_certificate() {
         phi_f: 0.95,
     };
     let configuration = ServeCommandConfiguration {
-        protocol_parameters: protocol_parameters.clone(),
+        protocol_parameters: Some(protocol_parameters.clone()),
         signed_entity_types: Some(
             [
                 SignedEntityTypeDiscriminants::CardanoTransactions.to_string(),
@@ -31,10 +31,10 @@ async fn create_certificate() {
             .join(","),
         ),
         data_stores_directory: get_test_dir("create_certificate"),
-        cardano_transactions_signing_config: CardanoTransactionsSigningConfig {
+        cardano_transactions_signing_config: Some(CardanoTransactionsSigningConfig {
             security_parameter: BlockNumber(0),
             step: BlockNumber(30),
-        },
+        }),
         ..ServeCommandConfiguration::new_sample(temp_dir!())
     };
     let mut tester = RuntimeTester::build(

mithril-aggregator/tests/create_certificate_follower.rs

@@ -98,7 +98,7 @@ async fn create_certificate_follower() {
         },
     };
     let leader_configuration = ServeCommandConfiguration {
-        protocol_parameters: protocol_parameters.clone(),
+        protocol_parameters: Some(protocol_parameters.clone()),
         data_stores_directory: get_test_dir("create_certificate_leader"),
         signed_entity_types: Some(
             SignedEntityTypeDiscriminants::CardanoStakeDistribution.to_string(),

mithril-aggregator/tests/create_certificate_with_buffered_signatures.rs

@@ -22,13 +22,13 @@ async fn create_certificate_with_buffered_signatures() {
         phi_f: 0.95,
     };
     let configuration = ServeCommandConfiguration {
-        protocol_parameters: protocol_parameters.clone(),
+        protocol_parameters: Some(protocol_parameters.clone()),
         signed_entity_types: Some(SignedEntityTypeDiscriminants::CardanoTransactions.to_string()),
         data_stores_directory: get_test_dir("create_certificate_with_buffered_signatures"),
-        cardano_transactions_signing_config: CardanoTransactionsSigningConfig {
+        cardano_transactions_signing_config: Some(CardanoTransactionsSigningConfig {
             security_parameter: BlockNumber(0),
             step: BlockNumber(30),
-        },
+        }),
         ..ServeCommandConfiguration::new_sample(temp_dir!())
     };
     let mut tester = RuntimeTester::build(