Merge branch 'cleaning'

Author: TomWambsgans

Cargo.lock

@@ -10,7 +10,6 @@ edition = "2024"
 [workspace]
 members = [
     "crates/*",
-    "crates/lean_prover/vm_air",
     "crates/lean_prover/witness_generation",
 ]
 
@@ -54,12 +53,11 @@ lean_compiler = { path = "crates/lean_compiler" }
 lean_prover = { path = "crates/lean_prover" }
 rec_aggregation = { path = "crates/rec_aggregation" }
 witness_generation = { path = "crates/lean_prover/witness_generation" }
-vm_air = { path = "crates/lean_prover/vm_air" }
 poseidon_circuit = { path = "crates/poseidon_circuit" }
 
 # External
 thiserror = "2.0"
-clap = { version = "4.3.10", features = ["derive"] }
+clap = { version = "4.5.52", features = ["derive"] }
 rand = "0.9.2"
 sha3 = "0.10.8"
 derive_more = { version = "2.0.1", features = ["full"] }
@@ -68,15 +66,15 @@ pest_derive = "2.7"
 itertools = "0.10.5"
 colored = "3.0.0"
 tracing = "0.1.26"
-serde_json = "*"
+serde_json = "1.0.145"
+num_enum = "0.7.5"
 tracing-subscriber = { version = "0.3.19", features = ["std", "env-filter"] }
-tracing-forest = { version = "0.2.0", features = ["ansi", "smallvec"] }
+tracing-forest = { version = "0.3.0", features = ["ansi", "smallvec"] }
 p3-koala-bear = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
 p3-baby-bear = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
 p3-poseidon2 = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
 p3-symmetric = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
 p3-air = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
-p3-uni-stark = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
 p3-goldilocks = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
 p3-challenger = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
 p3-util = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
@@ -96,19 +94,23 @@ poseidon_circuit.workspace = true
 # p3-poseidon2 = { path = "../zk/Plonky3/poseidon2" }
 # p3-symmetric = { path = "../zk/Plonky3/symmetric" }
 # p3-air = { path = "../zk/Plonky3/air" }
-# p3-uni-stark = { path = "../zk/Plonky3/uni-stark" }
 # p3-merkle-tree = { path = "../zk/Plonky3/merkle-tree" }
 # p3-commit = { path = "../zk/Plonky3/commit" }
 # p3-matrix = { path = "../zk/Plonky3/matrix" }
 # p3-dft = { path = "../zk/Plonky3/dft" }
 # p3-challenger = { path = "../zk/Plonky3/challenger" }
 # p3-monty-31 = { path = "../zk/Plonky3/monty-31" }
+# p3-maybe-rayon = { path = "../zk/Plonky3/maybe-rayon" }
+# p3-util = { path = "../zk/Plonky3/util" }
 
 # [patch."https://github.com/TomWambsgans/whir-p3.git"]
 # whir-p3 = { path = "../zk/whir/fork-whir-p3" }
 
 # [patch."https://github.com/leanEthereum/multilinear-toolkit.git"]
 # multilinear-toolkit = { path = "../zk/multilinear-toolkit" }
 
+# [profile.release]
+# opt-level = 1
+
 [profile.release]
 lto = "thin"

Cargo.toml

@@ -61,7 +61,7 @@ RUSTFLAGS='-C target-cpu=native' cargo run --release -- xmss --n-signatures 990
 n = 2,000,000
 
 ```
-RUSTFLAGS='-C target-cpu=native' cargo test --release --package lean_prover --test test_zkvm -- --nocapture -- test_prove_fibonacci --exact --nocapture
+FIB_N=2000000 RUSTFLAGS='-C target-cpu=native' cargo test --release --package lean_prover --test test_zkvm -- --nocapture -- test_prove_fibonacci --exact --nocapture
 ```
 
 Proving time:

README.md

@@ -26,6 +26,7 @@
 - Opti WHIR: in sumcheck we know more than f(0) + f(1), we know f(0) and f(1)
 - Opti WHIR https://github.com/tcoratger/whir-p3/issues/303 and https://github.com/tcoratger/whir-p3/issues/306
 - Avoid committing to the 3 index columns, and replace it by a sumcheck? Using this idea, we would only commit to PC and FP for the execution table. Idea by Georg (Powdr). Do we even need to commit to FP then?
+- Avoid the embedding overhead in logup, when denominators = "c - index", as it was previously done
 
 - About the ordering of the variables in sumchecks, currently we do as follows:
 
@@ -97,8 +98,6 @@ Fiat Shamir: add a claim tracing feature, to ensure all the claims are indeed ch
 - bounddary condition on dot_product table: first flag = 1
 - verify correctness of the Grand Product check
 - Proof size: replace all equality checks in the verifier algo by value deduction
-- WIR recursion: batch the multilinear_eval calls on initial merkle leaves
-- multilinear_eval precompile: we can reduce the number of sparse equality constraints required to verify the correctness of point / res into the memory
 
 - KoalaBear extension of degree 5: the current implem (in a fork of Plonky3) has not been been optimized
 - KoalaBear extension of degree 6: in order to use the (proven) Johnson bound in WHIR

TODO.md

@@ -10,7 +10,6 @@ workspace = true
 tracing.workspace = true
 utils.workspace = true
 p3-air.workspace = true
-p3-uni-stark.workspace = true
 p3-util.workspace = true
 multilinear-toolkit.workspace = true
 

crates/air/Cargo.toml

@@ -1,43 +1,11 @@
 #![cfg_attr(not(test), warn(unused_crate_dependencies))]
 
-use ::utils::ConstraintChecker;
-use multilinear_toolkit::prelude::*;
-use p3_air::Air;
-use p3_uni_stark::SymbolicAirBuilder;
-
 mod prove;
-mod table;
 mod uni_skip_utils;
 mod utils;
+mod validity_check;
 mod verify;
 
 pub use prove::*;
-pub use table::*;
+pub use validity_check::*;
 pub use verify::*;
-
-#[cfg(test)]
-pub mod tests;
-
-pub trait MyAir<EF: ExtensionField<PF<EF>>>:
-    Air<SymbolicAirBuilder<PF<EF>>>
-    + for<'a> Air<ConstraintFolder<'a, PF<EF>, EF>>
-    + for<'a> Air<ConstraintFolder<'a, EF, EF>>
-    + for<'a> Air<ConstraintChecker<'a, PF<EF>, EF>>
-    + for<'a> Air<ConstraintChecker<'a, EF, EF>>
-    + for<'a> Air<ConstraintFolderPackedBase<'a, EF>>
-    + for<'a> Air<ConstraintFolderPackedExtension<'a, EF>>
-{
-}
-
-impl<EF, A> MyAir<EF> for A
-where
-    EF: ExtensionField<PF<EF>>,
-    A: Air<SymbolicAirBuilder<PF<EF>>>
-        + for<'a> Air<ConstraintFolder<'a, PF<EF>, EF>>
-        + for<'a> Air<ConstraintFolder<'a, EF, EF>>
-        + for<'a> Air<ConstraintChecker<'a, PF<EF>, EF>>
-        + for<'a> Air<ConstraintChecker<'a, EF, EF>>
-        + for<'a> Air<ConstraintFolderPackedBase<'a, EF>>
-        + for<'a> Air<ConstraintFolderPackedExtension<'a, EF>>,
-{
-}