fix

Author: Mr-Leshiy

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

@@ -58,7 +58,8 @@ impl UnitVectorProof {
     /// Get a deserialized bytes size
     #[must_use]
     pub fn bytes_size(&self) -> usize {
-        self.0.len() * Announcement::BYTES_SIZE
+        Scalar::BYTES_SIZE
+            + self.0.len() * Announcement::BYTES_SIZE
             + self.0.len() * Ciphertext::BYTES_SIZE
             + self.0.len() * ResponseRandomness::BYTES_SIZE
     }
@@ -152,6 +153,7 @@ mod tests {
         #[strategy(0..5usize)] _size: usize, #[any(#_size)] p1: UnitVectorProof,
     ) {
         let bytes = p1.to_bytes();
+        assert_eq!(bytes.len(), p1.bytes_size());
         let p2 = UnitVectorProof::from_bytes(&bytes, p1.size()).unwrap();
         assert_eq!(p1, p2);
     }

rust/catalyst-voting/src/txs/v1/decoding.rs

@@ -70,6 +70,12 @@ impl Tx {
 
         // Read tx size
         bytes.read_exact(&mut u32_buf)?;
+        let tx_size = u32::from_be_bytes(u32_buf);
+        ensure!(
+            tx_size as usize == bytes.len(),
+            "Invalid tx size, expected: {tx_size}, provided: {0}.",
+            bytes.len()
+        );
 
         bytes.read_exact(&mut u8_buf)?;
         ensure!(
@@ -106,7 +112,7 @@ impl Tx {
                 bytes.read_exact(&mut u8_buf)?;
                 let proof = VoterProof::from_bytes(bytes, u8_buf[0].into())
                     .map_err(|e| anyhow!("Invalid voter proof, error: {e}."))?;
-                bytes = &bytes[vote.bytes_size()..];
+                bytes = &bytes[proof.bytes_size()..];
 
                 Vote::Private(vote, proof)
             },
@@ -155,7 +161,7 @@ impl Tx {
 
 #[cfg(test)]
 mod tests {
-    use proptest::prelude::{any, any_with, Arbitrary, BoxedStrategy, ProptestConfig, Strategy};
+    use proptest::prelude::{any, any_with, Arbitrary, BoxedStrategy, Strategy};
     use test_strategy::proptest;
 
     use super::*;
@@ -201,13 +207,10 @@ mod tests {
         }
     }
 
-    #[proptest(ProptestConfig::with_cases(1))]
+    #[proptest]
     #[allow(clippy::indexing_slicing)]
     fn tx_to_bytes_from_bytes_test(t1: Tx) {
         let bytes = t1.to_bytes();
-        // verify correctness serializing tx size field
-        let size = u32::from_be_bytes(bytes[0..4].try_into().unwrap());
-        assert_eq!(size as usize, bytes.len() - 4);
         let t2 = Tx::from_bytes(&bytes).unwrap();
         assert_eq!(t1, t2);
     }