Skip to content

Commit

Permalink
fflonk -> w3f-pcs
Browse files Browse the repository at this point in the history
  • Loading branch information
swasilyev committed Feb 19, 2025
1 parent 1eedf08 commit 3425a90
Show file tree
Hide file tree
Showing 16 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ ark-ff = { version = "0.5", default-features = false }
ark-ec = { version = "0.5", default-features = false }
ark-poly = { version = "0.5", default-features = false }
ark-serialize = { version = "0.5", default-features = false, features = ["derive"] }
fflonk = { git = "https://github.com/w3f/fflonk", default-features = false }
w3f-pcs = { version = "0.0.1", default-features = false }
rayon = { version = "1", default-features = false }
8 changes: 4 additions & 4 deletions common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ark-ff.workspace = true
ark-ec.workspace = true
ark-poly.workspace = true
ark-serialize.workspace = true
fflonk.workspace = true
w3f-pcs.workspace = true
rayon = { workspace = true, optional = true }
getrandom_or_panic = { version = "0.0.3", default-features = false }
rand_core = "0.6"
Expand All @@ -29,18 +29,18 @@ std = [
"ark-ec/std",
"ark-poly/std",
"ark-serialize/std",
"fflonk/std",
"w3f-pcs/std",
"getrandom_or_panic/std",
"rand_core/std"
]
parallel = [
"std",
"rayon",
"fflonk/parallel",
"w3f-pcs/parallel",
"ark-std/parallel",
"ark-ff/parallel",
"ark-ec/parallel",
"ark-poly/parallel"
]
print-trace = ["ark-std/print-trace"]
asm = ["fflonk/asm"]
asm = ["w3f-pcs/asm"]
2 changes: 1 addition & 1 deletion common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use ark_poly::univariate::DensePolynomial;
use ark_poly::{EvaluationDomain, Evaluations, GeneralEvaluationDomain, Polynomial};
use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
use ark_std::{vec, vec::Vec};
use fflonk::pcs::{Commitment, PCS};
use w3f_pcs::pcs::{Commitment, PCS};

pub mod domain;
pub mod gadgets;
Expand Down
2 changes: 1 addition & 1 deletion common/src/piop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use ark_poly::univariate::DensePolynomial;
use ark_poly::Evaluations;
use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
use ark_std::vec::Vec;
use fflonk::pcs::Commitment;
use w3f_pcs::pcs::Commitment;

use crate::domain::{Domain, EvaluatedDomain};
use crate::{ColumnsCommited, ColumnsEvaluated};
Expand Down
4 changes: 2 additions & 2 deletions common/src/prover.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use ark_ff::PrimeField;
use ark_poly::{Evaluations, Polynomial};
use ark_serialize::CanonicalSerialize;
use ark_std::vec;
use fflonk::aggregation::single::aggregate_polys;
use fflonk::pcs::PCS;
use w3f_pcs::aggregation::single::aggregate_polys;
use w3f_pcs::pcs::PCS;

use crate::piop::ProverPiop;
use crate::transcript::PlonkTranscript;
Expand Down
2 changes: 1 addition & 1 deletion common/src/setup.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use ark_ff::PrimeField;
use ark_poly::{EvaluationDomain, GeneralEvaluationDomain};
use ark_std::rand::Rng;
use fflonk::pcs::{PCS, PcsParams};
use w3f_pcs::pcs::{PCS, PcsParams};

use crate::{Column, FieldColumn};

Expand Down
2 changes: 1 addition & 1 deletion common/src/transcript.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use ark_ff::PrimeField;
use ark_poly::GeneralEvaluationDomain;
use ark_serialize::CanonicalSerialize;
use ark_std::vec::Vec;
use fflonk::pcs::{PcsParams, PCS};
use w3f_pcs::pcs::{PcsParams, PCS};
use rand_core::RngCore;

use crate::{ColumnsCommited, ColumnsEvaluated};
Expand Down
2 changes: 1 addition & 1 deletion common/src/verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use ark_ff::{Field, PrimeField};
use ark_serialize::CanonicalSerialize;
use ark_std::rand::Rng;
use ark_std::{vec, vec::Vec};
use fflonk::pcs::{Commitment, PcsParams, PCS};
use w3f_pcs::pcs::{Commitment, PcsParams, PCS};
use rand_core::RngCore;

