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

Jump to bottom

Misc fixes and refactoring in bulletproof module #794

Merged
merged 4 commits into from
May 24, 2024
Merged

Misc fixes and refactoring in bulletproof module #794

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db0a231
clean up
jonas-lj May 23, 2024
beaf072
derive
jonas-lj May 23, 2024
e52fbd6
error
jonas-lj May 23, 2024
ac1bf50
add todo
jonas-lj May 23, 2024
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
137 changes: 33 additions & 104 deletions fastcrypto/src/bulletproofs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,34 @@
//! BulletproofsRangeProof::prove_bit_length(value, blinding, upper_bound, b"MY_DOMAIN").unwrap();
//! assert!(range_proof.verify_bit_length(&commitment, upper_bound, b"MY_DOMAIN").is_ok());
//! ```
use std::ops;

use bulletproofs::{BulletproofGens, PedersenGens, RangeProof};
use curve25519_dalek_ng::{
ristretto::{CompressedRistretto, RistrettoPoint},
scalar::Scalar,
};
use derive_more::{Add, From, Sub};
use merlin::Transcript;
use once_cell::sync::OnceCell;
use serde::{de, Deserialize, Serialize};

use crate::{error::FastCryptoError, traits::ToFromBytes};
use crate::error::FastCryptoError::{GeneralOpaqueError, InvalidInput};
use crate::serde_helpers::ToFromByteArray;
use crate::{
error::FastCryptoError, serialize_deserialize_with_to_from_byte_array, traits::ToFromBytes,
};

use serde::de;
use serde::Deserialize;

//
// Pedersen commitments
//

const PEDERSEN_COMMITMENT_LENGTH: usize = 32;

#[derive(Debug, Clone)]
#[derive(Debug, Clone, From, Add, Sub, PartialEq, Eq)]
pub struct PedersenCommitment {
point: RistrettoPoint,
bytes: OnceCell<[u8; PEDERSEN_COMMITMENT_LENGTH]>,
}

impl PedersenCommitment {
Expand All @@ -51,99 +56,22 @@ impl PedersenCommitment {
let generators = PedersenGens::default();
let value = Scalar::from_bits(value);
let blinding = Scalar::from_bits(blinding_factor);
let point = generators.commit(value, blinding);

PedersenCommitment {
point,
bytes: OnceCell::new(),
}
}
}

impl ops::Add<PedersenCommitment> for PedersenCommitment {
type Output = PedersenCommitment;

fn add(self, rhs: PedersenCommitment) -> PedersenCommitment {
PedersenCommitment {
point: self.point + rhs.point,
bytes: OnceCell::new(),
}
generators.commit(value, blinding).into()
}
}

impl ops::Sub<PedersenCommitment> for PedersenCommitment {
type Output = PedersenCommitment;

fn sub(self, rhs: PedersenCommitment) -> PedersenCommitment {
PedersenCommitment {
point: self.point - rhs.point,
bytes: OnceCell::new(),
}
}
}

impl AsRef<[u8]> for PedersenCommitment {
fn as_ref(&self) -> &[u8] {
self.bytes.get_or_init(|| self.point.compress().to_bytes())
}
}

