Merge branch 'main' into block_ser_ledger

Author: cong-or

rust/Cargo.toml

@@ -8,6 +8,7 @@ members = [
     "cbork-abnf-parser",
     "cbork-cddl-parser",
     "catalyst-voting",
+    "catalyst-voting", "jormungandr-vote-tx",
     "immutable-ledger",
 ]
 

rust/Earthfile

@@ -10,7 +10,7 @@ COPY_SRC:
         .cargo .config \
         c509-certificate \
         cardano-chain-follower \
-        catalyst-voting \
+        catalyst-voting jormungandr-vote-tx \
         cbork cbork-abnf-parser cbork-cddl-parser \
         hermes-ipfs \
         immutable-ledger .
@@ -53,7 +53,7 @@ build:
         --cmd="/scripts/std_build.py" \
         --args1="--libs=c509-certificate --libs=cardano-chain-follower --libs=hermes-ipfs" \
         --args2="--libs=cbork-cddl-parser --libs=cbork-abnf-parser" \
-        --args3="--libs=catalyst-voting" \
+        --args3="--libs=catalyst-voting --libs=jormungandr-vote-tx" \
         --args4="--bins=cbork/cbork" \
         --args5="--cov_report=$HOME/build/coverage-report.info" \
         --output="release/[^\./]+" \

rust/catalyst-voting/Cargo.toml

@@ -24,10 +24,10 @@ curve25519-dalek = { version = "4.1.3", features = ["digest", "rand_core"] }
 ed25519-dalek = { version = "2.1.1", features = ["rand_core"] }
 blake2b_simd = "1.0.2"
 rayon = "1.10.0"
+proptest = { version = "1.5.0" }
 
 [dev-dependencies]
 criterion = "0.5.1"
-proptest = { version = "1.5.0" }
 # Potentially it could be replaced with using `proptest::property_test` attribute macro,
 # after this PR will be merged https://github.com/proptest-rs/proptest/pull/523
 test-strategy = "0.4.0"

rust/catalyst-voting/benches/vote_protocol.rs

