Removed dependency of StmSig on hasher

curiecrypt · iquerejeta · commit d3406a2af1ba · 2022-11-02T11:52:23.000+01:00
diff --git a/mithril-common/src/crypto_helper/types.rs b/mithril-common/src/crypto_helper/types.rs
@@ -49,7 +49,7 @@ pub type ProtocolClerk = StmClerk<D>;
 pub type ProtocolKeyRegistration = KeyRegWrapper;
 
 /// Alias of [MithrilCore:StmSig](struct@mithril::stm::StmSig).
-pub type ProtocolSingleSignature = StmSig<D>;
+pub type ProtocolSingleSignature = StmSig;
 
 /// Alias of [MithrilCore:StmAggrSig](struct@mithril::stm::StmAggrSig).
 pub type ProtocolMultiSignature = StmAggrSig<D>;
diff --git a/mithril-core/Comparison.md b/mithril-core/Comparison.md
diff --git a/mithril-core/README.md b/mithril-core/README.md
@@ -110,46 +110,44 @@ We have run the benchmarks on a 2,7 GHz Quad-Core Intel Core i7 machine with 16
 |-------------------|
 |   Trivial proofs  |
 +-------------------+
-| This gives and upper bound of the size
-| as it assumes that at most one signature
-| is provided by each participant.
+| Results obtained by using the parameters suggested in paper.
 +-------------------+
 +-------------------+
 | Hash: Blake2b 512 |
 +-------------------+
-k = 25 | nr parties = 300; 19000 bytes
+k = 445 | m = 2728 | nr parties = 3000; 118760 bytes
 +-------------------+
-| Hash:    SHA256   |
+| Hash: Blake2b 256 |
 +-------------------+
-k = 25 | nr parties = 300; 11800 bytes
+k = 445 | m = 2728 | nr parties = 3000; 99384 bytes
 +-------------------+
 | Hash: Blake2b 512 |
 +-------------------+
-k = 250 | nr parties = 2000; 222000 bytes
+k = 554 | m = 3597 | nr parties = 3000; 133936 bytes
 +-------------------+
-| Hash:    SHA256   |
+| Hash: Blake2b 256 |
 +-------------------+
-k = 250 | nr parties = 2000; 134000 bytes
-
+k = 554 | m = 3597 | nr parties = 3000; 113728 bytes
 ```
 
 ```shell