use crate::piop::VerifierPiop;
Expand Down
8 changes: 4 additions & 4 deletions ring/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ark-ff.workspace = true
ark-ec.workspace = true
ark-poly.workspace = true
ark-serialize.workspace = true
fflonk.workspace = true
w3f-pcs.workspace = true
rayon = { workspace = true, optional = true }
common = { path = "../common", default-features = false }
blake2 = { version = "0.10", default-features = false }
Expand All @@ -31,7 +31,7 @@ std = [
"ark-ec/std",
"ark-poly/std",
"ark-serialize/std",
"fflonk/std",
"w3f-pcs/std",
"common/std"
]
parallel = [
Expand All @@ -42,10 +42,10 @@ parallel = [
"ark-ec/parallel",
"ark-poly/parallel",
"common/parallel",
"fflonk/parallel"
"w3f-pcs/parallel"
]
print-trace = [
"ark-std/print-trace",
"common/print-trace"
]
asm = [ "fflonk/asm" ]
asm = [ "w3f-pcs/asm" ]
8 changes: 4 additions & 4 deletions ring/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use ark_ec::{
use ark_ff::{One, PrimeField, Zero};
use ark_serialize::CanonicalSerialize;
use ark_std::rand::RngCore;
use fflonk::pcs::PCS;
use w3f_pcs::pcs::PCS;

pub use common::domain::Domain;
use common::Proof;
Expand All @@ -24,7 +24,7 @@ pub mod ring_verifier;
pub type RingProof<F, CS> = Proof<F, CS, RingCommitments<F, <CS as PCS<F>>::C>, RingEvaluations<F>>;

/// Polynomial Commitment Schemes.
pub use fflonk::pcs;
pub use w3f_pcs::pcs;

// Calling the method for a prime-order curve results in an infinite loop.
pub fn find_complement_point<Curve: SWCurveConfig>() -> Affine<Curve> {
Expand Down Expand Up @@ -91,7 +91,7 @@ mod tests {
use ark_std::ops::Mul;
use ark_std::rand::Rng;
use ark_std::{end_timer, start_timer, test_rng, UniformRand};
use fflonk::pcs::kzg::KZG;
use w3f_pcs::pcs::kzg::KZG;

use common::test_helpers::random_vec;

Expand Down Expand Up @@ -201,6 +201,6 @@ mod tests {

#[test]
fn test_ring_proof_id() {
_test_ring_proof::<fflonk::pcs::IdentityCommitment>(2usize.pow(10));
_test_ring_proof::<w3f_pcs::pcs::IdentityCommitment>(2usize.pow(10));
}
}
8 changes: 4 additions & 4 deletions ring/src/piop/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ use ark_ff::PrimeField;
use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
use ark_std::marker::PhantomData;
use ark_std::{vec, vec::Vec};
use fflonk::pcs::kzg::commitment::KzgCommitment;
use fflonk::pcs::kzg::params::RawKzgVerifierKey;
use fflonk::pcs::kzg::KZG;
use fflonk::pcs::{Commitment, PcsParams, PCS};
use w3f_pcs::pcs::kzg::commitment::KzgCommitment;
use w3f_pcs::pcs::kzg::params::RawKzgVerifierKey;
use w3f_pcs::pcs::kzg::KZG;
use w3f_pcs::pcs::{Commitment, PcsParams, PCS};

use common::gadgets::sw_cond_add::AffineColumn;
use common::{Column, ColumnsCommited, ColumnsEvaluated, FieldColumn};
Expand Down
2 changes: 1 addition & 1 deletion ring/src/piop/prover.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use ark_poly::univariate::DensePolynomial;
use ark_poly::Evaluations;
use ark_std::marker::PhantomData;
use ark_std::{vec, vec::Vec};
use fflonk::pcs::Commitment;
use w3f_pcs::pcs::Commitment;

use common::domain::Domain;
use common::gadgets::booleanity::{BitColumn, Booleanity};
Expand Down
2 changes: 1 addition & 1 deletion ring/src/piop/verifier.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use ark_ff::PrimeField;
use ark_std::{vec, vec::Vec};
use fflonk::pcs::Commitment;
use w3f_pcs::pcs::Commitment;

use common::domain::EvaluatedDomain;
use common::gadgets::booleanity::BooleanityValues;
Expand Down
10 changes: 5 additions & 5 deletions ring/src/ring.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use ark_std::fmt;
use ark_std::iter;
use ark_std::ops::Range;
use ark_std::vec::Vec;
use fflonk::pcs::kzg::urs::URS;
use fflonk::pcs::PcsParams;
use w3f_pcs::pcs::kzg::urs::URS;
use w3f_pcs::pcs::PcsParams;

use common::domain::ZK_ROWS;

Expand Down Expand Up @@ -257,9 +257,9 @@ mod tests {
use ark_bls12_381::{Bls12_381, Fr, G1Affine};
use ark_ed_on_bls12_381_bandersnatch::{BandersnatchConfig, SWAffine};
use ark_std::{test_rng, UniformRand};
use fflonk::pcs::kzg::urs::URS;
use fflonk::pcs::kzg::KZG;
use fflonk::pcs::PCS;
use w3f_pcs::pcs::kzg::urs::URS;
use w3f_pcs::pcs::kzg::KZG;
use w3f_pcs::pcs::PCS;

use common::domain::Domain;
use common::test_helpers::random_vec;
Expand Down
2 changes: 1 addition & 1 deletion ring/src/ring_prover.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use ark_ec::short_weierstrass::{Affine, SWCurveConfig};
use ark_ff::PrimeField;
use fflonk::pcs::PCS;
use w3f_pcs::pcs::PCS;

use common::prover::PlonkProver;
use common::transcript::PlonkTranscript;
Expand Down
2 changes: 1 addition & 1 deletion ring/src/ring_verifier.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use ark_ec::short_weierstrass::{Affine, SWCurveConfig};
use ark_ec::CurveGroup;
use ark_ff::PrimeField;
use fflonk::pcs::{RawVerifierKey, PCS};
use w3f_pcs::pcs::{RawVerifierKey, PCS};

use common::domain::EvaluatedDomain;
use common::piop::VerifierPiop;
Expand Down

0 comments on commit 3425a90

Please sign in to comment.