wip

Author: Mr-Leshiy

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

@@ -2,7 +2,45 @@
 
 use anyhow::anyhow;
 
-use super::{Ciphertext, GroupElement};
+use super::{Ciphertext, GroupElement, PublicKey, Scalar, SecretKey};
+
+impl PublicKey {
+    /// `PublicKey` bytes size
+    pub const BYTES_SIZE: usize = GroupElement::BYTES_SIZE;
+
+    /// Convert this `PublicKey` to its underlying sequence of bytes.
+    #[must_use]
+    pub fn to_bytes(&self) -> [u8; Self::BYTES_SIZE] {
+        self.0.to_bytes()
+    }
+
+    /// Attempt to construct a `PublicKey` from a byte representation.
+    ///
+    /// # Errors
+    ///   - Cannot decode group element field.
+    pub fn from_bytes(bytes: &[u8; Self::BYTES_SIZE]) -> anyhow::Result<Self> {
+        GroupElement::from_bytes(bytes).map(Self)
+    }
+}
+
+impl SecretKey {
+    /// `SecretKey` bytes size
+    pub const BYTES_SIZE: usize = Scalar::BYTES_SIZE;
+
+    /// Convert this `SecretKey` to its underlying sequence of bytes.
+    #[must_use]
+    pub fn to_bytes(&self) -> [u8; Self::BYTES_SIZE] {
+        self.0.to_bytes()
+    }
+
+    /// Attempt to construct a `SecretKey` from a byte representation.
+    ///
+    /// # Errors
+    ///   - Cannot decode scalar field.
+    pub fn from_bytes(bytes: [u8; Self::BYTES_SIZE]) -> anyhow::Result<Self> {
+        Scalar::from_bytes(bytes).map(Self)
+    }
+}
 
 impl Ciphertext {
     /// `Ciphertext` bytes size
@@ -16,7 +54,7 @@ impl Ciphertext {
         res
     }
 
-    /// Attempt to construct a `Scalar` from a compressed value byte representation.
+    /// Attempt to construct a `Ciphertext` from a byte representation.
     ///
     /// # Errors
     ///   - Cannot decode group element field.
@@ -37,6 +75,18 @@ mod tests {
 
     use super::*;
 
+    #[proptest]
+    fn keys_to_bytes_from_bytes_test(s1: SecretKey) {
+        let bytes = s1.to_bytes();
+        let s2 = SecretKey::from_bytes(bytes).unwrap();
+        assert_eq!(s1, s2);
+
+        let p1 = s1.public_key();
+        let bytes = p1.to_bytes();
+        let p2 = PublicKey::from_bytes(&bytes).unwrap();
+        assert_eq!(p1, p2);
+    }
+
     #[proptest]
     fn ciphertext_to_bytes_from_bytes_test(c1: Ciphertext) {
         let bytes = c1.to_bytes();

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

@@ -7,33 +7,40 @@ use anyhow::anyhow;
 use super::{Announcement, Ciphertext, GroupElement, ResponseRandomness, Scalar, UnitVectorProof};
 
 impl UnitVectorProof {
+    /// Get an underlying vector length.
+    ///
+    /// **Note** each vector field has the same length.
+    pub fn size(&self) -> usize {
+        self.0.len()
+    }
+
     /// Decode `UnitVectorProof` from bytes.
     ///
     /// # Errors
     ///   - Cannot decode announcement value.
     ///   - Cannot decode ciphertext value.
     ///   - Cannot decode response randomness value.
     ///   - Cannot decode scalar value.
-    pub fn from_bytes(mut bytes: &[u8], size: usize) -> anyhow::Result<Self> {
+    pub fn from_bytes(mut bytes: &[u8], len: usize) -> anyhow::Result<Self> {
         let mut ann_buf = [0u8; Announcement::BYTES_SIZE];
         let mut dl_buf = [0u8; Ciphertext::BYTES_SIZE];
         let mut rr_buf = [0u8; ResponseRandomness::BYTES_SIZE];
 
-        let ann = (0..size)
+        let ann = (0..len)
             .map(|i| {
                 bytes.read_exact(&mut ann_buf)?;
                 Announcement::from_bytes(&ann_buf)
                     .map_err(|e| anyhow!("Cannot decode announcement at {i}, error: {e}."))
             })
             .collect::<anyhow::Result<_>>()?;
-        let dl = (0..size)
+        let dl = (0..len)
             .map(|i| {
                 bytes.read_exact(&mut dl_buf)?;
                 Ciphertext::from_bytes(&dl_buf)
                     .map_err(|e| anyhow!("Cannot decode ciphertext at {i}, error: {e}."))
             })
             .collect::<anyhow::Result<_>>()?;
-        let rr = (0..size)
+        let rr = (0..len)
             .map(|i| {
                 bytes.read_exact(&mut rr_buf)?;
                 ResponseRandomness::from_bytes(&rr_buf)
@@ -141,9 +148,11 @@ mod tests {
     use super::*;
 
     #[proptest]
-    fn proof_to_bytes_from_bytes_test(p1: UnitVectorProof) {
+    fn proof_to_bytes_from_bytes_test(
+        #[strategy(0..20usize)] _size: usize, #[any(#_size)] p1: UnitVectorProof,
+    ) {
         let bytes = p1.to_bytes();
-        let p2 = UnitVectorProof::from_bytes(&bytes, p1.0.len()).unwrap();
+        let p2 = UnitVectorProof::from_bytes(&bytes, p1.size()).unwrap();
         assert_eq!(p1, p2);
     }
 

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

@@ -1,4 +1,3 @@
 //! A catalyst transaction objects implementation
 
-mod utils;
-// pub mod v1;
+pub mod v1;