@@ -12,7 +12,7 @@
 )]
 
 use catalyst_voting::{
-    crypto::default_rng,
+    crypto::rng::default_rng,
     vote_protocol::{
         committee::{ElectionPublicKey, ElectionSecretKey},
         tally::{

rust/catalyst-voting/src/crypto/ed25519/mod.rs

@@ -5,7 +5,8 @@ mod decoding;
 use ed25519_dalek::{
     ed25519::signature::Signer, Signature as Ed25519Signature, SigningKey, VerifyingKey,
 };
-use rand_core::CryptoRngCore;
+
+use crate::crypto::rng::rand_core::CryptoRngCore;
 
 /// `Ed25519` private key struct.
 #[must_use]
@@ -45,12 +46,11 @@ pub fn verify_signature(pk: &PublicKey, msg: &[u8], sig: &Signature) -> bool {
     pk.0.verify_strict(msg, &sig.0).is_ok()
 }
 
-#[cfg(test)]
-mod tests {
+#[allow(missing_docs, clippy::missing_docs_in_private_items)]
+mod arbitrary_impl {
     use proptest::prelude::{any, Arbitrary, BoxedStrategy, Strategy};
-    use test_strategy::proptest;
 
-    use super::*;
+    use super::{PrivateKey, SigningKey};
 
     impl Arbitrary for PrivateKey {
         type Parameters = ();
@@ -62,6 +62,13 @@ mod tests {
                 .boxed()
         }
     }
+}
+
+#[cfg(test)]
+mod tests {
+    use test_strategy::proptest;
+
+    use super::*;
 
     #[proptest]
     fn sign_test(private_key: PrivateKey, msg: Vec<u8>) {

rust/catalyst-voting/src/crypto/elgamal/mod.rs

@@ -66,15 +66,14 @@ impl Add<&Ciphertext> for &Ciphertext {
     }
 }
 
-#[cfg(test)]
-mod tests {
+#[allow(missing_docs, clippy::missing_docs_in_private_items)]
+mod arbitrary_impl {
     use proptest::{
         arbitrary::any,
         prelude::{Arbitrary, BoxedStrategy, Strategy},
     };
-    use test_strategy::proptest;
 
-    use super::*;
+    use super::{Ciphertext, GroupElement};
 
     impl Arbitrary for Ciphertext {
         type Parameters = ();
@@ -86,6 +85,13 @@ mod tests {
                 .boxed()
         }
     }
+}
+
+#[cfg(test)]
+mod tests {
+    use test_strategy::proptest;
+
+    use super::*;
 
     #[proptest]
     fn ciphertext_add_test(e1: Scalar, e2: Scalar, e3: Scalar, e4: Scalar) {

rust/catalyst-voting/src/crypto/group/ristretto255/mod.rs

@@ -15,9 +15,11 @@ use curve25519_dalek::{
     traits::Identity,
     RistrettoPoint,
 };
-use rand_core::CryptoRngCore;
 
-use crate::crypto::hash::digest::{consts::U64, Digest};
+use crate::crypto::{
+    hash::digest::{consts::U64, Digest},
+    rng::rand_core::CryptoRngCore,
+};
 
 /// Ristretto group scalar.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -157,15 +159,14 @@ impl Sub<&GroupElement> for &GroupElement {
     }
 }
 
-#[cfg(test)]
-mod tests {
+#[allow(missing_docs, clippy::missing_docs_in_private_items)]
+mod arbitrary_impl {
     use proptest::{
         arbitrary::any,
         prelude::{Arbitrary, BoxedStrategy, Strategy},
     };
-    use test_strategy::proptest;
 
-    use super::*;
+    use super::{GroupElement, Mul, Scalar};
 
     impl Arbitrary for Scalar {
         type Parameters = ();
@@ -186,6 +187,13 @@ mod tests {
                 .boxed()
         }
     }
+}
+
+#[cfg(test)]
+mod tests {
+    use test_strategy::proptest;
+
+    use super::*;
 
     #[proptest]
     fn scalar_arithmetic_tests(e1: Scalar, e2: Scalar, e3: Scalar) {

rust/catalyst-voting/src/crypto/mod.rs

@@ -1,20 +1,10 @@
 //! Crypto primitives which are used by voting protocol.
 
-// cspell: words Seedable
-
-use rand_chacha::ChaCha8Rng;
-use rand_core::{CryptoRngCore, SeedableRng};
-
 pub mod babystep_giantstep;
 pub mod ed25519;
 pub mod elgamal;
 pub mod group;
 pub mod hash;
+pub mod rng;
 pub mod zk_dl_equality;
 pub mod zk_unit_vector;
-
-/// Default random number generator `rand_chacha::ChaCha8Rng`.
-#[must_use]
-pub fn default_rng() -> impl CryptoRngCore {
-    ChaCha8Rng::from_entropy()
-}

rust/catalyst-voting/src/crypto/rng.rs

@@ -0,0 +1,14 @@
+//! Random number generator objects.
+
+// cspell: words Seedable
+
+use rand_chacha::ChaCha8Rng;
+pub use rand_core;
+use rand_core::{CryptoRngCore, SeedableRng};
+
+/// Default random number generator `rand_chacha::ChaCha8Rng`.
+#[must_use]
+#[allow(clippy::module_name_repetitions)]
+pub fn default_rng() -> impl CryptoRngCore {
+    ChaCha8Rng::from_entropy()
+}

rust/catalyst-voting/src/crypto/zk_unit_vector/mod.rs

@@ -16,13 +16,14 @@ use std::ops::Mul;
 
 use challenges::{calculate_first_challenge_hash, calculate_second_challenge_hash};
 use polynomial::{calculate_polynomial_val, generate_polynomial, Polynomial};
-use rand_core::CryptoRngCore;
 use randomness_announcements::{Announcement, BlindingRandomness, ResponseRandomness};
+use rayon::iter::{IndexedParallelIterator, IntoParallelRefIterator, ParallelIterator};
 use utils::get_bit;
 
 use crate::crypto::{
     elgamal::{encrypt, Ciphertext},
     group::{GroupElement, Scalar},
+    rng::rand_core::CryptoRngCore,
 };
 
 /// Unit vector proof struct
@@ -67,7 +68,7 @@ pub fn generate_unit_vector_proof<R: CryptoRngCore>(
         .collect();
 
     let announcements: Vec<_> = blinding_randomness
-        .iter()
+        .par_iter()
         .enumerate()
         .map(|(l, r)| {
             let i_bit = get_bit(i, l);
@@ -110,7 +111,7 @@ fn generate_dl_and_rl<R: CryptoRngCore>(
     let r_l: Vec<_> = (0..log_n).map(|_| Scalar::random(rng)).collect();
 
     let d_l: Vec<_> = r_l
-        .iter()
+        .par_iter()
         .enumerate()
         .map(|(l, r_l)| {
             let (sum, _) = polynomials.iter().fold(
@@ -234,16 +235,14 @@ fn check_2(
     &right_1 + &right_2 == left
 }
 
-#[cfg(test)]
-mod tests {
+#[allow(missing_docs, clippy::missing_docs_in_private_items)]
+mod arbitrary_impl {
     use proptest::{
         prelude::{any_with, Arbitrary, BoxedStrategy, Strategy},
         sample::size_range,
     };
-    use rand_core::OsRng;
-    use test_strategy::proptest;
 
-    use super::{super::elgamal::generate_public_key, *};
+    use super::{Announcement, Ciphertext, ResponseRandomness, Scalar, UnitVectorProof};
 
     impl Arbitrary for UnitVectorProof {
         type Parameters = usize;
@@ -262,6 +261,15 @@ mod tests {
             .boxed()
         }
     }
+}
+
+#[cfg(test)]
+mod tests {
+    use proptest::sample::size_range;
+    use rand_core::OsRng;
+    use test_strategy::proptest;
+
+    use super::{super::elgamal::generate_public_key, *};
 
     fn is_unit_vector(vector: &[Scalar]) -> bool {
         let ones = vector.iter().filter(|s| s == &&Scalar::one()).count();