fix comment

Author: julyawang

bounty/Cargo.toml

@@ -10,17 +10,18 @@ edition = "2018"
 colored = "1.8"
 curve25519-dalek = { version = "1", features = [ "serde" ] }
 protobuf = "2.22.1"
-sha3 = "0.8"
 rand = "0.3.17"
+sha3 = "0.8"
 wedpr_l_crypto_zkp_discrete_logarithm_proof = "1.0.0"
-wedpr_l_crypto_zkp_range_proof =  { git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto", branch = "main" }
+wedpr_l_crypto_zkp_range_proof = { git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto", branch = "main" }
+wedpr_l_crypto_zkp_utils = "1.0.0"
 wedpr_l_macros = "1.0.0"
-wedpr_s_protos = "1.3.0"
 wedpr_l_protos = "1.0.0"
 wedpr_l_utils = "1.0.0"
-wedpr_l_crypto_zkp_utils = "1.0.0"
-wedpr_s_verifiable_confidential_ledger = { path = "../solution/verifiable_confidential_ledger"}
+wedpr_s_protos = "1.3.0"
 wedpr_s_selective_certificate_disclosure = "1.3.0"
 
+wedpr_s_verifiable_confidential_ledger = { path = "../solution/verifiable_confidential_ledger" }
+
 [dev-dependencies]
 wedpr_l_common_coder_base64 = "1.0.0"

ffi/ffi_c/ffi_c_ktb/Cargo.toml

@@ -13,13 +13,14 @@ crate-type = [ "cdylib", "staticlib" ]
 [dependencies]
 libc = "0.2.60"
 protobuf = "2.22.1"
-wedpr_s_hierarchical_deterministic_key = "1.3.0"
 wedpr_ffi_common = "1.0.0"
 wedpr_ffi_macros = "1.0.0"
-wedpr_s_protos = "1.3.0"
 wedpr_l_macros = "1.0.0"
 
 
 # This is required to generate C/C++ header files.
+wedpr_s_hierarchical_deterministic_key = "1.3.0"
+wedpr_s_protos = "1.3.0"
+
 [build-dependencies]
-cbindgen = "0.9.0"
+cbindgen = "0.9.0"

ffi/ffi_c/ffi_c_scd/Cargo.toml

@@ -13,12 +13,13 @@ crate-type = [ "cdylib", "staticlib" ]
 [dependencies]
 libc = "0.2.60"
 protobuf = "2.22.1"
-wedpr_s_selective_certificate_disclosure = "1.3.0"
 wedpr_ffi_common = "1.0.0"
 wedpr_ffi_macros = "1.0.0"
-wedpr_s_protos = "1.3.0"
 wedpr_l_macros = "1.0.0"
 
 # This is required to generate C/C++ header files.
+wedpr_s_protos = "1.3.0"
+wedpr_s_selective_certificate_disclosure = "1.3.0"
+
 [build-dependencies]
 cbindgen = "0.9.0"

ffi/ffi_c/ffi_c_vcl/Cargo.toml

@@ -13,13 +13,14 @@ crate-type = [ "cdylib", "staticlib" ]
 [dependencies]
 libc = "0.2.60"
 protobuf = "2.22.1"
-wedpr_s_verifiable_confidential_ledger = { path = "../../../solution/verifiable_confidential_ledger"}
 wedpr_ffi_common = "1.0.0"
 wedpr_ffi_macros = "1.1.0"
-wedpr_s_protos = { path = "../../../protos"}
-wedpr_l_protos =  "1.1.0"
 wedpr_l_macros = "1.0.0"
 
 # This is required to generate C/C++ header files.
+wedpr_l_protos = "1.1.0"
+wedpr_s_protos = { path = "../../../protos" }
+wedpr_s_verifiable_confidential_ledger = { path = "../../../solution/verifiable_confidential_ledger" }
+
 [build-dependencies]
 cbindgen = "0.9.0"

ffi/ffi_java/ffi_java_ktb/Cargo.toml

@@ -13,13 +13,13 @@ crate-type = [ "cdylib", "staticlib" ]
 [dependencies]
 jni = "0.13.0"
 protobuf = "2.22.1"
-wedpr_s_hierarchical_deterministic_key = "1.3.0"
 wedpr_ffi_common = "1.1.0"
 wedpr_ffi_macros = "1.1.0"
+wedpr_s_hierarchical_deterministic_key = "1.3.0"
 wedpr_s_protos = "1.3.0"
 
 [build-dependencies]
 cbindgen = "0.9.0"
 
 [target.'cfg(target_os = "android")'.dependencies]
-jni = { version = "0.13.1", default-features = false }
+jni = { version = "0.13.1", default-features = false }

ffi/ffi_java/ffi_java_scd/Cargo.toml

@@ -12,12 +12,13 @@ crate-type = [ "cdylib" ]
 [dependencies]
 jni = "0.13.0"
 protobuf = "2.22.1"
-wedpr_s_selective_certificate_disclosure = "1.3.0"
 wedpr_ffi_common = "1.0.0"
 wedpr_ffi_macros = "1.0.0"
-wedpr_s_protos = "1.3.0"
 wedpr_l_protos = "1.0.0"
 
+wedpr_s_protos = "1.3.0"
+wedpr_s_selective_certificate_disclosure = "1.3.0"
+
 [build-dependencies]
 cbindgen = "0.9.0"
 

ffi/ffi_java/ffi_java_vcl/Cargo.toml

@@ -13,11 +13,12 @@ crate-type = [ "cdylib", "staticlib" ]
 [dependencies]
 jni = "0.13.0"
 protobuf = "2.22.1"
-wedpr_s_verifiable_confidential_ledger = { path = "../../../solution/verifiable_confidential_ledger"}
 wedpr_ffi_common = "1.1.0"
 wedpr_ffi_macros = "1.1.0"
-wedpr_s_protos = { path = "../../../protos"}
-wedpr_l_protos =  "1.1.0"
+wedpr_l_protos = "1.1.0"
+
+wedpr_s_protos = { path = "../../../protos" }
+wedpr_s_verifiable_confidential_ledger = { path = "../../../solution/verifiable_confidential_ledger" }
 
 [build-dependencies]
 cbindgen = "0.9.0"

protos/Cargo.toml

@@ -11,4 +11,3 @@ description = "Library of WeDPR protobuf definitions and their generated code."
 [dependencies]
 protobuf = "2.22.1"
 protoc-rust = "2.22.1"
-

protos/solution/acv/acv.proto

@@ -6,115 +6,133 @@ package com.webank.wedpr.acv.proto;
 option java_package = "com.webank.wedpr.acv.proto";
 option java_multiple_files = true;
 
-// Counter Secret value
-message CounterSecret {
-  bytes poll_secret_share = 1;
+// Candidate list.
+message CandidateList {
+  repeated string candidate = 1;
 }
 
-message CounterSystemParametersShareRequest {
-  string counter_id = 1;
-  bytes poll_point_share = 2;
+// System parameters.
+message SystemParametersStorage {
+  bytes poll_point = 1;
+  CandidateList candidates = 2;
 }
 
-message CounterSystemParametersStorage {
-  repeated CounterSystemParametersShareRequest counter_parameters_request = 1;
+// Counter's secret value.
+message CounterSecret {
+  bytes poll_secret_share = 1;
 }
 
-// Voter Secret value
+// Voter's secret value.
 message VoterSecret {
   bytes voter_secret = 1;
 }
 
+// Request of voter's registration.
 message RegistrationRequest {
   RegistrationBlindingPoint weight_point = 1;
 }
 
+// delete?
 message RegistrationBlindingPoint {
   bytes blinding_poll_point = 1;
   bytes blinding_basepoint_g2 = 2;
 }
 
+// Response of coordinator for voter's registration.
 message RegistrationResponse {
   uint32 voter_weight = 1;
   Ballot ballot = 2;
   bytes signature = 3;
 }
 
+// Ciphertext ballot.
 message Ballot {
   bytes ciphertext1 = 1;
   bytes ciphertext2 = 2;
 }
 
+
+// Request of generating system parameter from a counter.
+message CounterSystemParametersShareRequest {
+  string counter_id = 1;
+  bytes poll_point_share = 2;
+}
+
+// Requests of generating system parameter from all counters.
+message CounterSystemParametersStorage {
+  repeated CounterSystemParametersShareRequest counter_parameters_request = 1;
+}
+
+// Choice of ballot casting for each candidate.
 message VoteChoice {
   string candidate = 1;
   uint32 value = 2;
 }
 
+// Choices for all candidate.
 message VoteChoices {
   repeated VoteChoice choice = 1;
 }
 
+// Ciphertext ballot for each candidate.
 message CandidateBallot {
   string candidate = 1;
   Ballot ballot = 2;
 }
 
-message VoteStorage {
-  bytes signature = 1;
-  Ballot blank_ballot = 2;
-  Ballot rest_ballot = 3;
-  repeated CandidateBallot voted_ballot = 4;
-}
-
-// system parameters
-message CandidateList {
-  repeated string candidate = 1;
-}
-
-message SystemParametersStorage {
-  bytes poll_point = 1;
-  CandidateList candidates = 2;
-}
-
-
-// proofs
+// ZKP data to verify the format of ciphertext ballot.
 message BallotProof {
   bytes format_proof = 1;
 }
 
+// Pair of candidate index and the ballot proof he received.
 message StringToCandidateBallotProofPair {
   string key = 1;
   BallotProof value = 2;
 }
 
 // Do not use Map, cause unordered in blockchain
+// Request of polling for all candidates.
 message VoteRequest {
   VoteStorage vote = 1;
   repeated StringToCandidateBallotProofPair ballot_proof = 2;
   bytes range_proof = 3;
   bytes sum_balance_proof = 4;
 }
 
-message DecryptedResultPartStorage {
-  CountingPart blank_part = 1;
-  repeated StringToCountingPartPair candidate_part = 2;
+// Polling for each candidates.
+message VoteStorage {
+  bytes signature = 1;
+  Ballot blank_ballot = 2;
+  Ballot rest_ballot = 3;
+  repeated CandidateBallot voted_ballot = 4;
+}
+
+// Decrypted ballot and ZKP data to verify the process of counting of each counter.
+message CountingPart {
+  string counter_id = 1;
+  bytes blinding_c2 = 2;
+  bytes equality_proof = 3;
 }
 
+// Pair of candidate index and the decrypted ballot he received.
 message StringToCountingPartPair {
   string key = 1;
   CountingPart value = 2;
 }
 
-message CountingPart {
-  string counter_id = 1;
-  bytes blinding_c2 = 2;
-  bytes equality_proof = 3;
+// Decrypted ballot and ZKP data to verify the process of counting of all counters.
+message DecryptedResultPartStorage {
+  CountingPart blank_part = 1;
+  repeated StringToCountingPartPair candidate_part = 2;
 }
 
+// Final result of all candidates.
 message VoteResultStorage {
   repeated StringToInt64Pair result = 1;
 }
 
+// Final result of each candidate.
 message StringToInt64Pair {
   string key = 1;
   int64 value = 2;

protos/src/generated/acv.rs

@@ -1,3 +1,5 @@
+// Copyright 2020 WeDPR Lab Project Authors. Licensed under Apache-2.0.
+
 // This file is generated by rust-protobuf 2.25.1. Do not edit
 // @generated
 

protos/src/generated/scd.rs

@@ -1,3 +1,5 @@
+// Copyright 2020 WeDPR Lab Project Authors. Licensed under Apache-2.0.
+
 // This file is generated by rust-protobuf 2.25.1. Do not edit
 // @generated
 

protos/src/generated/vcl.rs

@@ -1,3 +1,5 @@
+// Copyright 2020 WeDPR Lab Project Authors. Licensed under Apache-2.0.
+
 // This file is generated by rust-protobuf 2.25.1. Do not edit
 // @generated
 

solution/anonymous_ciphertext_voting/Cargo.toml

@@ -9,14 +9,14 @@ description = "Library of WeDPR protobuf definitions and their generated code."
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-wedpr_l_macros = "1.0.0"
-wedpr_l_utils = "1.1.0"
-wedpr_l_crypto_zkp_discrete_logarithm_proof = { git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto.git", branch = "release-1.2.0" }
-wedpr_s_protos = { path = "../../protos"}
-wedpr_l_protos = { git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto.git", branch = "release-1.2.0" }
 curve25519-dalek = { version = "1", features = [ "serde" ] }
-wedpr_l_crypto_zkp_utils = { git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto.git", branch = "release-1.2.0" }
-wedpr_l_crypto_signature_secp256k1 = { git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto.git", branch = "release-1.2.0" }
 lazy_static = "1.4.0"
 wedpr_l_crypto_hash_keccak256 = { git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto.git", branch = "release-1.2.0" }
+wedpr_l_crypto_signature_secp256k1 = { git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto.git", branch = "release-1.2.0" }
+wedpr_l_crypto_zkp_discrete_logarithm_proof = { git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto.git", branch = "release-1.2.0" }
 wedpr_l_crypto_zkp_range_proof = { git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto.git", branch = "release-1.2.0" }
+wedpr_l_crypto_zkp_utils = { git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto.git", branch = "release-1.2.0" }
+wedpr_l_macros = "1.0.0"
+wedpr_l_protos = { git = "https://github.com/WeBankBlockchain/WeDPR-Lab-Crypto.git", branch = "release-1.2.0" }
+wedpr_l_utils = "1.1.0"
+wedpr_s_protos = { path = "../../protos" }