impl ToFromBytes for PedersenCommitment {
fn from_bytes(bytes: &[u8]) -> Result<Self, FastCryptoError> {
if bytes.len() != PEDERSEN_COMMITMENT_LENGTH {
return Err(FastCryptoError::InputLengthWrong(
PEDERSEN_COMMITMENT_LENGTH,
));
}
impl ToFromByteArray<PEDERSEN_COMMITMENT_LENGTH> for PedersenCommitment {
fn from_byte_array(bytes: &[u8; PEDERSEN_COMMITMENT_LENGTH]) -> Result<Self, FastCryptoError> {
let point = CompressedRistretto::from_slice(bytes);
let decompressed_point = point.decompress().ok_or(FastCryptoError::InvalidInput)?;

Ok(PedersenCommitment {
point: decompressed_point,
bytes: OnceCell::new(),
})
}
}

impl Serialize for PedersenCommitment {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
{
let bytes = self.as_ref();
serializer.serialize_bytes(bytes)
}
}

impl<'de> Deserialize<'de> for PedersenCommitment {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: de::Deserializer<'de>,
{
let bytes = Vec::deserialize(deserializer)?;
PedersenCommitment::from_bytes(&bytes[..]).map_err(|e| de::Error::custom(e.to_string()))
point.decompress().ok_or(InvalidInput).map(Self::from)
}
}

impl PartialEq for PedersenCommitment {
fn eq(&self, other: &Self) -> bool {
self.point == other.point
fn to_byte_array(&self) -> [u8; PEDERSEN_COMMITMENT_LENGTH] {
self.point.compress().to_bytes()
}
}

impl Eq for PedersenCommitment {}

impl PartialOrd for PedersenCommitment {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these (PartialOrd and Ord) really needed?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this for sui later? we dont have to add now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets add them later if they are needed.

fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
Some(self.cmp(other))
}
}

impl Ord for PedersenCommitment {
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
self.as_bytes().cmp(other.as_bytes())
}
}
serialize_deserialize_with_to_from_byte_array!(PedersenCommitment);

///
/// Bulletproof Range Proofs
Expand All @@ -155,6 +83,15 @@ pub struct BulletproofsRangeProof {
bytes: OnceCell<Vec<u8>>,
}

impl From<RangeProof> for BulletproofsRangeProof {
fn from(proof: RangeProof) -> Self {
Self {
proof,
bytes: OnceCell::new(),
}
}
}

impl BulletproofsRangeProof {
/// Prove that the value is an unsigned integer with bit length bits, this is equivalent
/// to proving that the value is an integer within the range [0, 2^bits)
Expand Down Expand Up @@ -184,17 +121,11 @@ impl BulletproofsRangeProof {
&blinding,
bits,
)
.map_err(|_| signature::Error::new())?;
.map_err(|_| GeneralOpaqueError)?;

Ok((
PedersenCommitment {
point: commitment.decompress().ok_or_else(signature::Error::new)?,
bytes: OnceCell::new(),
},
BulletproofsRangeProof {
proof,
bytes: OnceCell::new(),
},
commitment.decompress().ok_or(GeneralOpaqueError)?.into(),
proof.into(),
))
}

Expand Down Expand Up @@ -223,7 +154,7 @@ impl BulletproofsRangeProof {
&bp_gens,
&pc_gens,
&mut verifier_transcript,
&CompressedRistretto::from_slice(commitment.as_bytes()),
&CompressedRistretto::from_slice(&commitment.to_byte_array()),
bits,
)
.map_err(|_| FastCryptoError::GeneralError("Failed to verify proof".to_string()))
Expand All @@ -238,10 +169,8 @@ impl AsRef<[u8]> for BulletproofsRangeProof {

impl ToFromBytes for BulletproofsRangeProof {
fn from_bytes(bytes: &[u8]) -> Result<Self, FastCryptoError> {
let proof = RangeProof::from_bytes(bytes).map_err(|_| FastCryptoError::InvalidInput)?;
Ok(BulletproofsRangeProof {
proof,
bytes: OnceCell::new(),
})
RangeProof::from_bytes(bytes)
.map_err(|_| InvalidInput)
.map(Self::from)
}
}
3 changes: 2 additions & 1 deletion fastcrypto/src/tests/bulletproofs_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ fn test_pedersen_to_from_bytes() {
let blinding = [1; 32];

let commitment = PedersenCommitment::new(value, blinding);
let commitment_dup = PedersenCommitment::from_bytes(commitment.as_bytes()).unwrap();
let commitment_dup = PedersenCommitment::from_byte_array(&commitment.to_byte_array()).unwrap();

assert_eq!(commitment, commitment_dup);
}
Expand Down Expand Up @@ -134,6 +134,7 @@ fn test_handle_verify_invalid_upper_bound() {
.is_err());
}

use crate::serde_helpers::ToFromByteArray;
use proptest::arbitrary::Arbitrary;

proptest::proptest! {
Expand Down
Loading