Simpler and faster

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "lean-multisig"
+name = "modular-precompiles"
 version.workspace = true
 edition.workspace = true
 
@@ -8,7 +8,11 @@ version = "0.1.0"
 edition = "2024"
 
 [workspace]
-members = ["crates/*", "crates/lean_prover/vm_air", "crates/lean_prover/witness_generation"]
+members = [
+    "crates/*",
+    "crates/lean_prover/vm_air",
+    "crates/lean_prover/witness_generation",
+]
 
 [workspace.lints]
 rust.missing_debug_implementations = "warn"
@@ -44,7 +48,7 @@ air = { path = "crates/air" }
 utils = { path = "crates/utils" }
 lean_vm = { path = "crates/lean_vm" }
 xmss = { path = "crates/xmss" }
-packed_pcs = { path = "crates/packed_pcs" }
+sub_protocols = { path = "crates/sub_protocols" }
 lookup = { path = "crates/lookup" }
 lean_compiler = { path = "crates/lean_compiler" }
 lean_prover = { path = "crates/lean_prover" }
@@ -58,32 +62,28 @@ thiserror = "2.0"
 clap = { version = "4.3.10", features = ["derive"] }
 rand = "0.9.2"
 sha3 = "0.10.8"
-rayon = "1.5.1"
 derive_more = { version = "2.0.1", features = ["full"] }
 pest = "2.7"
 pest_derive = "2.7"
+itertools = "0.10.5"
 colored = "3.0.0"
 tracing = "0.1.26"
 serde_json = "*"
 tracing-subscriber = { version = "0.3.19", features = ["std", "env-filter"] }
 tracing-forest = { version = "0.2.0", features = ["ansi", "smallvec"] }
-p3-koala-bear = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
-p3-baby-bear = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
-p3-field = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
-p3-poseidon2 = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
-p3-matrix = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
-p3-blake3 = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
-p3-symmetric = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
-p3-air = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
-p3-uni-stark = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
-p3-poseidon2-air = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
-p3-goldilocks = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
-p3-challenger = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
-p3-util = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
-p3-monty-31 = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
+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" }
+p3-monty-31 = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
 
-whir-p3 = { git = "https://github.com/TomWambsgans/whir-p3", branch = "lean-multisig" }
-multilinear-toolkit = { git = "https://github.com/leanEthereum/multilinear-toolkit.git" }
+whir-p3 = { git = "https://github.com/TomWambsgans/whir-p3", branch = "modular-precompiles" }
+multilinear-toolkit = { git = "https://github.com/leanEthereum/multilinear-toolkit.git", branch = "modular-precompiles" }
 
 [dependencies]
 clap.workspace = true
@@ -94,11 +94,12 @@ poseidon_circuit.workspace = true
 # p3-koala-bear = { path = "../zk/Plonky3/koala-bear" }
 # p3-field = { path = "../zk/Plonky3/field" }
 # p3-poseidon2 = { path = "../zk/Plonky3/poseidon2" }
-# p3-matrix = { path = "../zk/Plonky3/matrix" }
 # p3-symmetric = { path = "../zk/Plonky3/symmetric" }
 # p3-air = { path = "../zk/Plonky3/air" }
 # p3-uni-stark = { path = "../zk/Plonky3/uni-stark" }
-# p3-poseidon2-air = { path = "../zk/Plonky3/poseidon2-air" }
+# 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" }

crates/air/Cargo.toml

@@ -7,16 +7,13 @@ edition.workspace = true
 workspace = true
 
 [dependencies]
-p3-field.workspace = true
 tracing.workspace = true
 utils.workspace = true
 p3-air.workspace = true
 p3-uni-stark.workspace = true
-p3-matrix.workspace = true
 p3-util.workspace = true
 multilinear-toolkit.workspace = true
 
 [dev-dependencies]
 p3-koala-bear.workspace = true
-p3-matrix.workspace = true
 rand.workspace = true

crates/air/src/lib.rs

@@ -3,15 +3,18 @@
 use ::utils::ConstraintChecker;
 use multilinear_toolkit::prelude::*;
 use p3_air::Air;
-use p3_field::ExtensionField;
 use p3_uni_stark::SymbolicAirBuilder;
 
 mod prove;
-pub mod table;
+mod table;
 mod uni_skip_utils;
 mod utils;
 mod verify;
 
+pub use prove::*;
+pub use table::*;
+pub use verify::*;
+
 #[cfg(test)]
 pub mod tests;