feat(stm): implement future proof system placeholder

This will be removed when a new proof system is implemented.
In the mean time it structures the code for ease of implementation later.

Author: jpraynaud

mithril-stm/Cargo.toml

@@ -17,7 +17,8 @@ crate-type = ["lib", "cdylib", "staticlib"]
 default = ["rug-backend"]
 rug-backend = ["rug/default"]
 num-integer-backend = ["num-bigint", "num-rational", "num-traits"]
-benchmark-internals = []                                           # For benchmarking multi_sig
+benchmark-internals = [] # For benchmarking multi_sig
+future_proof_system = [] # For activating future proof systems
 
 [dependencies]
 blake2 = "0.10.6"

mithril-stm/src/aggregate_signature/signature.rs

@@ -16,6 +16,9 @@ use super::ConcatenationProof;
 pub enum AggregateSignatureType {
     /// Concatenation proof system.
     Concatenation,
+    /// Future proof system. Not suitable for production.
+    #[cfg(feature = "future_proof_system")]
+    Future,
 }
 
 impl AggregateSignatureType {
@@ -25,6 +28,8 @@ impl AggregateSignatureType {
     pub fn to_bytes_encoding_prefix(&self) -> u8 {
         match self {
             AggregateSignatureType::Concatenation => 0,
+            #[cfg(feature = "future_proof_system")]
+            AggregateSignatureType::Future => 255,
         }
     }
 
@@ -34,6 +39,8 @@ impl AggregateSignatureType {
     pub fn from_bytes_encoding_prefix(byte: u8) -> Option<Self> {
         match byte {
             0 => Some(AggregateSignatureType::Concatenation),
+            #[cfg(feature = "future_proof_system")]
+            255 => Some(AggregateSignatureType::Future),
             _ => None,
         }
     }
@@ -45,6 +52,8 @@ impl<D: Clone + Digest + FixedOutput + Send + Sync> From<&AggregateSignature<D>>
     fn from(aggr_sig: &AggregateSignature<D>) -> Self {
         match aggr_sig {
             AggregateSignature::Concatenation(_) => AggregateSignatureType::Concatenation,
+            #[cfg(feature = "future_proof_system")]
+            AggregateSignature::Future(_) => AggregateSignatureType::Future,
         }
     }
 }
@@ -53,6 +62,8 @@ impl Display for AggregateSignatureType {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             AggregateSignatureType::Concatenation => write!(f, "Concatenation"),
+            #[cfg(feature = "future_proof_system")]
+            AggregateSignatureType::Future => write!(f, "Future"),
         }
     }
 }
@@ -63,9 +74,16 @@ impl Display for AggregateSignatureType {
     serialize = "MerkleBatchPath<D>: Serialize",
     deserialize = "MerkleBatchPath<D>: Deserialize<'de>"
 ))]
-#[serde(untagged)]
 pub enum AggregateSignature<D: Clone + Digest + FixedOutput + Send + Sync> {
+    /// A future proof system.
+    #[cfg(feature = "future_proof_system")]
+    Future(ConcatenationProof<D>),
+
     /// Concatenation proof system.
+    // The 'untagged' attribute is required for backward compatibility.
+    // It implies that this variant is placed at the end of the enum.
+    // It will be removed when the support for JSON hex encoding is dropped in the calling crates.
+    #[serde(untagged)]
     Concatenation(ConcatenationProof<D>),
 }
 
@@ -78,8 +96,12 @@ impl<D: Clone + Digest + FixedOutput + Send + Sync> AggregateSignature<D> {
         parameters: &Parameters,
     ) -> Result<(), StmAggregateSignatureError<D>> {
         match self {
-            AggregateSignature::Concatenation(stm_aggr_sig) => {
-                stm_aggr_sig.verify(msg, avk, parameters)
+            AggregateSignature::Concatenation(concatenation_proof) => {
+                concatenation_proof.verify(msg, avk, parameters)
+            }
+            #[cfg(feature = "future_proof_system")]
+            AggregateSignature::Future(concatenation_proof) => {
+                concatenation_proof.verify(msg, avk, parameters)
             }
         }
     }
@@ -98,21 +120,55 @@ impl<D: Clone + Digest + FixedOutput + Send + Sync> AggregateSignature<D> {
             });
         stm_signatures
             .into_iter()
