refactor: move some types from common to backend (post-split)(plonk-0) (

privacy-scaling-explorations#287)

* refactor: move "Challenge*" from "halo2_common" to "halo2_backend"

* refactor: move the "transcript" from "halo2_common" to "halo2_backend"

* chore: correct the imports

halo2_backend/src/lib.rs

@@ -2,9 +2,9 @@ pub mod arithmetic;
 mod helpers;
 pub mod plonk;
 pub mod poly;
+pub mod transcript;
 
 // Internal re-exports
 pub use halo2_common::circuit;
 pub use halo2_common::multicore;
-pub use halo2_common::transcript;
 pub use halo2_common::SerdeFormat;

halo2_backend/src/plonk.rs

@@ -10,9 +10,9 @@ use crate::poly::{
     Coeff, EvaluationDomain, ExtendedLagrangeCoeff, LagrangeCoeff, PinnedEvaluationDomain,
     Polynomial,
 };
+use crate::transcript::{ChallengeScalar, EncodedChallenge, Transcript};
 use evaluation::Evaluator;
 use halo2_common::plonk::{Circuit, ConstraintSystem, PinnedConstraintSystem};
-use halo2_common::transcript::{EncodedChallenge, Transcript};
 use halo2_common::SerdeFormat;
 
 use std::io;
@@ -455,3 +455,23 @@ impl<C: CurveAffine> VerifyingKey<C> {
         &self.domain
     }
 }
+
+#[derive(Clone, Copy, Debug)]
+pub struct Theta;
+pub type ChallengeTheta<F> = ChallengeScalar<F, Theta>;
+
+#[derive(Clone, Copy, Debug)]
+pub struct Beta;
+pub type ChallengeBeta<F> = ChallengeScalar<F, Beta>;
+
+#[derive(Clone, Copy, Debug)]
+pub struct Gamma;
+pub type ChallengeGamma<F> = ChallengeScalar<F, Gamma>;
+
+#[derive(Clone, Copy, Debug)]
+pub struct Y;
+pub type ChallengeY<F> = ChallengeScalar<F, Y>;
+
+#[derive(Clone, Copy, Debug)]
+pub struct X;
+pub type ChallengeX<F> = ChallengeScalar<F, X>;

halo2_backend/src/plonk/lookup/prover.rs

