Zz fixes simplified

Cargo.toml

@@ -74,6 +74,8 @@ hex-literal = "1.0.0"
 itertools = { version = "0.14.0", default-features = false, features = [
     "use_alloc",
 ] }
+
+miden-air = { path = "miden-air", version = "0.3.0" }
 num-bigint = { version = "0.4.3", default-features = false }
 paste = "1.0.15"
 postcard = { version = "1.0.0", default-features = false }
@@ -86,6 +88,7 @@ serde_json = "1.0.113"
 sha2 = { version = "0.10.8", default-features = false }
 sha3 = { version = "0.10.8", default-features = false }
 spin = "0.10.0"
+thiserror = { version = "2.0", default-features = false }
 tiny-keccak = "2.0.2"
 tracing = { version = "0.1.37", default-features = false, features = [
     "attributes",
@@ -133,8 +136,6 @@ p3-symmetric = { path = "symmetric", version = "0.3.0" }
 p3-uni-stark = { path = "uni-stark", version = "0.3.0" }
 p3-util = { path = "util", version = "0.3.0" }
 
-miden-air = { path = "miden-air", version = "0.3.0" }
-
 [workspace.package]
 # General description field used for the sub-crates that are currently missing a description.
 description = "Plonky3 is a toolkit for implementing polynomial IOPs (PIOPs), such as PLONK and STARKs."

batch-stark/src/prover.rs

@@ -4,7 +4,7 @@ use alloc::vec::Vec;
 use p3_air::{Air, BaseAirWithAuxTrace};
 use p3_challenger::{CanObserve, FieldChallenger};
 use p3_commit::{Pcs, PolynomialSpace};
-use p3_field::{BasedVectorSpace, PrimeCharacteristicRing};
+use p3_field::PrimeCharacteristicRing;
 use p3_matrix::Matrix;
 use p3_matrix::dense::RowMajorMatrix;
 use p3_uni_stark::{
@@ -68,15 +68,14 @@ where
         .iter()
         .zip(pub_vals.iter())
         .map(|(air, pv)| {
-            let aux_width_base = air.aux_width();
-            let num_randomness_base = air.num_randomness() * SC::Challenge::DIMENSION;
+            // batch-stark doesn't support aux traces yet, so pass 0 for aux_width and num_randomness
             let lqd = get_log_quotient_degree::<Val<SC>, A>(
                 air,
                 0,
                 pv.len(),
                 config.is_zk(),
-                aux_width_base,
-                num_randomness_base,
+                0, // aux_width: batch-stark doesn't support aux traces
+                0, // num_randomness: batch-stark doesn't support randomness
             );
             let qd = 1 << (lqd + config.is_zk());
             (lqd, qd)
@@ -133,16 +132,7 @@ where
             ext_trace_domains[i].create_disjoint_domain(1 << (log_ext_degrees[i] + lqd));
 
         // Count constraints to size alpha powers packing.
-        let aux_width_base = airs[i].aux_width();
-        let num_randomness_base = airs[i].num_randomness() * Challenge::<SC>::DIMENSION;
-        let constraint_cnt = get_symbolic_constraints(
-            airs[i],
-            0,
-            pub_vals[i].len(),
-            aux_width_base,
-            num_randomness_base,
-        )
-        .len();
+        let constraint_cnt = get_symbolic_constraints(airs[i], 0, pub_vals[i].len()).len();
 
         // Get evaluations on quotient domain from the main commitment.
         let trace_on_quotient_domain =
@@ -155,8 +145,6 @@ where
             *trace_domain,
             quotient_domain,
             &trace_on_quotient_domain,
-            None, // multi-stark doesn't support aux trace yet
-            &[],  // no randomness for multi-stark yet
             None, // multi-stark doesn't support preprocessed columns yet
             alpha,
             constraint_cnt,
@@ -244,8 +232,6 @@ where
         per_instance.push(OpenedValues {
             trace_local,
             trace_next,
-            aux_trace_local: None, // multi-stark doesn't support aux trace yet
-            aux_trace_next: None,
             preprocessed_local: None, // multi-stark doesn't support preprocessed columns yet
             preprocessed_next: None,
             quotient_chunks: qcs,

batch-stark/src/verifier.rs

@@ -65,15 +65,14 @@ where
         .iter()
         .zip(public_values.iter())
         .map(|(air, pv)| {
-            let aux_width_base = air.aux_width();
-            let num_randomness_base = air.num_randomness() * SC::Challenge::DIMENSION;
+            // batch-stark doesn't support aux traces yet, so pass 0 for aux_width and num_randomness
             let lqd = get_log_quotient_degree::<Val<SC>, A>(
                 air,
                 0,
                 pv.len(),
                 config.is_zk(),
-                aux_width_base,
-                num_randomness_base,
+                0, // aux_width: batch-stark doesn't support aux traces
+                0, // num_randomness: batch-stark doesn't support randomness
             );
             let qd = 1 << (lqd + config.is_zk());
             (lqd, qd)
@@ -212,9 +211,6 @@ where
             &opened_values.instances[i].trace_next,
             opened_values.instances[i].preprocessed_local.as_deref(),
             opened_values.instances[i].preprocessed_next.as_deref(),
-            None,
-            None,
-            &[],
             &public_values[i],
             init_trace_domain,
             zeta,

batch-stark/tests/simple.rs

@@ -416,8 +416,6 @@ fn test_invalid_trace_width_rejected() {
                 trace_next: valid_proof.opened_values.instances[0].trace_next.clone(),
                 preprocessed_local: None,
                 preprocessed_next: None,
-                aux_trace_local: None,
-                aux_trace_next: None,
                 quotient_chunks: valid_proof.opened_values.instances[0]
                     .quotient_chunks
                     .clone(),