Try to use plonky2 and starky for proving and verifying (WIP)

Cargo.toml

@@ -57,6 +57,9 @@ starky = { version = "0", default-features = false }
 plonky2_crypto = { git = "https://github.com/0xmozak/plonky2-crypto.git" }
 
 [patch.crates-io]
-plonky2 = { git = "https://github.com/0xmozak/plonky2.git" }
-plonky2_maybe_rayon = { git = "https://github.com/0xmozak/plonky2.git" }
-starky = { git = "https://github.com/0xmozak/plonky2.git" }
+# plonky2 = { path = "../plonky2/plonky2" }
+# plonky2_maybe_rayon = { path = "../plonky2/maybe_rayon" }
+# starky = { path = "../plonky2/starky" }
+plonky2 = { git = "https://github.com/0xmozak/plonky2.git", branch = "matthias/looked-tables" }
+plonky2_maybe_rayon = { git = "https://github.com/0xmozak/plonky2.git", branch = "matthias/looked-tables" }
+starky = { git = "https://github.com/0xmozak/plonky2.git", branch = "matthias/looked-tables" }

circuits/src/bitshift/stark.rs

@@ -21,6 +21,7 @@ use crate::unstark::NoColumns;
 #[allow(clippy::module_name_repetitions)]
 pub struct BitshiftStark<F, const D: usize> {
     pub _f: PhantomData<F>,
+    pub standalone_proving: bool,
 }
 
 impl<F, const D: usize> HasNamedColumns for BitshiftStark<F, D> {
@@ -80,6 +81,8 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for BitshiftStark
     type EvaluationFrameTarget =
         StarkFrame<ExtensionTarget<D>, ExtensionTarget<D>, COLUMNS, PUBLIC_INPUTS>;
 
+    fn requires_ctls(&self) -> bool { !self.standalone_proving }
+
     fn eval_packed_generic<FE, P, const D2: usize>(
         &self,
         vars: &Self::EvaluationFrame<FE, P, D2>,
@@ -127,7 +130,10 @@ mod tests {
 
     #[test]
     fn test_degree() -> Result<()> {
-        let stark = S::default();
+        let stark = S {
+            standalone_proving: true,
+            ..S::default()
+        };
         test_stark_low_degree(stark)
     }
 
@@ -206,7 +212,10 @@ mod tests {
 
     #[test]
     fn test_circuit() -> anyhow::Result<()> {
-        let stark = S::default();
+        let stark = S {
+            standalone_proving: true,
+            ..S::default()
+        };
         test_stark_circuit_constraints::<F, C, S, D>(stark)?;
 
         Ok(())

circuits/src/cpu/mul.rs

@@ -145,7 +145,10 @@ mod tests {
             "trace to poly",
             trace_rows_to_poly_values(cpu_trace)
         );
-        let stark = S::default();
+        let stark = S {
+            standalone_proving: true,
+            ..S::default()
+        };
         let public_inputs = PublicInputs {
             entry_point: from_u32(program.entry_point),
         };

circuits/src/cpu/stark.rs

@@ -25,6 +25,7 @@ use crate::stark::mozak_stark::PublicInputs;
 #[allow(clippy::module_name_repetitions)]
 pub struct CpuStark<F, const D: usize> {
     pub _f: PhantomData<F>,
+    pub standalone_proving: bool,
 }
 
 impl<F, const D: usize> HasNamedColumns for CpuStark<F, D> {
@@ -151,6 +152,8 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for CpuStark<F, D
     type EvaluationFrameTarget =
         StarkFrame<ExtensionTarget<D>, ExtensionTarget<D>, COLUMNS, PUBLIC_INPUTS>;
 
+    fn requires_ctls(&self) -> bool { !self.standalone_proving }
+
     fn eval_packed_generic<FE, P, const D2: usize>(
         &self,
         vars: &Self::EvaluationFrame<FE, P, D2>,
@@ -194,7 +197,10 @@ mod tests {
         type F = <C as GenericConfig<D>>::F;
         type S = CpuStark<F, D>;
 
-        let stark = S::default();
+        let stark = S {
+            standalone_proving: true,
+            ..S::default()
+        };
         test_stark_low_degree(stark)
     }
 
@@ -205,7 +211,10 @@ mod tests {
         type F = <C as GenericConfig<D>>::F;
         type S = CpuStark<F, D>;
 
-        let stark = S::default();
+        let stark = S {
+            standalone_proving: true,
+            ..S::default()
+        };
         test_stark_circuit_constraints::<F, C, S, D>(stark)?;
 
         Ok(())