fix decrypt vote for the unlisted-candidates error (#64)

Author: cyjseagull

ffi/ffi_java/ffi_java_acv/src/verifier.rs

@@ -155,7 +155,7 @@ pub extern "system" fn Java_com_webank_wedpr_acv_NativeInterface_verifyUnbounded
     );
     let public_key =
         java_safe_jbytes_to_bytes!(_env, result_jobject, public_key_bytes);
-    let verify_result = match wedpr_s_anonymous_ciphertext_voting::verifier::verify_unbounded_vote_request(&pb_poll_parameters,
+    let verify_result = match wedpr_s_anonymous_ciphertext_voting::verifier::verify_unbounded_vote_request_unlisted(&pb_poll_parameters,
     &pb_vote_request, &public_key)
     {
         Ok(v) => v,

solution/anonymous_ciphertext_voting/src/coordinator.rs

@@ -153,7 +153,7 @@ pub fn aggregate_vote_sum_response(
         bytes_to_point(&vote_sum.get_blank_ballot().get_ciphertext2())?
             + c2_point;
 
-    let mut output_vote_sum = VoteStorage::new();
+    let mut updated_vote_sum_list = Vec::new();
     for candidate in poll_parameters.get_candidates().get_candidate() {
         let sum_ballot = get_ballot_by_candidate(&vote_sum, candidate)?;
         let new_ballot = get_ballot_by_candidate(&vote_part, candidate)?;
@@ -171,12 +171,19 @@ pub fn aggregate_vote_sum_response(
         let mut new_pair = CandidateBallot::new();
         new_pair.set_candidate(candidate.to_string());
         new_pair.set_ballot(new_sum_ballot);
-        output_vote_sum.mut_voted_ballot().push(new_pair);
+        updated_vote_sum_list.push(new_pair);
     }
-    let blank_ballot = output_vote_sum.mut_blank_ballot();
-    blank_ballot.set_ciphertext1(point_to_bytes(&blank_c1_sum));
-    blank_ballot.set_ciphertext2(point_to_bytes(&blank_c2_sum));
-    *vote_sum = output_vote_sum;
+    // update the voted_ballot for vote sum
+    vote_sum.clear_voted_ballot();
+    for voted_ballot in updated_vote_sum_list {
+        vote_sum.mut_voted_ballot().push(voted_ballot);
+    }
+    vote_sum
+        .mut_blank_ballot()
+        .set_ciphertext1(point_to_bytes(&blank_c1_sum));
+    vote_sum
+        .mut_blank_ballot()
+        .set_ciphertext2(point_to_bytes(&blank_c2_sum));
     Ok(true)
 }
 
@@ -233,8 +240,7 @@ pub fn aggregate_decrypted_part_sum(
         .mut_blank_part()
         .set_blinding_c2(point_to_bytes(&blank_c2_r_sum));
 
-    let mut output_decrypted_result = aggregated_decrypted_result.clone();
-    output_decrypted_result.clear_candidate_part();
+    let mut updated_candidate_part_list = Vec::new();
     for candidate in poll_parameters.get_candidates().get_candidate() {
         let aggregated_part = get_counting_part_by_candidate(
             &aggregated_decrypted_result,
@@ -255,9 +261,14 @@ pub fn aggregate_decrypted_part_sum(
         let mut new_pair = StringToCountingPartPair::new();
         new_pair.set_key(candidate.to_string());
         new_pair.set_value(candidate_part);
-        output_decrypted_result.mut_candidate_part().push(new_pair);
+        updated_candidate_part_list.push(new_pair);
+    }
+    aggregated_decrypted_result.clear_candidate_part();
+    for updated_candidate_part in updated_candidate_part_list {
+        aggregated_decrypted_result
+            .mut_candidate_part()
+            .push(updated_candidate_part);
     }
-    *aggregated_decrypted_result = output_decrypted_result;
     Ok(true)
 }
 
@@ -268,8 +279,10 @@ pub fn aggregate_decrypted_part_for_specify_unlisted_candidate(
     // counting for the unlisted candidate
     let current_aggregated_unlisted_candidate =
         aggregated_decrypted_part.get_decrypted_unlisted_candidate();
+
     let decrypted_part_unlisted_candidate =
         decrypted_part.get_decrypted_unlisted_candidate();
+
     let aggregated_unlisted_candidate = bytes_to_point(
         current_aggregated_unlisted_candidate.get_blinding_c2(),
     )? + bytes_to_point(
@@ -279,7 +292,6 @@ pub fn aggregate_decrypted_part_for_specify_unlisted_candidate(
     aggregated_decrypted_part
         .mut_decrypted_unlisted_candidate()
         .set_blinding_c2(point_to_bytes(&aggregated_unlisted_candidate));
-
     // push the cipher unlisted candidate ballot into aggregated_decrypted_part
     let unlisted_candidate_ballot =
         decrypted_part.get_decrypted_unlisted_candidate_ballot();

solution/anonymous_ciphertext_voting/src/lib.rs

@@ -18,7 +18,10 @@ pub mod voter;
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{config::SIGNATURE, coordinator};
+    use crate::{
+        config::{POLL_RESULT_KEY_TOTAL_BALLOTS, SIGNATURE},
+        coordinator,
+    };
     use wedpr_l_crypto_zkp_utils::{
         bytes_to_point, get_random_scalar, scalar_to_bytes,
     };
@@ -681,6 +684,7 @@ mod tests {
             .unwrap()
         );
         // aggregate
+        wedpr_println!("##### aggregate_vote_sum_response_unlisted request1");
         assert_eq!(
             true,
             coordinator::aggregate_vote_sum_response_unlisted(
@@ -690,6 +694,11 @@ mod tests {
             )
             .unwrap()
         );
+        wedpr_println!(
+            "##### aggregate_vote_sum_response_unlisted request1 success, \
+             size: {:?}",
+            encrypted_vote_sum.get_voted_ballot_unlisted().len()
+        );
         // vote2
         let choice_candidate_unlisted2 =
             &candidate_list_unlisted[1..3].to_vec();
@@ -713,6 +722,7 @@ mod tests {
             )
             .unwrap()
         );
+        wedpr_println!("##### aggregate_vote_sum_response_unlisted request2");
         assert_eq!(
             true,
             coordinator::aggregate_vote_sum_response_unlisted(
@@ -722,6 +732,11 @@ mod tests {
             )
             .unwrap()
         );
+        wedpr_println!(
+            "##### aggregate_vote_sum_response_unlisted request2 success, \
+             size: {:?}",
+            encrypted_vote_sum.get_voted_ballot_unlisted().len()
+        );
         // vote3
         let choice_candidate_unlisted3 =
             &candidate_list_unlisted[2..3].to_vec();
@@ -736,6 +751,7 @@ mod tests {
             &poll_parameters,
         )
         .unwrap();
+        wedpr_println!("##### aggregate_vote_sum_response_unlisted request3");
         assert_eq!(
             true,
             verifier::verify_unbounded_vote_request_unlisted(
@@ -754,7 +770,13 @@ mod tests {
             )
             .unwrap()
         );
-        wedpr_println!("encrypted_vote_sum: {:?}", encrypted_vote_sum);
+        wedpr_println!(
+            "##### aggregate_vote_sum_response_unlisted request3 success"
+        );
+        wedpr_println!(
+            "encrypted_vote_sum, unlisted size: {:?}",
+            encrypted_vote_sum.get_voted_ballot_unlisted().len()
+        );
 
         let mut vote_sum_total = DecryptedResultPartStorage::new();
 
@@ -778,6 +800,11 @@ mod tests {
             .unwrap()
         );
 
+        wedpr_println!(
+            "##### aggregate_decrypted_part_sum_unlisted request1, unlisted \
+             size: {:?}",
+            vote_sum_total.get_unlisted_candidate_part().len()
+        );
         assert_eq!(
             true,
             coordinator::aggregate_decrypted_part_sum_unlisted(
@@ -787,6 +814,11 @@ mod tests {
             )
             .unwrap()
         );
+        wedpr_println!(
+            "##### aggregate_decrypted_part_sum_unlisted request1, success \
+             unlisted size: {:?}",
+            vote_sum_total.get_unlisted_candidate_part().len()
+        );
         let decrypt_request2 = counter::count_unlisted(
             counter_id_list[1],
             &counter2,
@@ -806,7 +838,11 @@ mod tests {
             )
             .unwrap()
         );
-
+        wedpr_println!(
+            "##### aggregate_decrypted_part_sum_unlisted request2, unlisted \
+             size: {:?}",
+            vote_sum_total.get_unlisted_candidate_part().len()
+        );
         assert_eq!(
             true,
             coordinator::aggregate_decrypted_part_sum_unlisted(
@@ -816,6 +852,11 @@ mod tests {
             )
             .unwrap()
         );
+        wedpr_println!(
+            "##### aggregate_decrypted_part_sum_unlisted request2, unlisted \
+             size: {:?} succ",
+            vote_sum_total.get_unlisted_candidate_part().len()
+        );
 
         let decrypt_request3 = counter::count_unlisted(
             counter_id_list[2],
@@ -836,7 +877,11 @@ mod tests {
             )
             .unwrap()
         );
-
+        wedpr_println!(
+            "##### aggregate_decrypted_part_sum_unlisted request3, unlisted \
+             size: {:?}",
+            vote_sum_total.get_unlisted_candidate_part().len()
+        );
         assert_eq!(
             true,
             coordinator::aggregate_decrypted_part_sum_unlisted(
@@ -846,6 +891,11 @@ mod tests {
             )
             .unwrap()
         );
+        wedpr_println!(
+            "##### aggregate_decrypted_part_sum_unlisted request3, unlisted \
+             size: {:?} success",
+            vote_sum_total.get_unlisted_candidate_part().len()
+        );
         //        wedpr_println!("vote_sum_total:{:?}", vote_sum_total);
 
         let final_result_request_unlisted =
@@ -871,5 +921,38 @@ mod tests {
         )
         .unwrap();
         assert!(result);
+        // check the candidate result(with Wedpr_voting_total_ballots)
+        assert!(final_result_request_unlisted.get_result().len() == 4);
+        for candidate_result in final_result_request_unlisted.get_result() {
+            if candidate_result.get_key()
+                == POLL_RESULT_KEY_TOTAL_BALLOTS.to_string()
+            {
+                assert!(candidate_result.get_value() == 60);
+            }
+            if candidate_result.get_key() == "Alice" {
+                assert!(candidate_result.get_value() == 40);
+            }
+            if candidate_result.get_key() == "Bob" {
+                assert!(candidate_result.get_value() == 50);
+            }
+            if candidate_result.get_key() == "charlie" {
+                assert!(candidate_result.get_value() == 60);
+            }
+        }
+        // check the unlisted candidate result
+        assert!(final_result_request_unlisted.get_unlisted_result().len() == 3);
+        for candidate_result in
+            final_result_request_unlisted.get_unlisted_result()
+        {
+            if candidate_result.get_candidate_id() == 1 {
+                assert!(candidate_result.get_value() == 10);
+            }
+            if candidate_result.get_candidate_id() == 2 {
+                assert!(candidate_result.get_value() == 0);
+            }
+            if candidate_result.get_candidate_id() == 3 {
+                assert!(candidate_result.get_value() == 60);
+            }
+        }
     }
 }

solution/anonymous_ciphertext_voting/src/voter.rs

@@ -318,7 +318,7 @@ pub fn generate_candidate_cipher(
     let blinding = get_random_scalar();
     let ciphertext1 = RistrettoPoint::multiscalar_mul(
         &[Scalar::from(value as u64), blinding],
-        &[*BASEPOINT_G2, *poll_point],
+        &[*BASEPOINT_G1, *poll_point],
     );
     let ciphertext2 = *BASEPOINT_G2 * blinding;
     cipher_point.set_ciphertext1(point_to_bytes(&ciphertext1));