patch aggr for stitching

src/circuit/modules/kzg.rs

@@ -10,7 +10,6 @@ use halo2_proofs::poly::commitment::{Blind, Params};
 use halo2_proofs::poly::kzg::commitment::ParamsKZG;
 use halo2_proofs::{circuit::*, plonk::*};
 use halo2curves::bn256::{Bn256, G1Affine};
-use halo2curves::ff::Field;
 use halo2curves::group::prime::PrimeCurveAffine;
 use halo2curves::group::Curve;
 use halo2curves::CurveAffine;
@@ -57,7 +56,7 @@ impl KZGChip {
 
         (0..num_unusable_rows).for_each(|i| {
             for p in &mut poly {
-                p[(n + i as u64) as usize] = Fp::ZERO;
+                p[(n + i as u64) as usize] = Blind::default().0;
             }
         });
 
@@ -69,7 +68,7 @@ impl KZGChip {
 
         let mut advice_commitments_projective = vec![];
         for a in poly {
-            advice_commitments_projective.push(params.commit_lagrange(&a, Blind(Fp::ZERO)))
+            advice_commitments_projective.push(params.commit_lagrange(&a, Blind::default()))
         }
 
         let mut advice_commitments =

src/graph/mod.rs

@@ -458,6 +458,21 @@ impl GraphSettings {
     pub fn uses_modules(&self) -> bool {
         !self.module_sizes.max_constraints() > 0
     }
+
+    /// if any visibility is encrypted or hashed
+    pub fn module_requires_fixed(&self) -> bool {
+        if self.run_args.input_visibility.is_encrypted()
+            || self.run_args.input_visibility.is_hashed()
+            || self.run_args.output_visibility.is_encrypted()
+            || self.run_args.output_visibility.is_hashed()
+            || self.run_args.param_visibility.is_encrypted()
+            || self.run_args.param_visibility.is_hashed()
+        {
+            true
+        } else {
+            false
+        }
+    }
 }
 
 /// Configuration for a computational graph / model loaded from a `.onnx` file.
@@ -1245,7 +1260,7 @@ impl Circuit<Fp> for GraphCircuit {
             params.total_assignments,
             params.run_args.num_inner_cols,
             params.total_const_size,
-            params.uses_modules(),
+            params.module_requires_fixed(),
         );
 
         module_configs.configure_complex_modules(cs, visibility, params.module_sizes.clone());

src/graph/vars.rs

@@ -417,7 +417,7 @@ impl<F: PrimeField + TensorType + PartialOrd> ModelVars<F> {
         var_len: usize,
         num_inner_cols: usize,
         num_constants: usize,
-        uses_modules: bool,
+        module_requires_fixed: bool,
     ) -> Self {
         info!("number of blinding factors: {}", cs.blinding_factors());
 
@@ -431,7 +431,8 @@ impl<F: PrimeField + TensorType + PartialOrd> ModelVars<F> {
             num_inner_cols
         );
 
-        let num_const_cols = VarTensor::constant_cols(cs, logrows, num_constants, uses_modules);
+        let num_const_cols =
+            VarTensor::constant_cols(cs, logrows, num_constants, module_requires_fixed);
         debug!("model uses {} fixed columns", num_const_cols);
 
         ModelVars {

src/tensor/var.rs

@@ -136,11 +136,11 @@ impl VarTensor {
         cs: &mut ConstraintSystem<F>,
         logrows: usize,
         num_constants: usize,
-        uses_modules: bool,
+        module_requires_fixed: bool,
     ) -> usize {
-        if num_constants == 0 && !uses_modules {
+        if num_constants == 0 && !module_requires_fixed {
             return 0;
-        } else if num_constants == 0 && uses_modules {
+        } else if num_constants == 0 && module_requires_fixed {
             let col = cs.fixed_column();
             cs.enable_constant(col);
             return 1;