@@ -3,6 +3,7 @@ use super::Argument;
 use crate::plonk::evaluation::evaluate;
 use crate::{
     arithmetic::{eval_polynomial, parallelize, CurveAffine},
+    plonk::{ChallengeBeta, ChallengeGamma, ChallengeTheta, ChallengeX},
     poly::{
         commitment::{Blind, Params},
         Coeff, EvaluationDomain, LagrangeCoeff, Polynomial, ProverQuery,
@@ -13,9 +14,7 @@ use group::{
     ff::{BatchInvert, Field},
     Curve,
 };
-use halo2_common::plonk::{
-    ChallengeBeta, ChallengeGamma, ChallengeTheta, ChallengeX, Error, Expression,
-};
+use halo2_common::plonk::{Error, Expression};
 use halo2_middleware::ff::WithSmallOrderMulGroup;
 use halo2_middleware::poly::Rotation;
 use rand_core::RngCore;

halo2_backend/src/plonk/lookup/verifier.rs

@@ -3,13 +3,11 @@ use std::iter;
 use super::Argument;
 use crate::{
     arithmetic::CurveAffine,
-    plonk::VerifyingKey,
+    plonk::{ChallengeBeta, ChallengeGamma, ChallengeTheta, ChallengeX, VerifyingKey},
     poly::{commitment::MSM, VerifierQuery},
     transcript::{EncodedChallenge, TranscriptRead},
 };
-use halo2_common::plonk::{
-    ChallengeBeta, ChallengeGamma, ChallengeTheta, ChallengeX, Error, Expression,
-};
+use halo2_common::plonk::{Error, Expression};
 use halo2_middleware::ff::Field;
 use halo2_middleware::poly::Rotation;
 

halo2_backend/src/plonk/permutation/prover.rs

@@ -9,14 +9,14 @@ use std::iter::{self, ExactSizeIterator};
 use super::Argument;
 use crate::{
     arithmetic::{eval_polynomial, parallelize, CurveAffine},
-    plonk::{self, permutation::ProvingKey},
+    plonk::{self, permutation::ProvingKey, ChallengeBeta, ChallengeGamma, ChallengeX},
     poly::{
         commitment::{Blind, Params},
         Coeff, ExtendedLagrangeCoeff, LagrangeCoeff, Polynomial, ProverQuery,
     },
     transcript::{EncodedChallenge, TranscriptWrite},
 };
-use halo2_common::plonk::{ChallengeBeta, ChallengeGamma, ChallengeX, Error};
+use halo2_common::plonk::Error;
 use halo2_middleware::circuit::Any;
 use halo2_middleware::poly::Rotation;
 

halo2_backend/src/plonk/permutation/verifier.rs

@@ -4,11 +4,11 @@ use std::iter;
 use super::{Argument, VerifyingKey};
 use crate::{
     arithmetic::CurveAffine,
-    plonk::{self},
+    plonk::{self, ChallengeBeta, ChallengeGamma, ChallengeX},
     poly::{commitment::MSM, VerifierQuery},
     transcript::{EncodedChallenge, TranscriptRead},
 };
-use halo2_common::plonk::{ChallengeBeta, ChallengeGamma, ChallengeX, Error};
+use halo2_common::plonk::Error;
 use halo2_middleware::circuit::Any;
 use halo2_middleware::poly::Rotation;
 

halo2_backend/src/plonk/prover.rs

@@ -8,17 +8,18 @@ use crate::arithmetic::{eval_polynomial, CurveAffine};
 use crate::plonk::lookup::prover::lookup_commit_permuted;
 use crate::plonk::permutation::prover::permutation_commit;
 use crate::plonk::shuffle::prover::shuffle_commit_product;
-use crate::plonk::{lookup, permutation, shuffle, vanishing, ProvingKey};
+use crate::plonk::{
+    lookup, permutation, shuffle, vanishing, ChallengeBeta, ChallengeGamma, ChallengeTheta,
+    ChallengeX, ChallengeY, ProvingKey,
+};
 use crate::poly::{
     commitment::{Blind, CommitmentScheme, Params, Prover},
     Basis, Coeff, LagrangeCoeff, Polynomial, ProverQuery,
 };
 
+use crate::transcript::{EncodedChallenge, TranscriptWrite};
 use group::prime::PrimeCurveAffine;
-use halo2_common::plonk::{
-    circuit::sealed, ChallengeBeta, ChallengeGamma, ChallengeTheta, ChallengeX, ChallengeY, Error,
-};
-use halo2_common::transcript::{EncodedChallenge, TranscriptWrite};
+use halo2_common::plonk::{circuit::sealed, Error};
 
 /// Collection of instance data used during proving for a single circuit proof.
 #[derive(Debug)]

halo2_backend/src/plonk/shuffle/prover.rs

@@ -3,14 +3,15 @@ use super::Argument;
 use crate::plonk::evaluation::evaluate;
 use crate::{
     arithmetic::{eval_polynomial, parallelize, CurveAffine},
+    plonk::{ChallengeGamma, ChallengeTheta, ChallengeX},
     poly::{
         commitment::{Blind, Params},
         Coeff, EvaluationDomain, LagrangeCoeff, Polynomial, ProverQuery,
     },
     transcript::{EncodedChallenge, TranscriptWrite},
 };
 use group::{ff::BatchInvert, Curve};
-use halo2_common::plonk::{ChallengeGamma, ChallengeTheta, ChallengeX, Error, Expression};
+use halo2_common::plonk::{Error, Expression};
 use halo2_middleware::ff::WithSmallOrderMulGroup;
 use halo2_middleware::poly::Rotation;
 use rand_core::RngCore;

halo2_backend/src/plonk/shuffle/verifier.rs

@@ -3,11 +3,11 @@ use std::iter;
 use super::Argument;
 use crate::{
     arithmetic::CurveAffine,
-    plonk::VerifyingKey,
+    plonk::{ChallengeGamma, ChallengeTheta, ChallengeX, VerifyingKey},
     poly::{commitment::MSM, VerifierQuery},
     transcript::{EncodedChallenge, TranscriptRead},
 };
-use halo2_common::plonk::{ChallengeGamma, ChallengeTheta, ChallengeX, Error, Expression};
+use halo2_common::plonk::{Error, Expression};
 use halo2_middleware::ff::Field;
 use halo2_middleware::poly::Rotation;
 

halo2_backend/src/plonk/vanishing/prover.rs

@@ -1,7 +1,7 @@
 use std::{collections::HashMap, iter};
 
 use group::Curve;
-use halo2_common::plonk::{ChallengeX, Error};
+use halo2_common::plonk::Error;
 use halo2_middleware::ff::Field;
 use rand_chacha::ChaCha20Rng;
 use rand_core::{RngCore, SeedableRng};
@@ -10,6 +10,7 @@ use super::Argument;
 use crate::{
     arithmetic::{eval_polynomial, parallelize, CurveAffine},
     multicore::current_num_threads,
+    plonk::ChallengeX,
     poly::{
         commitment::{Blind, ParamsProver},
         Coeff, EvaluationDomain, ExtendedLagrangeCoeff, Polynomial, ProverQuery,

halo2_backend/src/plonk/vanishing/verifier.rs

@@ -1,11 +1,11 @@
 use std::iter;
 
-use halo2_common::plonk::{ChallengeX, ChallengeY, Error};
+use halo2_common::plonk::Error;
 use halo2_middleware::ff::Field;
 
 use crate::{
     arithmetic::CurveAffine,
-    plonk::VerifyingKey,
+    plonk::{ChallengeX, ChallengeY, VerifyingKey},
     poly::{
         commitment::{Params, MSM},
         VerifierQuery,

halo2_backend/src/plonk/verifier.rs

@@ -1,7 +1,4 @@
 use group::Curve;
-use halo2_common::plonk::{
-    ChallengeBeta, ChallengeGamma, ChallengeTheta, ChallengeX, ChallengeY, Error,
-};
 use halo2_middleware::ff::{Field, FromUniformBytes, WithSmallOrderMulGroup};
 use std::iter;
 
@@ -10,6 +7,7 @@ use crate::arithmetic::compute_inner_product;
 use crate::plonk::lookup::verifier::lookup_read_permuted_commitments;
 use crate::plonk::permutation::verifier::permutation_read_product_commitments;
 use crate::plonk::shuffle::verifier::shuffle_read_product_commitment;
+use crate::plonk::{ChallengeBeta, ChallengeGamma, ChallengeTheta, ChallengeX, ChallengeY, Error};
 use crate::poly::commitment::{CommitmentScheme, Verifier};
 use crate::poly::VerificationStrategy;
 use crate::poly::{

halo2_common/src/lib.rs

@@ -10,7 +10,6 @@ pub mod circuit;
 pub use halo2curves;
 pub mod multicore;
 pub mod plonk;
-pub mod transcript;
 
 pub mod helpers;
 pub use helpers::SerdeFormat;

halo2_common/src/plonk.rs

@@ -5,7 +5,6 @@
 //! [halo]: https://eprint.iacr.org/2019/1021
 //! [plonk]: https://eprint.iacr.org/2019/953
 
-use crate::transcript::ChallengeScalar;
 use halo2_middleware::circuit::{Advice, Fixed, Instance};
 use halo2_middleware::ff::Field;
 use halo2_middleware::poly::Rotation;
@@ -443,26 +442,6 @@ impl Queries {
     }
 }
 
-#[derive(Clone, Copy, Debug)]
-pub struct Theta;
-pub type ChallengeTheta<F> = ChallengeScalar<F, Theta>;
-
-#[derive(Clone, Copy, Debug)]
-pub struct Beta;
-pub type ChallengeBeta<F> = ChallengeScalar<F, Beta>;
-
-#[derive(Clone, Copy, Debug)]
-pub struct Gamma;
-pub type ChallengeGamma<F> = ChallengeScalar<F, Gamma>;
-
-#[derive(Clone, Copy, Debug)]
-pub struct Y;
-pub type ChallengeY<F> = ChallengeScalar<F, Y>;
-
-#[derive(Clone, Copy, Debug)]
-pub struct X;
-pub type ChallengeX<F> = ChallengeScalar<F, X>;
-
 #[cfg(test)]
 mod tests {
     use halo2curves::pasta::Fp;

halo2_proofs/src/lib.rs

@@ -46,7 +46,7 @@ pub mod poly {
 /// This module contains utilities and traits for dealing with Fiat-Shamir
 /// transcripts.
 pub mod transcript {
-    pub use halo2_common::transcript::{
+    pub use halo2_backend::transcript::{
         Blake2bRead, Blake2bWrite, Challenge255, EncodedChallenge, TranscriptReadBuffer,
         TranscriptWriterBuffer,
     };

halo2_proofs/src/plonk/prover.rs

@@ -1,7 +1,7 @@
 use crate::poly::commitment::{CommitmentScheme, Params, Prover};
 use halo2_backend::plonk::{prover::ProverV2, ProvingKey};
+use halo2_backend::transcript::{EncodedChallenge, TranscriptWrite};
 use halo2_common::plonk::{circuit::Circuit, Error};
-use halo2_common::transcript::{EncodedChallenge, TranscriptWrite};
 use halo2_frontend::circuit::{compile_circuit, WitnessCalculator};
 use halo2_middleware::ff::{FromUniformBytes, WithSmallOrderMulGroup};
 use rand_core::RngCore;

halo2_proofs/tests/frontend_backend_split.rs

@@ -5,20 +5,22 @@
 #[global_allocator]
 static ALLOC: dhat::Alloc = dhat::Alloc;
 
-use halo2_backend::plonk::{
-    keygen::{keygen_pk_v2, keygen_vk_v2},
-    prover::ProverV2Single,
-    verifier::{verify_proof, verify_proof_single},
+use halo2_backend::{
+    plonk::{
+        keygen::{keygen_pk_v2, keygen_vk_v2},
+        prover::ProverV2Single,
+        verifier::{verify_proof, verify_proof_single},
+    },
+    transcript::{
+        Blake2bRead, Blake2bWrite, Challenge255, TranscriptReadBuffer, TranscriptWriterBuffer,
+    },
 };
 use halo2_common::{
     circuit::{AssignedCell, Layouter, Region, SimpleFloorPlanner, Value},
     plonk::{
         circuit::{Challenge, Column},
         Circuit, ConstraintSystem, Error, Expression, FirstPhase, SecondPhase, Selector,
     },
-    transcript::{
-        Blake2bRead, Blake2bWrite, Challenge255, TranscriptReadBuffer, TranscriptWriterBuffer,
-    },
 };
 use halo2_frontend::{
     circuit::{compile_circuit, WitnessCalculator},