Skip to content
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

[zk-token-sdk] Refactor zk-token-elgamal #31762

Closed
wants to merge 11 commits into from
Closed

[zk-token-sdk] Refactor zk-token-elgamal #31762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
49305cc
refactor `PodU16`, `PodU64`, `PodProofType`
samkim-crypto May 23, 2023
e2461c1
refactor elgamal and pedersen pod types into separate submodules
samkim-crypto May 23, 2023
ad112f4
rename `zk_token_elgamal` module to `pod`
samkim-crypto May 23, 2023
2041c26
refactor pod `AeCiphertext` into a separate submodule
samkim-crypto May 23, 2023
2a43332
refactor range proof and sigma proof pod types into separate submodules
samkim-crypto May 23, 2023
f8f6348
refactor instruction pod types into a separate submodule
samkim-crypto May 23, 2023
cfde950
refactor pod ops
samkim-crypto May 23, 2023
5f63834
refactor `pod` as a submodule of `zk_token_elgamal`
samkim-crypto May 23, 2023
ea2fabe
clean up `convert`, `decryption`, and `pod` modules
samkim-crypto May 23, 2023
b6354d9
refactor range proof tests
samkim-crypto May 23, 2023
b540e50
add `pod/mod.rs`
samkim-crypto May 23, 2023
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
571 changes: 0 additions & 571 deletions zk-token-sdk/src/zk_token_elgamal/convert.rs
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions zk-token-sdk/src/zk_token_elgamal/decryption.rs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions zk-token-sdk/src/zk_token_elgamal/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
pub mod convert;
pub mod decryption;
pub mod ops;
pub mod pod;
72 changes: 33 additions & 39 deletions zk-token-sdk/src/zk_token_elgamal/ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::{
ristretto::{add_ristretto, multiply_ristretto, subtract_ristretto, PodRistrettoPoint},
scalar::PodScalar,
},
zk_token_elgamal::pod,
zk_token_elgamal::pod::{elgamal::*, pedersen::*},
};

