Skip to content

Bundle M into shuffle proof #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dapplion wants to merge 1 commit into from
Closed

Bundle M into shuffle proof #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ let shuffle_proof = CurdleproofsProof::new(

// Verify the shuffle proof
assert!(shuffle_proof
.verify(&crs, &vec_R, &vec_S, &vec_T, &vec_U, &M, &mut rng)
.verify(&crs, &vec_R, &vec_S, &vec_T, &vec_U, &mut rng)
.is_ok());
# }
```
Expand Down
2 changes: 1 addition & 1 deletion benches/perf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ fn benchmark_shuffle(c: &mut Criterion) {
c.bench_function("verifier", |b| {
b.iter(|| {
assert!(shuffle_proof
.verify(&crs, &vec_R, &vec_S, &vec_T, &vec_U, &M, &mut rng)
.verify(&crs, &vec_R, &vec_S, &vec_T, &vec_U, &mut rng)
.is_ok());
})
});
Expand Down
28 changes: 10 additions & 18 deletions src/curdleproofs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ pub fn generate_crs(ell: usize) -> CurdleproofsCrs {
/// A Curdleproofs proof object
#[derive(Clone, Debug, CanonicalSerialize, CanonicalDeserialize)]
pub struct CurdleproofsProof {
M: G1Projective,
A: G1Projective,
cm_T: GroupCommitment,
cm_U: GroupCommitment,
Expand Down Expand Up @@ -214,6 +215,7 @@ impl CurdleproofsProof {
);

CurdleproofsProof {
M,
A,
cm_T,
cm_U,
Expand All @@ -234,7 +236,6 @@ impl CurdleproofsProof {
/// * `vec_S` - Input vector **S**
/// * `vec_T` - Output vector **T**
/// * `vec_U` - Output vector **U**
/// * `M` - Commitment to `permutation`
#[allow(clippy::too_many_arguments)]
pub fn verify<T: RngCore>(
&self,
Expand All @@ -244,7 +245,6 @@ impl CurdleproofsProof {
vec_S: &Vec<G1Affine>,
vec_T: &Vec<G1Affine>,
vec_U: &Vec<G1Affine>,
M: &G1Projective,

rng: &mut T,
) -> Result<(), ProofError> {
Expand All @@ -263,7 +263,7 @@ impl CurdleproofsProof {

// Step 1
transcript.append_list(b"curdleproofs_step1", &[vec_R, vec_S, vec_T, vec_U]);
transcript.append(b"curdleproofs_step1", M);
transcript.append(b"curdleproofs_step1", &self.M);
let vec_a = transcript.get_and_append_challenges(b"curdleproofs_vec_a", ell);

// Step 2
Expand All @@ -275,7 +275,7 @@ impl CurdleproofsProof {
&crs.G_sum,
&crs.H_sum,
&self.A,
M,
&self.M,
&vec_a,
N_BLINDERS,
&mut transcript,
Expand Down Expand Up @@ -389,7 +389,7 @@ mod tests {

// Test a correct shuffle proof
assert!(shuffle_proof
.verify(&crs, &vec_R, &vec_S, &vec_T, &vec_U, &M, &mut rng)
.verify(&crs, &vec_R, &vec_S, &vec_T, &vec_U, &mut rng)
.is_ok());
}

Expand Down Expand Up @@ -442,7 +442,7 @@ mod tests {

// Let's start mutating the instances of the verifier to see that the proof fails
assert!(shuffle_proof
.verify(&crs, &vec_S, &vec_R, &vec_T, &vec_U, &M, &mut rng)
.verify(&crs, &vec_S, &vec_R, &vec_T, &vec_U, &mut rng)
.is_err());

// apply a different permutation than the one proved
Expand All @@ -453,22 +453,15 @@ mod tests {
&vec_S,
&get_permutation(&vec_T, &another_permutation),
&get_permutation(&vec_U, &another_permutation),
&M,
&mut rng
)
.is_err());

// provide wrong perm commitment
assert!(shuffle_proof
.verify(
&crs,
&vec_R,
&vec_S,
&vec_T,
&vec_U,
&M.mul(k.into_repr()),
&mut rng
)
let mut shuffle_proof_wrong = shuffle_proof.clone();
shuffle_proof_wrong.M = M.mul(k.into_repr());
assert!(shuffle_proof_wrong
.verify(&crs, &vec_R, &vec_S, &vec_T, &vec_U, &mut rng)
.is_err());

// instnace outputs use a different randomizer
Expand All @@ -488,7 +481,6 @@ mod tests {
&vec_S,
&another_vec_T,
&another_vec_U,
&M,
&mut rng
)
.is_err());
Expand Down
27 changes: 6 additions & 21 deletions src/whisk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use crate::{

pub const FIELD_ELEMENT_SIZE: usize = 32;
pub const G1POINT_SIZE: usize = 48;
pub const SHUFFLE_PROOF_SIZE: usize = 4528;
pub const SHUFFLE_PROOF_SIZE: usize = 4576;
// 48+48+32
pub const TRACKER_PROOF_SIZE: usize = 128;

Expand Down Expand Up @@ -52,23 +52,20 @@ pub struct TrackerProof {
/// * `crs` - Curdleproofs CRS (Common Reference String), a trusted setup
/// * `pre_trackers` - Trackers before shuffling
/// * `post_trackers` - Trackers after shuffling
/// * `m` - Commitment to secret permutation
/// * `shuffle_proof` - Shuffle proof struct
pub fn is_valid_whisk_shuffle_proof<T: RngCore>(
rng: &mut T,
crs: &CurdleproofsCrs,
pre_trackers: &[WhiskTracker],
post_trackers: &[WhiskTracker],
m: &G1Affine,
shuffle_proof: &ShuffleProofBytes,
) -> Result<bool, SerializationError> {
let (vec_r, vec_s) = unzip_trackers(pre_trackers);
let (vec_t, vec_u) = unzip_trackers(post_trackers);
let m_projective = G1Projective::from(*m);
let shuffle_proof_instance = deserialize_shuffle_proof(shuffle_proof)?;

Ok(shuffle_proof_instance
.verify(crs, &vec_r, &vec_s, &vec_t, &vec_u, &m_projective, rng)
.verify(crs, &vec_r, &vec_s, &vec_t, &vec_u, rng)
.is_ok())
}

Expand All @@ -83,13 +80,12 @@ pub fn is_valid_whisk_shuffle_proof<T: RngCore>(
///
/// A tuple containing
/// * `0` `post_trackers` - Resulting shuffled trackers
/// * `1` `m` - Commitment to secret permutation
/// * `2` `shuffle_proof` - Shuffle proof struct
/// * `1` `shuffle_proof` - Shuffle proof struct
pub fn generate_whisk_shuffle_proof<T: RngCore>(
rng: &mut T,
crs: &CurdleproofsCrs,
pre_trackers: &[WhiskTracker],
) -> Result<(Vec<WhiskTracker>, G1Affine, ShuffleProofBytes), SerializationError> {
) -> Result<(Vec<WhiskTracker>, ShuffleProofBytes), SerializationError> {
// Get witnesses: the permutation, the randomizer, and a bunch of blinders
let mut permutation: Vec<u32> = (0..ELL as u32).collect();

Expand All @@ -116,12 +112,8 @@ pub fn generate_whisk_shuffle_proof<T: RngCore>(
rng,
);

let mut shuffle_proof: Vec<u8> = vec![];
shuffle_proof_instance.serialize(&mut shuffle_proof)?;

Ok((
zip_trackers(&vec_t, &vec_u),
G1Affine::from(m),
serialize_shuffle_proof(&shuffle_proof_instance)?,
))
}
Expand Down Expand Up @@ -363,19 +355,15 @@ mod tests {
let mut rng = StdRng::seed_from_u64(0u64);
let crs: CurdleproofsCrs = generate_crs(ELL);

let k = Fr::rand(&mut rng);
let tracker = generate_tracker(&mut rng, &k);
let k_commitment = get_k_commitment(&k);
let shuffled_trackers = generate_shuffle_trackers(&mut rng);

let (whisk_post_shuffle_trackers, whisk_shuffle_proof_m_commitment, whisk_shuffle_proof) =
let (whisk_post_shuffle_trackers, whisk_shuffle_proof) =
generate_whisk_shuffle_proof(&mut rng, &crs, &shuffled_trackers).unwrap();
assert!(is_valid_whisk_shuffle_proof(
&mut rng,
&crs,
&shuffled_trackers,
&whisk_post_shuffle_trackers,
&whisk_shuffle_proof_m_commitment,
&whisk_shuffle_proof
)
.unwrap());
Expand All @@ -396,7 +384,6 @@ mod tests {
pub whisk_opening_proof: TrackerProofBytes,
pub whisk_post_shuffle_trackers: Vec<WhiskTracker>,
pub whisk_shuffle_proof: ShuffleProofBytes,
pub whisk_shuffle_proof_m_commitment: G1Affine,
pub whisk_registration_proof: TrackerProofBytes,
pub whisk_tracker: WhiskTracker,
pub whisk_k_commitment: G1Affine,
Expand Down Expand Up @@ -429,7 +416,6 @@ mod tests {
&crs,
&state.shuffled_trackers,
&block.whisk_post_shuffle_trackers,
&block.whisk_shuffle_proof_m_commitment,
&block.whisk_shuffle_proof
)
.unwrap(),
Expand Down Expand Up @@ -464,7 +450,7 @@ mod tests {
) -> Block {
let mut rng = StdRng::seed_from_u64(0u64);

let (whisk_post_shuffle_trackers, whisk_shuffle_proof_m_commitment, whisk_shuffle_proof) =
let (whisk_post_shuffle_trackers, whisk_shuffle_proof) =
generate_whisk_shuffle_proof(&mut rng, &crs, &state.shuffled_trackers).unwrap();

let is_first_proposal = state.proposer_tracker.r_G == G1Affine::prime_subgroup_generator();
Expand Down Expand Up @@ -512,7 +498,6 @@ mod tests {
whisk_opening_proof,
whisk_post_shuffle_trackers,
whisk_shuffle_proof,
whisk_shuffle_proof_m_commitment,
whisk_registration_proof,
whisk_tracker,
whisk_k_commitment,
Expand Down