feat(aggregator): add aggregate signature type in root route

Author: jpraynaud

mithril-aggregator/src/dependency_injection/builder/mod.rs

@@ -453,6 +453,7 @@ impl DependenciesBuilder {
                 cardano_node_version: self.configuration.cardano_node_version(),
                 allow_http_serve_directory: self.configuration.allow_http_serve_directory(),
                 origin_tag_white_list: self.configuration.compute_origin_tag_white_list(),
+                aggregate_signature_type: self.configuration.aggregate_signature_type(),
             },
         );
 

mithril-aggregator/src/http_server/routes/root_routes.rs

@@ -18,6 +18,9 @@ fn root(
         .and(middlewares::extract_config(router_state, |config| {
             config.allowed_discriminants.clone()
         }))
+        .and(middlewares::extract_config(router_state, |config| {
+            config.aggregate_signature_type
+        }))
         .and(middlewares::extract_config(router_state, |config| {
             config.cardano_transactions_prover_max_hashes_allowed_by_request
         }))
@@ -28,6 +31,7 @@ mod handlers {
     use std::collections::BTreeSet;
     use std::{convert::Infallible, sync::Arc};
 
+    use mithril_common::AggregateSignatureType;
     use slog::Logger;
     use warp::http::StatusCode;
 
@@ -45,6 +49,7 @@ mod handlers {
         logger: Logger,
         api_version_provider: Arc<APIVersionProvider>,
         allowed_signed_entity_type_discriminants: BTreeSet<SignedEntityTypeDiscriminants>,
+        aggregate_signature_type: AggregateSignatureType,
         max_hashes_allowed_by_request: usize,
     ) -> Result<impl warp::Reply, Infallible> {
         let open_api_version = unwrap_to_internal_server_error!(
@@ -54,6 +59,7 @@ mod handlers {
 
         let mut capabilities = AggregatorCapabilities {
             signed_entity_types: allowed_signed_entity_type_discriminants,
+            aggregate_signature_type,
             cardano_transactions_prover: None,
         };
 
@@ -87,6 +93,7 @@ mod tests {
     use warp::test::request;
 
     use mithril_api_spec::APISpec;
+    use mithril_common::AggregateSignatureType;
     use mithril_common::entities::SignedEntityTypeDiscriminants;
     use mithril_common::messages::{
         AggregatorCapabilities, AggregatorFeaturesMessage, CardanoTransactionsProverCapabilities,
@@ -155,6 +162,7 @@ mod tests {
                         SignedEntityTypeDiscriminants::CardanoImmutableFilesFull,
                         SignedEntityTypeDiscriminants::MithrilStakeDistribution,
                     ]),
+                    aggregate_signature_type: AggregateSignatureType::Concatenation,
                     cardano_transactions_prover: None,
                 },
             }

mithril-aggregator/src/http_server/routes/router.rs

@@ -11,7 +11,7 @@ use mithril_common::entities::SignedEntityTypeDiscriminants;
 #[cfg(test)]
 use mithril_common::test::double::Dummy;
 use mithril_common::{
-    CardanoNetwork, MITHRIL_API_VERSION_HEADER, MITHRIL_CLIENT_TYPE_HEADER,
+    AggregateSignatureType, CardanoNetwork, MITHRIL_API_VERSION_HEADER, MITHRIL_CLIENT_TYPE_HEADER,
     MITHRIL_ORIGIN_TAG_HEADER,
 };
 
@@ -35,6 +35,7 @@ pub struct RouterConfig {
     pub cardano_node_version: String,
     pub allow_http_serve_directory: bool,
     pub origin_tag_white_list: HashSet<String>,
+    pub aggregate_signature_type: AggregateSignatureType,
 }
 
 #[cfg(test)]
@@ -53,6 +54,7 @@ impl Dummy for RouterConfig {
             cardano_node_version: "1.2.3".to_string(),
             allow_http_serve_directory: false,
             origin_tag_white_list: HashSet::from(["DUMMY_TAG".to_string()]),
+            aggregate_signature_type: AggregateSignatureType::Concatenation,
         }
     }
 }

mithril-common/src/messages/aggregator_features.rs

@@ -2,6 +2,8 @@ use std::collections::BTreeSet;
 
 use serde::{Deserialize, Serialize};
 
+use mithril_stm::AggregateSignatureType;
+
 use crate::entities::SignedEntityTypeDiscriminants;
 
 /// Message advertised by an Aggregator to inform about its features
@@ -23,6 +25,9 @@ pub struct AggregatorCapabilities {
     /// Signed entity types that are signed by the aggregator
     pub signed_entity_types: BTreeSet<SignedEntityTypeDiscriminants>,
 
+    /// Aggregate signature type used by the aggregator
+    pub aggregate_signature_type: AggregateSignatureType,
+
     /// Cardano transactions prover capabilities
     #[serde(skip_serializing_if = "Option::is_none")]
     pub cardano_transactions_prover: Option<CardanoTransactionsProverCapabilities>,
@@ -73,6 +78,38 @@ mod tests {
         }
     }
 
+    #[derive(Debug, Serialize, Deserialize, PartialEq)]
+    struct AggregatorFeaturesMessageUntilV0_6_17 {
+        pub open_api_version: String,
+        pub documentation_url: String,
+        pub capabilities: AggregatorCapabilitiesUntilV0_6_17,
+    }
+
+    #[derive(Debug, Serialize, Deserialize, PartialEq)]
+    struct AggregatorCapabilitiesUntilV0_6_17 {
+        pub signed_entity_types: BTreeSet<SignedEntityTypeDiscriminants>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub cardano_transactions_prover: Option<CardanoTransactionsProverCapabilities>,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub cardano_transactions_signing_config: Option<CardanoTransactionsSigningConfig>,
+    }
+
+    fn golden_message_until_open_api_0_6_17() -> AggregatorFeaturesMessageUntilV0_6_17 {
+        AggregatorFeaturesMessageUntilV0_6_17 {
+            open_api_version: "0.0.1".to_string(),
+            documentation_url: "https://example.com".to_string(),
+            capabilities: AggregatorCapabilitiesUntilV0_6_17 {
+                signed_entity_types: BTreeSet::from([
+                    SignedEntityTypeDiscriminants::CardanoTransactions,
+                ]),
+                cardano_transactions_prover: Some(CardanoTransactionsProverCapabilities {
+                    max_hashes_allowed_by_request: 100,
+                }),
+                cardano_transactions_signing_config: None,
+            },
+        }
+    }
+
     fn golden_message_current() -> AggregatorFeaturesMessage {
         AggregatorFeaturesMessage {
             open_api_version: "0.0.1".to_string(),
@@ -81,6 +118,7 @@ mod tests {
                 signed_entity_types: BTreeSet::from([
                     SignedEntityTypeDiscriminants::CardanoTransactions,
                 ]),
+                aggregate_signature_type: AggregateSignatureType::Concatenation,
                 cardano_transactions_prover: Some(CardanoTransactionsProverCapabilities {
                     max_hashes_allowed_by_request: 100,
                 }),
@@ -93,6 +131,7 @@ mod tests {
         "documentation_url": "https://example.com",
         "capabilities": {
             "signed_entity_types": ["CardanoTransactions"],
+            "aggregate_signature_type": "Concatenation",
             "cardano_transactions_prover": {
                 "max_hashes_allowed_by_request": 100
             }
@@ -107,6 +146,14 @@ mod tests {
         assert_eq!(golden_message_until_open_api_0_1_45(), message);
     }
 
+    #[test]
+    fn test_current_json_deserialized_into_message_supported_until_open_api_0_6_17() {
+        let json = CURRENT_JSON;
+        let message: AggregatorFeaturesMessageUntilV0_6_17 = serde_json::from_str(json).unwrap();
+
+        assert_eq!(golden_message_until_open_api_0_6_17(), message);
+    }
+
     #[test]
     fn test_current_json_deserialized_into_current_message() {
         let json = CURRENT_JSON;

mithril-common/src/test/double/dummies.rs

@@ -79,9 +79,12 @@ mod entities {
 }
 
 mod messages {
-    use chrono::Duration;
     use std::collections::BTreeSet;
 
+    use chrono::Duration;
+
+    use mithril_stm::AggregateSignatureType;
+
     use crate::entities::{
         AncillaryLocation, BlockNumber, CardanoDbBeacon, CardanoTransactionsSetProof,
         CardanoTransactionsSigningConfig, CompressionAlgorithm, DigestLocation, Epoch,
@@ -168,6 +171,7 @@ mod messages {
                     signed_entity_types: BTreeSet::from([
                         SignedEntityTypeDiscriminants::MithrilStakeDistribution,
                     ]),
+                    aggregate_signature_type: AggregateSignatureType::Concatenation,
                     cardano_transactions_prover: None,
                 },
             }