const SHIFT_BITS: usize = 16;
Expand All @@ -15,45 +15,42 @@ const G: PodRistrettoPoint = PodRistrettoPoint([

/// Add two ElGamal ciphertexts
pub fn add(
left_ciphertext: &pod::ElGamalCiphertext,
right_ciphertext: &pod::ElGamalCiphertext,
) -> Option<pod::ElGamalCiphertext> {
let (left_commitment, left_handle): (pod::PedersenCommitment, pod::DecryptHandle) =
left_ciphertext: &ElGamalCiphertext,
right_ciphertext: &ElGamalCiphertext,
) -> Option<ElGamalCiphertext> {
let (left_commitment, left_handle): (PedersenCommitment, DecryptHandle) =
(*left_ciphertext).into();
let (right_commitment, right_handle): (pod::PedersenCommitment, pod::DecryptHandle) =
let (right_commitment, right_handle): (PedersenCommitment, DecryptHandle) =
(*right_ciphertext).into();

let result_commitment: pod::PedersenCommitment =
let result_commitment: PedersenCommitment =
add_ristretto(&left_commitment.into(), &right_commitment.into())?.into();
let result_handle: pod::DecryptHandle =
let result_handle: DecryptHandle =
add_ristretto(&left_handle.into(), &right_handle.into())?.into();

Some((result_commitment, result_handle).into())
}

/// Multiply an ElGamal ciphertext by a scalar
pub fn multiply(
scalar: &PodScalar,
ciphertext: &pod::ElGamalCiphertext,
) -> Option<pod::ElGamalCiphertext> {
let (commitment, handle): (pod::PedersenCommitment, pod::DecryptHandle) = (*ciphertext).into();
pub fn multiply(scalar: &PodScalar, ciphertext: &ElGamalCiphertext) -> Option<ElGamalCiphertext> {
let (commitment, handle): (PedersenCommitment, DecryptHandle) = (*ciphertext).into();

let commitment_point: PodRistrettoPoint = commitment.into();
let handle_point: PodRistrettoPoint = handle.into();

let result_commitment: pod::PedersenCommitment =
let result_commitment: PedersenCommitment =
multiply_ristretto(scalar, &commitment_point)?.into();
let result_handle: pod::DecryptHandle = multiply_ristretto(scalar, &handle_point)?.into();
let result_handle: DecryptHandle = multiply_ristretto(scalar, &handle_point)?.into();

Some((result_commitment, result_handle).into())
}

/// Compute `left_ciphertext + (right_ciphertext_lo + 2^16 * right_ciphertext_hi)`
pub fn add_with_lo_hi(
left_ciphertext: &pod::ElGamalCiphertext,
right_ciphertext_lo: &pod::ElGamalCiphertext,
right_ciphertext_hi: &pod::ElGamalCiphertext,
) -> Option<pod::ElGamalCiphertext> {
left_ciphertext: &ElGamalCiphertext,
right_ciphertext_lo: &ElGamalCiphertext,
right_ciphertext_hi: &ElGamalCiphertext,
) -> Option<ElGamalCiphertext> {
let shift_scalar = to_scalar(1_u64 << SHIFT_BITS);
let shifted_right_ciphertext_hi = multiply(&shift_scalar, right_ciphertext_hi)?;
let combined_right_ciphertext = add(right_ciphertext_lo, &shifted_right_ciphertext_hi)?;
Expand All @@ -62,59 +59,56 @@ pub fn add_with_lo_hi(

/// Subtract two ElGamal ciphertexts
pub fn subtract(
left_ciphertext: &pod::ElGamalCiphertext,
right_ciphertext: &pod::ElGamalCiphertext,
) -> Option<pod::ElGamalCiphertext> {
let (left_commitment, left_handle): (pod::PedersenCommitment, pod::DecryptHandle) =
left_ciphertext: &ElGamalCiphertext,
right_ciphertext: &ElGamalCiphertext,
) -> Option<ElGamalCiphertext> {
let (left_commitment, left_handle): (PedersenCommitment, DecryptHandle) =
(*left_ciphertext).into();
let (right_commitment, right_handle): (pod::PedersenCommitment, pod::DecryptHandle) =
let (right_commitment, right_handle): (PedersenCommitment, DecryptHandle) =
(*right_ciphertext).into();

let result_commitment: pod::PedersenCommitment =
let result_commitment: PedersenCommitment =
subtract_ristretto(&left_commitment.into(), &right_commitment.into())?.into();
let result_handle: pod::DecryptHandle =
let result_handle: DecryptHandle =
subtract_ristretto(&left_handle.into(), &right_handle.into())?.into();

Some((result_commitment, result_handle).into())
}

/// Compute `left_ciphertext - (right_ciphertext_lo + 2^16 * right_ciphertext_hi)`
pub fn subtract_with_lo_hi(
left_ciphertext: &pod::ElGamalCiphertext,
right_ciphertext_lo: &pod::ElGamalCiphertext,
right_ciphertext_hi: &pod::ElGamalCiphertext,
) -> Option<pod::ElGamalCiphertext> {
left_ciphertext: &ElGamalCiphertext,
right_ciphertext_lo: &ElGamalCiphertext,
right_ciphertext_hi: &ElGamalCiphertext,
) -> Option<ElGamalCiphertext> {
let shift_scalar = to_scalar(1_u64 << SHIFT_BITS);
let shifted_right_ciphertext_hi = multiply(&shift_scalar, right_ciphertext_hi)?;
let combined_right_ciphertext = add(right_ciphertext_lo, &shifted_right_ciphertext_hi)?;
subtract(left_ciphertext, &combined_right_ciphertext)
}

/// Add a constant amount to a ciphertext
pub fn add_to(ciphertext: &pod::ElGamalCiphertext, amount: u64) -> Option<pod::ElGamalCiphertext> {
pub fn add_to(ciphertext: &ElGamalCiphertext, amount: u64) -> Option<ElGamalCiphertext> {
let amount_scalar = to_scalar(amount);
let amount_point = multiply_ristretto(&amount_scalar, &G)?;

let (commitment, handle): (pod::PedersenCommitment, pod::DecryptHandle) = (*ciphertext).into();
let (commitment, handle): (PedersenCommitment, DecryptHandle) = (*ciphertext).into();
let commitment_point: PodRistrettoPoint = commitment.into();

let result_commitment: pod::PedersenCommitment =
let result_commitment: PedersenCommitment =
add_ristretto(&commitment_point, &amount_point)?.into();
Some((result_commitment, handle).into())
}

/// Subtract a constant amount to a ciphertext
pub fn subtract_from(
ciphertext: &pod::ElGamalCiphertext,
amount: u64,
) -> Option<pod::ElGamalCiphertext> {
pub fn subtract_from(ciphertext: &ElGamalCiphertext, amount: u64) -> Option<ElGamalCiphertext> {
let amount_scalar = to_scalar(amount);
let amount_point = multiply_ristretto(&amount_scalar, &G)?;

let (commitment, handle): (pod::PedersenCommitment, pod::DecryptHandle) = (*ciphertext).into();
let (commitment, handle): (PedersenCommitment, DecryptHandle) = (*ciphertext).into();
let commitment_point: PodRistrettoPoint = commitment.into();

let result_commitment: pod::PedersenCommitment =
let result_commitment: PedersenCommitment =
subtract_ristretto(&commitment_point, &amount_point)?.into();
Some((result_commitment, handle).into())
}
Expand Down
Loading