From 3425a900564c7a90317c2644b6cafcd49f3c8a1a Mon Sep 17 00:00:00 2001 From: Sergey Vasilyev Date: Wed, 19 Feb 2025 22:07:21 +0100 Subject: [PATCH] fflonk -> w3f-pcs --- Cargo.toml | 2 +- common/Cargo.toml | 8 ++++---- common/src/lib.rs | 2 +- common/src/piop.rs | 2 +- common/src/prover.rs | 4 ++-- common/src/setup.rs | 2 +- common/src/transcript.rs | 2 +- common/src/verifier.rs | 2 +- ring/Cargo.toml | 8 ++++---- ring/src/lib.rs | 8 ++++---- ring/src/piop/mod.rs | 8 ++++---- ring/src/piop/prover.rs | 2 +- ring/src/piop/verifier.rs | 2 +- ring/src/ring.rs | 10 +++++----- ring/src/ring_prover.rs | 2 +- ring/src/ring_verifier.rs | 2 +- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9fd3cfa..bf36827 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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 } diff --git a/common/Cargo.toml b/common/Cargo.toml index 84fa673..a08ccb0 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -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" @@ -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"] diff --git a/common/src/lib.rs b/common/src/lib.rs index 00ffa38..fc9fa11 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -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; diff --git a/common/src/piop.rs b/common/src/piop.rs index 1ca41c2..7362bd4 100644 --- a/common/src/piop.rs +++ b/common/src/piop.rs @@ -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}; diff --git a/common/src/prover.rs b/common/src/prover.rs index fab2c05..7964ec0 100644 --- a/common/src/prover.rs +++ b/common/src/prover.rs @@ -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; diff --git a/common/src/setup.rs b/common/src/setup.rs index 88d3243..042babc 100644 --- a/common/src/setup.rs +++ b/common/src/setup.rs @@ -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}; diff --git a/common/src/transcript.rs b/common/src/transcript.rs index b8134bf..57e83b6 100644 --- a/common/src/transcript.rs +++ b/common/src/transcript.rs @@ -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}; diff --git a/common/src/verifier.rs b/common/src/verifier.rs index 704d744..0a1514b 100644 --- a/common/src/verifier.rs +++ b/common/src/verifier.rs @@ -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; diff --git a/ring/Cargo.toml b/ring/Cargo.toml index 55918a3..fecfed9 100644 --- a/ring/Cargo.toml +++ b/ring/Cargo.toml @@ -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 } @@ -31,7 +31,7 @@ std = [ "ark-ec/std", "ark-poly/std", "ark-serialize/std", - "fflonk/std", + "w3f-pcs/std", "common/std" ] parallel = [ @@ -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" ] diff --git a/ring/src/lib.rs b/ring/src/lib.rs index e410daa..1bd4a68 100644 --- a/ring/src/lib.rs +++ b/ring/src/lib.rs @@ -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; @@ -24,7 +24,7 @@ pub mod ring_verifier; pub type RingProof = Proof>::C>, RingEvaluations>; /// 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() -> Affine { @@ -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; @@ -201,6 +201,6 @@ mod tests { #[test] fn test_ring_proof_id() { - _test_ring_proof::(2usize.pow(10)); + _test_ring_proof::(2usize.pow(10)); } } diff --git a/ring/src/piop/mod.rs b/ring/src/piop/mod.rs index 2cb5b98..fd7867f 100644 --- a/ring/src/piop/mod.rs +++ b/ring/src/piop/mod.rs @@ -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}; diff --git a/ring/src/piop/prover.rs b/ring/src/piop/prover.rs index e307067..ba0a837 100644 --- a/ring/src/piop/prover.rs +++ b/ring/src/piop/prover.rs @@ -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}; diff --git a/ring/src/piop/verifier.rs b/ring/src/piop/verifier.rs index 9e6a81b..6f2f9c5 100644 --- a/ring/src/piop/verifier.rs +++ b/ring/src/piop/verifier.rs @@ -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; diff --git a/ring/src/ring.rs b/ring/src/ring.rs index 8ee6c03..f222f1c 100644 --- a/ring/src/ring.rs +++ b/ring/src/ring.rs @@ -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; @@ -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; diff --git a/ring/src/ring_prover.rs b/ring/src/ring_prover.rs index bacfcba..1fcac22 100644 --- a/ring/src/ring_prover.rs +++ b/ring/src/ring_prover.rs @@ -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; diff --git a/ring/src/ring_verifier.rs b/ring/src/ring_verifier.rs index ba474c5..ec352ed 100644 --- a/ring/src/ring_verifier.rs +++ b/ring/src/ring_verifier.rs @@ -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;