chore: fixing issue with public inputs chunking, and other small fixes (#9)

Co-authored-by: Oles Holembovskyy <[email protected]>

Author: mm-zk

Cargo.toml

@@ -13,17 +13,17 @@ name = "cli"
 path = "src/main.rs"
 
 [dependencies]
-boojum = { git = "https://github.com/matter-labs/zksync-crypto.git", package="boojum", branch = "mmzk_0418_without_field" }
+boojum = { git = "https://github.com/matter-labs/zksync-crypto.git", package="boojum", branch = "mmzk_0418_without_field" , features = ["log_tracing"]}
 # boojum = { path = "../zksync-crypto/crates/boojum"}
 bellman = { git = "https://github.com/matter-labs/zksync-crypto.git", package="zksync_bellman", branch = "mmzk_0418_without_field" }
 # bellman = { path = "../zksync-crypto/crates/bellman", package="zksync_bellman"}
 rescue_poseidon = { git = "https://github.com/matter-labs/zksync-crypto.git", package="rescue_poseidon", branch = "mmzk_0418_without_field" }
 # rescue_poseidon = { path = "../zksync-crypto/crates/rescue-poseidon"}
 snark_wrapper = { git = "https://github.com/matter-labs/zksync-crypto.git", package="snark_wrapper", branch = "mmzk_0418_without_field" }
 # snark_wrapper = { path = "../zksync-crypto/crates/snark-wrapper"}
-risc_verifier = {git="https://github.com/matter-labs/air_compiler.git", package="final_reduced_risc_v_machine_verifier", features=["proof_utils"], branch="oh_binaries_updated"}
+risc_verifier = {git="https://github.com/matter-labs/air_compiler.git", package="final_reduced_risc_v_machine_verifier", features=["proof_utils"], branch="main"}
 # risc_verifier = {path="../air_compiler/circuit_defs/final_reduced_risc_v_machine/verifier", package="final_reduced_risc_v_machine_verifier", features=["proof_utils"]}
-execution_utils = {git="https://github.com/matter-labs/air_compiler.git", package="execution_utils", branch="oh_binaries_updated"}
+execution_utils = {git="https://github.com/matter-labs/air_compiler.git", package="execution_utils", branch="main"}
 # execution_utils = {path="../air_compiler/execution_utils"}
 circuit_mersenne_field = {path="circuit_mersenne_field"}
 serde_json = { version = "*" }

circuit_mersenne_field/Cargo.toml

@@ -6,6 +6,6 @@ edition = "2021"
 [dependencies]
 boojum = { git = "https://github.com/matter-labs/zksync-crypto.git", package="boojum", branch = "mmzk_0418_without_field" }
 # boojum = { path = "../../zksync-crypto/crates/boojum"}
-mersenne_field = {git="https://github.com/matter-labs/air_compiler.git", package="field", branch="oh_binaries_updated"}
+mersenne_field = {git="https://github.com/matter-labs/air_compiler.git", package="field", branch="main"}
 # mersenne_field = {path="../../air_compiler/field", package="field"}
 rand = "0.8"

rust-toolchain

@@ -1 +1 @@
-nightly-2025-03-31
+nightly-2025-02-28

src/circuits/risc_wrapper.rs

@@ -1,5 +1,6 @@
 use boojum::{
     cs::{
+        CSGeometry, GateConfigurationHolder, LookupParameters, StaticToolboxHolder,
         cs_builder::{CsBuilder, CsBuilderImpl},
         gates::{
             ConstantsAllocatorGate, FmaGateInBaseFieldWithoutConstant, NopGate, PublicInputGate,
@@ -8,22 +9,21 @@ use boojum::{
         },
         implementations::prover::ProofConfig,
         traits::{circuit::CircuitBuilder, cs::ConstraintSystem, gate::GatePlacementStrategy},
-        CSGeometry, GateConfigurationHolder, LookupParameters, StaticToolboxHolder,
     },
     field::SmallField,
     gadgets::{
         num::Num,
         tables::{
-            byte_split::{create_byte_split_table, ByteSplitTable},
-            xor8::{create_xor8_table, Xor8Table},
+            byte_split::{ByteSplitTable, create_byte_split_table},
+            xor8::{Xor8Table, create_xor8_table},
         },
-        traits::{allocatable::CSAllocatable, witnessable::WitnessHookable},
+        traits::allocatable::CSAllocatable,
         u16::UInt16,
         u32::UInt32,
     },
 };
 use circuit_mersenne_field::{
-    extension_trait::CircuitFieldExpression, MersenneField, MersenneQuartic,
+    MersenneField, MersenneQuartic, extension_trait::CircuitFieldExpression,
 };
 use std::mem::MaybeUninit;
 
@@ -45,14 +45,14 @@ use risc_verifier::prover::risc_v_simulator::cycle::state::NUM_REGISTERS;
 use risc_verifier::prover::cs::definitions::*;
 
 use risc_verifier::verifier_common::{
-    transcript::Blake2sBufferingTranscript, DefaultNonDeterminismSource, ProofOutput,
-    ProofPublicInputs,
+    DefaultNonDeterminismSource, ProofOutput, ProofPublicInputs,
+    transcript::Blake2sBufferingTranscript,
 };
 
-use boojum::gadgets::tables::create_range_check_15_bits_table;
-use boojum::gadgets::tables::create_range_check_16_bits_table;
 use boojum::gadgets::tables::RangeCheck15BitsTable;
 use boojum::gadgets::tables::RangeCheck16BitsTable;
+use boojum::gadgets::tables::create_range_check_15_bits_table;
+use boojum::gadgets::tables::create_range_check_16_bits_table;
 use risc_verifier::prover::prover_stages::Proof as RiscProof;
 
 const NUM_RISC_WRAPPER_PUBLIC_INPUTS: usize = 4;
@@ -287,7 +287,7 @@ impl<F: SmallField, V: CircuitLeafInclusionVerifier<F>> RiscWrapperCircuit<F, V>
 
         // we carry registers 10-17 to the next layer - those are the output of the base program
         let output_registers_values: Vec<_> = final_registers_state
-            .chunks(2)
+            .chunks(3)
             .skip(10)
             .take(8)
             .flat_map(|chunk| chunk[0].decompose_into_bytes(cs))
@@ -460,23 +460,6 @@ pub(crate) fn check_proof_state<F: SmallField, CS: ConstraintSystem<F>>(
             NUM_DELEGATION_CHALLENGES > 0,
         );
 
-    dbg!(
-        proof_state
-            .memory_challenges
-            .memory_argument_linearization_challenges
-            .witness_hook(cs)(),
-        proof_state
-            .memory_challenges
-            .memory_argument_gamma
-            .witness_hook(cs)(),
-        memory_argument_challenges
-            .memory_argument_linearization_challenges
-            .witness_hook(cs)(),
-        memory_argument_challenges
-            .memory_argument_gamma
-            .witness_hook(cs)(),
-    );
-
     memory_argument_challenges.enforce_equal(cs, &proof_state.memory_challenges);
     if NUM_DELEGATION_CHALLENGES > 0 {
         delegation_argument_challenges

src/main.rs

@@ -11,12 +11,12 @@ use clap::Parser;
 use bellman::kate_commitment::{Crs, CrsForMonomialForm};
 use bellman::worker::Worker as BellmanWorker;
 
+use zkos_wrapper::{Bn256, L1_VERIFIER_DOMAIN_SIZE_LOG};
 use zkos_wrapper::{
     circuits::RiscWrapperWitness, get_compression_setup, get_risc_wrapper_setup,
     get_snark_wrapper_setup, prove_compression, prove_risc_wrapper, prove_snark_wrapper,
     verify_compression_proof, verify_risc_wrapper_proof, verify_snark_wrapper_proof,
 };
-use zkos_wrapper::{Bn256, L1_VERIFIER_DOMAIN_SIZE_LOG};
 
 #[derive(Parser)]
 #[command(version, about, long_about = None)]
@@ -40,6 +40,8 @@ fn deserialize_from_file<T: serde::de::DeserializeOwned>(filename: &str) -> T {
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let cli = Cli::parse();
 
+    println!("=== Phase 1: Creating the Risc wrapper proof");
+
     let worker = boojum::worker::Worker::new_with_num_threads(4);
 
     let program_proof = deserialize_from_file(&cli.input);
@@ -75,6 +77,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         &Path::new(&cli.output_dir.clone()).join("risc_proof.json"),
     );
 
+    println!("=== Phase 2: Creating compression proof");
+
     let (
         finalization_hint,
         setup_base,
@@ -105,6 +109,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         &Path::new(&cli.output_dir.clone()).join("compression_proof.json"),
     );
 
+    println!("=== Phase 3: Creating SNARK proof");
+
     {
         let worker = BellmanWorker::new_with_cpus(4);
 

src/tests/mod.rs

@@ -2,27 +2,27 @@ use crate::transcript::*;
 use crate::wrapper_inner_verifier::skeleton::*;
 use crate::wrapper_utils::verifier_traits::CircuitBlake2sForEverythingVerifier;
 use crate::wrapper_utils::verifier_traits::CircuitLeafInclusionVerifier;
+use boojum::cs::LookupParameters;
 use boojum::cs::gates::FmaGateInBaseFieldWithoutConstant;
 use boojum::cs::gates::NopGate;
 use boojum::cs::gates::SelectionGate;
 use boojum::cs::gates::ZeroCheckGate;
-use boojum::cs::LookupParameters;
-use boojum::gadgets::tables::create_range_check_15_bits_table;
-use boojum::gadgets::tables::create_range_check_16_bits_table;
 use boojum::gadgets::tables::RangeCheck15BitsTable;
 use boojum::gadgets::tables::RangeCheck16BitsTable;
+use boojum::gadgets::tables::create_range_check_15_bits_table;
+use boojum::gadgets::tables::create_range_check_16_bits_table;
 use boojum::{
     cs::{
+        CSGeometry,
         gates::{ConstantsAllocatorGate, ReductionGate, U32TriAddCarryAsChunkGate, UIntXAddGate},
         traits::{cs::ConstraintSystem, gate::GatePlacementStrategy},
-        CSGeometry,
     },
     dag::CircuitResolverOpts,
     gadgets::blake2s::mixing_function::Word,
     gadgets::{
         tables::{
-            byte_split::{create_byte_split_table, ByteSplitTable},
-            xor8::{create_xor8_table, Xor8Table},
+            byte_split::{ByteSplitTable, create_byte_split_table},
+            xor8::{Xor8Table, create_xor8_table},
         },
         traits::witnessable::WitnessHookable,
         u32::UInt32,

src/wrapper_inner_verifier/imports/final_state_constants.rs

@@ -1,20 +1,20 @@
 pub(crate) const FINAL_RISC_CIRCUIT_END_PARAMS: [u32; 8usize] = [
-    1084790708u32,
-    5361886u32,
-    780007677u32,
-    2427515337u32,
-    1615785659u32,
-    2910616041u32,
-    872871208u32,
-    2091005209u32,
+    3720499768u32,
+    1999558729u32,
+    2634397082u32,
+    2874636721u32,
+    2927295123u32,
+    1198777685u32,
+    3190458316u32,
+    1220676032u32,
 ];
 pub(crate) const FINAL_RISC_CIRCUIT_AUX_REGISTERS_VALUES: [u32; 8usize] = [
-    2369219390u32,
-    1113127411u32,
-    3416575085u32,
-    2776983668u32,
-    99649126u32,
-    2857787559u32,
-    4051254451u32,
-    3927721995u32,
+    3771437303u32,
+    594675024u32,
+    1830865157u32,
+    950617708u32,
+    2250245805u32,
+    2186801436u32,
+    381060896u32,
+    953695755u32,
 ];

wrapper_generator/Cargo.toml

@@ -5,15 +5,22 @@ name = "wrapper_generator"
 version = "0.1.0"
 edition = "2024"
 
+[lib]
+path = "src/lib.rs"
+
+[[bin]]
+name = "cli"
+path = "src/main.rs"
+
 [dependencies]
 clap = { version = "4.5.21", features = ["derive"] }
-zkos_verifier_generator = {git="https://github.com/matter-labs/air_compiler.git", package="verifier_generator", branch="oh_binaries_updated"}
+zkos_verifier_generator = {git="https://github.com/matter-labs/air_compiler.git", package="verifier_generator", branch="main"}
 # zkos_verifier_generator = {path="../../air_compiler/verifier_generator", package="verifier_generator"}
-prover = {git="https://github.com/matter-labs/air_compiler.git", package="prover", branch="oh_binaries_updated"}
+prover = {git="https://github.com/matter-labs/air_compiler.git", package="prover", branch="main"}
 # prover = {path="../../air_compiler/prover", package="prover"}
-execution_utils = {git="https://github.com/matter-labs/air_compiler.git", package="execution_utils", branch="oh_binaries_updated"}
+execution_utils = {git="https://github.com/matter-labs/air_compiler.git", package="execution_utils", branch="main"}
 # execution_utils = {path="../../air_compiler/execution_utils"}
-setups = {git="https://github.com/matter-labs/air_compiler.git", package="setups", branch="oh_binaries_updated"}
+setups = {git="https://github.com/matter-labs/air_compiler.git", package="setups", branch="main"}
 # setups = {path="../../air_compiler/circuit_defs/setups"}
 serde_json = "*"
 serde = { version = "1", default-features = false, features = ["derive", "alloc"]}