-STM/Blake2b/Key registration/k: 25, m: 150, nr_parties: 300                                                                            
-                        time:   [1.4680 s 1.4706 s 1.4734 s]
-STM/Blake2b/Play all lotteries/k: 25, m: 150, nr_parties: 300                                                                             
-                        time:   [5.1228 ms 5.1296 ms 5.1361 ms]
-STM/Blake2b/Aggregation/k: 25, m: 150, nr_parties: 300                                                                            
-                        time:   [89.231 ms 89.371 ms 89.495 ms]
-STM/Blake2b/Verification/k: 25, m: 150, nr_parties: 300                                                                            
-                        time:   [33.170 ms 33.225 ms 33.292 ms] 
-STM/Blake2b/Key registration/k: 250, m: 1523, nr_parties: 2000                                                                            
-                        time:   [9.8741 s 9.9102 s 9.9644 s]
-STM/Blake2b/Play all lotteries/k: 250, m: 1523, nr_parties: 2000                                                                            
-                        time:   [48.935 ms 49.058 ms 49.185 ms]
-STM/Blake2b/Aggregation/k: 250, m: 1523, nr_parties: 2000                                                                            
-                        time:   [816.11 ms 817.55 ms 819.00 ms]
-STM/Blake2b/Verification/k: 250, m: 1523, nr_parties: 2000                                                                            
-                        time:   [293.18 ms 293.63 ms 294.19 ms]      
+STM/Blake2b/Key registration/k: 25, m: 150, nr_parties: 300
+                        time:   [388.95 ms 389.43 ms 389.90 ms]
+STM/Blake2b/Play all lotteries/k: 25, m: 150, nr_parties: 300
+                        time:   [699.76 µs 701.42 µs 703.63 µs]
+STM/Blake2b/Aggregation/k: 25, m: 150, nr_parties: 300
+                        time:   [18.888 ms 18.903 ms 18.920 ms]
+STM/Blake2b/Verification/k: 25, m: 150, nr_parties: 300
+                        time:   [2.1547 ms 2.1609 ms 2.1686 ms]
+
+STM/Blake2b/Key registration/k: 250, m: 1523, nr_parties: 2000
+                        time:   [2.5986 s 2.6042 s 2.6101 s]
+STM/Blake2b/Play all lotteries/k: 250, m: 1523, nr_parties: 2000
+                        time:   [5.9141 ms 5.9346 ms 5.9641 ms]
+STM/Blake2b/Aggregation/k: 250, m: 1523, nr_parties: 2000
+                        time:   [189.63 ms 190.10 ms 190.69 ms]
+STM/Blake2b/Verification/k: 250, m: 1523, nr_parties: 2000
+                        time:   [14.040 ms 14.143 ms 14.271 ms]
 ```
 
 # ToDo list once we go public
diff --git a/mithril-core/proptest-regressions/stm.txt b/mithril-core/proptest-regressions/stm.txt
@@ -13,3 +13,5 @@ cc bfe6fbad028ad86d75df7c75d29ee8f3279a81acbf50ef971b3dae92d529eeeb # shrinks to
 cc 9ef4bbf885dd054e2e54c85d0a54ef324d5ef7af232157c50bd55986640c6cab # shrinks to nparties = 7, m = 11, k = 1, msg = [16, 197, 45, 60, 228, 119, 173, 69, 2, 156, 57, 238, 34, 178, 228, 198]
 cc 533659c456e216b566b35d413e0b505c6e4d8d04ab402d79343e46a5a32c7c9d # shrinks to nparties = 18, m = 11, k = 1, msg = [78, 114, 142, 29, 122, 86, 154, 181, 170, 165, 114, 115, 234, 82, 143, 36]
 cc f2c14c2a2d3f02a4d98028f41effa69c153529df611e2206e9cbf540e7a99079 # shrinks to nparties = 2, m = 14, k = 1, msg = [69, 0, 87, 0, 53, 5, 58, 203, 42, 90, 66, 244, 89, 95, 198, 22]
+cc 55d304e2dd7bed15dace28eaf8d75174ff9b43e12b98257eb0c5f9296dae66d8 # shrinks to nparties = 21, m = 13, k = 3, msg = [21, 101, 128, 247, 30, 236, 71, 44, 165, 161, 251, 81, 117, 162, 221, 120]
+cc 174b0d31fe87e15ff2e295149062b3adc65b722d8cff4c08257d4b93d72b086b # shrinks to nparties = 15, m = 10, k = 3, msg = [217, 131, 84, 187, 173, 212, 75, 52, 100, 187, 38, 147, 226, 0, 218, 88]
diff --git a/mithril-core/src/error.rs b/mithril-core/src/error.rs
@@ -30,10 +30,6 @@ pub enum MultiSignatureError {
 /// Errors which can be output by Mithril single signature verification.
 #[derive(Debug, Clone, thiserror::Error)]
 pub enum StmSignatureError {
-    /// The IVK is invalid after aggregating the keys
-    #[error("Aggregated key does not correspond to the expected key.")]
-    IvkInvalid(VerificationKey),
-
     /// There is an index out of bounds
     #[error("Received index, {0}, is higher than what the security parameter allows, {1}.")]
     IndexBoundFailed(u64, u64),
@@ -48,7 +44,7 @@ pub enum StmSignatureError {
 
     /// A party submitted an invalid signature
     #[error("A provided signature is invalid")]
-    SingleSignatureInvalid(Signature),
+    SignatureInvalid(Signature),
 
     /// This error occurs when the the serialization of the raw bytes failed
     #[error("Invalid bytes")]
@@ -66,17 +62,17 @@ pub enum StmAggregateSignatureError<D: Digest + FixedOutput> {
     #[error("Aggregated key does not correspond to the expected key.")]
     IvkInvalid(VerificationKey),
 
-    /// There is an index out of bounds
-    #[error("Received index, {0}, is higher than what the security parameter allows, {1}.")]
-    IndexBoundFailed(u64, u64),
-
     /// There is a duplicate index
     #[error("Indices are not unique.")]
     IndexNotUnique,
 
     /// The aggregated signature is invalid
     #[error("Aggregate signature is invalid")]
-    SignatureInvalid,
+    AggregateSignatureInvalid,
+
+    /// One of the aggregated signatures is invalid
+    #[error("Individual signature is invalid: {0}")]
+    IndividualSignatureInvalid(StmSignatureError),
 
     /// This error occurs when the the serialization of the raw bytes failed
     #[error("Invalid bytes")]
@@ -135,16 +131,16 @@ pub enum RegisterError {
     UnregisteredInitializer,
 }
 
-impl From<RegisterError> for StmSignatureError {
-    fn from(e: RegisterError) -> Self {
-        match e {
-            RegisterError::SerializationError => Self::SerializationError,
-            RegisterError::KeyInvalid(e) => Self::IvkInvalid(e.vk),
-            RegisterError::KeyRegistered(_) => unreachable!(),
-            RegisterError::UnregisteredInitializer => unreachable!(),
-        }
-    }
-}
+// impl From<RegisterError> for StmSignatureError {
+//     fn from(e: RegisterError) -> Self {
+//         match e {
+//             RegisterError::SerializationError => Self::SerializationError,
+//             RegisterError::KeyInvalid(e) => Self::IvkInvalid(e.vk),
+//             RegisterError::KeyRegistered(_) => unreachable!(),
+//             RegisterError::UnregisteredInitializer => unreachable!(),
+//         }
+//     }
+// }
 
 impl<D: Digest + FixedOutput> From<MerkleTreeError<D>> for StmAggregateSignatureError<D> {
     fn from(e: MerkleTreeError<D>) -> Self {
@@ -160,8 +156,8 @@ impl From<MultiSignatureError> for StmSignatureError {
     fn from(e: MultiSignatureError) -> Self {
         match e {
             MultiSignatureError::SerializationError => Self::SerializationError,
-            MultiSignatureError::KeyInvalid(e) => Self::IvkInvalid(e.vk),
-            MultiSignatureError::SignatureInvalid(e) => Self::SingleSignatureInvalid(e),
+            MultiSignatureError::SignatureInvalid(e) => Self::SignatureInvalid(e),
+            MultiSignatureError::KeyInvalid(_) => unreachable!(),
             MultiSignatureError::AggregateSignatureInvalid => unreachable!(),
         }
     }
@@ -173,21 +169,14 @@ impl<D: Digest + FixedOutput> From<MultiSignatureError> for StmAggregateSignatur
             MultiSignatureError::SerializationError => Self::SerializationError,
             MultiSignatureError::KeyInvalid(e) => Self::IvkInvalid(e.vk),
             MultiSignatureError::SignatureInvalid(_e) => unreachable!(),
-            MultiSignatureError::AggregateSignatureInvalid => Self::SignatureInvalid,
+            MultiSignatureError::AggregateSignatureInvalid => Self::AggregateSignatureInvalid,
         }
     }
 }
 
 impl<D: Digest + FixedOutput> From<StmSignatureError> for StmAggregateSignatureError<D> {
     fn from(e: StmSignatureError) -> Self {
-        match e {
-            StmSignatureError::SerializationError => Self::SerializationError,
-            StmSignatureError::IvkInvalid(e) => Self::IvkInvalid(e),
-            StmSignatureError::SingleSignatureInvalid(_e) => unreachable!(),
-            StmSignatureError::IndexBoundFailed(e, _e) => Self::IndexBoundFailed(e, _e),
-            StmSignatureError::LotteryLost => unreachable!(),
-            StmSignatureError::EvalInvalid(_e) => unreachable!(),
-        }
+        StmAggregateSignatureError::IndividualSignatureInvalid(e)
     }
 }
 
diff --git a/mithril-core/src/key_reg.rs b/mithril-core/src/key_reg.rs
@@ -74,7 +74,7 @@ impl KeyReg {
                 MTLeaf(vk, stake)
             })
             .collect::<Vec<RegParty>>();
-        reg_parties.sort();
+        reg_parties.sort_unstable();
 
         ClosedKeyReg {
             merkle_tree: Arc::new(MerkleTree::create(&reg_parties)),
diff --git a/mithril-core/src/stm.rs b/mithril-core/src/stm.rs