-            .try_for_each(
-                |(stm_aggr_sig_type, stm_aggr_sigs)| match stm_aggr_sig_type {
-                    AggregateSignatureType::Concatenation => ConcatenationProof::batch_verify(
-                        &stm_aggr_sigs
+            .try_for_each(|(aggregate_signature_type, aggregate_signatures)| {
+                match aggregate_signature_type {
+                    AggregateSignatureType::Concatenation => {
+                        let aggregate_signatures_length = aggregate_signatures.len();
+                        let concatenation_proofs = aggregate_signatures
                             .into_iter()
                             .filter_map(|s| match s {
-                                Self::Concatenation(stm_aggr_sig) => Some(stm_aggr_sig),
+                                Self::Concatenation(concatenation_proof) => {
+                                    Some(concatenation_proof)
+                                }
+                                _ => None,
                             })
-                            .collect::<Vec<_>>(),
-                        msgs,
-                        avks,
-                        parameters,
-                    ),
-                },
-            )
+                            .collect::<Vec<_>>();
+                        if concatenation_proofs.len() != aggregate_signatures_length {
+                            return Err(StmAggregateSignatureError::BatchInvalid);
+                        }
+
+                        ConcatenationProof::batch_verify(
+                            &concatenation_proofs,
+                            msgs,
+                            avks,
+                            parameters,
+                        )
+                    }
+                    #[cfg(feature = "future_proof_system")]
+                    AggregateSignatureType::Future => {
+                        let aggregate_signatures_length = aggregate_signatures.len();
+                        let aggregate_signatures_filtered = aggregate_signatures
+                            .into_iter()
+                            .filter_map(|s| match s {
+                                Self::Concatenation(concatenation_proof) => {
+                                    Some(concatenation_proof)
+                                }
+                                _ => None,
+                            })
+                            .collect::<Vec<_>>();
+                        if aggregate_signatures_filtered.len() != aggregate_signatures_length {
+                            return Err(StmAggregateSignatureError::BatchInvalid);
+                        }
+
+                        ConcatenationProof::batch_verify(
+                            &aggregate_signatures_filtered,
+                            msgs,
+                            avks,
+                            parameters,
+                        )
+                    }
+                }
+            })
             .map_err(|_| StmAggregateSignatureError::BatchInvalid)
     }
 
@@ -127,6 +183,8 @@ impl<D: Clone + Digest + FixedOutput + Send + Sync> AggregateSignature<D> {
             AggregateSignature::Concatenation(concatenation_proof) => {
                 concatenation_proof.to_bytes()
             }
+            #[cfg(feature = "future_proof_system")]
+            AggregateSignature::Future(concatenation_proof) => concatenation_proof.to_bytes(),
         };
         aggregate_signature_bytes.append(&mut proof_bytes);
 
@@ -143,22 +201,38 @@ impl<D: Clone + Digest + FixedOutput + Send + Sync> AggregateSignature<D> {
             AggregateSignatureType::Concatenation => Ok(AggregateSignature::Concatenation(
                 ConcatenationProof::from_bytes(proof_bytes)?,
             )),
+            #[cfg(feature = "future_proof_system")]
+            AggregateSignatureType::Future => Ok(AggregateSignature::Future(
+                ConcatenationProof::from_bytes(proof_bytes)?,
+            )),
         }
     }
 
     /// Extract the list of signatures.
     // TODO: transfer this function to the concatenation proof ? Some proofs might not fully carry this information
     pub fn signatures(&self) -> Vec<SingleSignatureWithRegisteredParty> {
         match self {
-            AggregateSignature::Concatenation(stm_aggr_sig) => stm_aggr_sig.signatures.clone(),
+            AggregateSignature::Concatenation(concatenation_proof) => {
+                concatenation_proof.signatures.clone()
+            }
+            #[cfg(feature = "future_proof_system")]
+            AggregateSignature::Future(concatenation_proof) => {
+                concatenation_proof.signatures.clone()
+            }
         }
     }
 
     /// Extract the list of unique merkle tree nodes that covers path for all signatures.
     // TODO: transfer this function to the concatenation proof
     pub fn batch_proof(&self) -> MerkleBatchPath<D> {
         match self {
-            AggregateSignature::Concatenation(stm_aggr_sig) => stm_aggr_sig.batch_proof.clone(),
+            AggregateSignature::Concatenation(concatenation_proof) => {
+                concatenation_proof.batch_proof.clone()
+            }
+            #[cfg(feature = "future_proof_system")]
+            AggregateSignature::Future(concatenation_proof) => {
+                concatenation_proof.batch_proof.clone()
+            }
         }
     }
 
@@ -167,8 +241,12 @@ impl<D: Clone + Digest + FixedOutput + Send + Sync> AggregateSignature<D> {
     #[cfg(test)]
     pub(crate) fn set_batch_proof(&mut self, batch_proof: MerkleBatchPath<D>) {
         match self {
-            AggregateSignature::Concatenation(stm_aggr_sig) => {
-                stm_aggr_sig.batch_proof = batch_proof
+            AggregateSignature::Concatenation(concatenation_proof) => {
+                concatenation_proof.batch_proof = batch_proof
+            }
+            #[cfg(feature = "future_proof_system")]
+            AggregateSignature::Future(concatenation_proof) => {
+                concatenation_proof.batch_proof = batch_proof
             }
         }
     }