Bump stwo-circuits and adapt to unreduced hash output (#375)

Bump stwo-circuits (041ec61 → 0451681), stwo-cairo (a837f0ea → 68b4af6d),
and stwo (74951f79 → 5ea05973). Adapt to the upstream change where verifier
circuits now output the full 8-word unreduced Blake2s digest instead of
2 reduced QM31s (stwo-circuits#597).

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: ilyalesokhin-starkware

Cargo.lock

@@ -61,12 +61,12 @@ cairo-lang-execute-utils = "2.19.0-rc.0"
 cairo-lang-utils = "2.19.0-rc.0"
 
 # stwo cairo
-cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a837f0eaa40db776f39f2677885d7059ced867ba" }
-stwo-cairo-utils = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a837f0eaa40db776f39f2677885d7059ced867ba" }
-stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a837f0eaa40db776f39f2677885d7059ced867ba" }
-stwo-cairo-prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a837f0eaa40db776f39f2677885d7059ced867ba" }
-stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a837f0eaa40db776f39f2677885d7059ced867ba" }
-stwo-cairo-common = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a837f0eaa40db776f39f2677885d7059ced867ba" }
+cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" }
+stwo-cairo-utils = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" }
+stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" }
+stwo-cairo-prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" }
+stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" }
+stwo-cairo-common = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" }
 
 
 # local crates

Cargo.toml

@@ -31,20 +31,20 @@ cairo-vm = { workspace = true, features = [
 ] }
 
 # stwo cairo
-cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a837f0eaa40db776f39f2677885d7059ced867ba" }
-stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a837f0eaa40db776f39f2677885d7059ced867ba" }
-stwo-cairo-common = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a837f0eaa40db776f39f2677885d7059ced867ba" }
+cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" }
+stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" }
+stwo-cairo-common = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" }
 
 # stwo circuits
-circuit-cairo-verifier = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "041ec6101ba782aa00e325433929cda6ef15c1b9" }
-circuits-stark-verifier = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "041ec6101ba782aa00e325433929cda6ef15c1b9" }
-circuits = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "041ec6101ba782aa00e325433929cda6ef15c1b9" }
-circuit-serialize = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "041ec6101ba782aa00e325433929cda6ef15c1b9" }
-circuit-common = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "041ec6101ba782aa00e325433929cda6ef15c1b9" }
-circuit-verifier = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "041ec6101ba782aa00e325433929cda6ef15c1b9" }
+circuit-cairo-verifier = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "0451681a86cc4755b848d342f6edbf3a240f2627" }
+circuits-stark-verifier = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "0451681a86cc4755b848d342f6edbf3a240f2627" }
+circuits = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "0451681a86cc4755b848d342f6edbf3a240f2627" }
+circuit-serialize = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "0451681a86cc4755b848d342f6edbf3a240f2627" }
+circuit-common = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "0451681a86cc4755b848d342f6edbf3a240f2627" }
+circuit-verifier = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "0451681a86cc4755b848d342f6edbf3a240f2627" }
 
 # stwo
-stwo = { git = "https://github.com/starkware-libs/stwo", rev = "74951f79" }
+stwo = { git = "https://github.com/starkware-libs/stwo", rev = "5ea05973" }
 
 [dev-dependencies]
 ctor.workspace = true
@@ -53,4 +53,4 @@ rstest.workspace = true
 tempfile.workspace = true
 tracing-subscriber.workspace = true
 privacy-prove = { path = "../privacy_prove" }
-stwo = { git = "https://github.com/starkware-libs/stwo", rev = "74951f79", features = ["parallel"] }
+stwo = { git = "https://github.com/starkware-libs/stwo", rev = "5ea05973", features = ["parallel"] }

crates/privacy_circuit_verify/Cargo.toml

@@ -28,9 +28,9 @@ pub const MAX_RECURSIVE_PROOF_UNCOMPRESSED_BYTES: usize =
 pub const PRIVACY_BOOTLOADER_JSON: &[u8] = include_bytes!(
     "../../cairo-program-runner-lib/resources/compiled_programs/bootloaders/privacy_simple_bootloader_compiled.json"
 );
-pub const CIRCUIT_OUTPUT_ADDRESSES: [usize; 3] = [3, 4, 2];
+pub const CIRCUIT_OUTPUT_ADDRESSES: [usize; 9] = [3, 4, 5, 6, 7, 8, 9, 10, 2];
 pub const PRIVACY_RECURSION_CIRCUIT_PREPROCESSED_ROOT: [u32; 8] = [
-    1585703804, 471132416, 662613155, 1301946947, 16253410, 764021581, 1366076743, 1468898550,
+    800377284, 3072891210, 312668056, 4159802026, 3280170003, 3058368945, 3010382083, 3621697867,
 ];
 pub const CAIRO_LOG_BLOWUP_FACTOR: u32 = 3;
 pub const CAIRO_TRACE_LOG_SIZE: u32 = 20;

crates/privacy_circuit_verify/src/consts.rs

@@ -23,8 +23,8 @@ use circuit_verifier::statement::{
     INTERACTION_POW_BITS as CIRCUIT_INTERACTION_POW_BITS, all_circuit_components,
 };
 use circuit_verifier::verify::{CircuitConfig, CircuitPublicData, verify_circuit};
-use circuits::blake::blake_qm31;
 use circuits::context::FinalizedContext;
+use circuits::ivalue::IValue;
 use circuits::ivalue::NoValue;
 use circuits_stark_verifier::proof::ProofConfig;
 use circuits_stark_verifier::proof_from_stark_proof::pack_into_qm31s;
@@ -124,11 +124,11 @@ pub fn verify_recursive_circuit(proof_output: &PrivacyProofOutput) -> Result<(),
     info!("Compute the output values");
     let outputs = compute_privacy_bootloader_output(&proof_output.output_preimage);
     let output_qm31s = pack_into_qm31s(outputs.into_iter());
-    let output_hash = blake_qm31(output_qm31s.as_slice(), output_qm31s.len() * 16);
-    // The circuit outputs the output_hash (2 QM31s) at addresses 3 and 4. The extension element
-    // u = (0,0,1,0) (the logup anchor at address 2) is appended internally by the verifier, so it
-    // must not be part of `output_values`.
-    let output_values = vec![output_hash.0, output_hash.1];
+    let output_hash = QM31::blake2s(&output_qm31s, output_qm31s.len() * 16);
+    // The circuit outputs the full unreduced Blake2s digest (8 words) at the reserved output
+    // wires. The `u` anchor wire is appended internally by the verifier, so it must not be part
+    // of `output_values`.
+    let output_values: Vec<QM31> = output_hash.iter().map(|w| *w.get()).collect();
 
     info!("Call the verifier");
     verify_circuit(circuit_config, proof, CircuitPublicData { output_values })?;

crates/privacy_circuit_verify/src/lib.rs

@@ -1,5 +1,4 @@
 use circuit_cairo_verifier::all_components::all_components;
-use circuits::blake::ReducedHashValue;
 use stwo::core::fields::qm31::QM31;
 use stwo::core::poly::circle::CanonicCoset;
 use stwo::core::vcs_lifted::blake2_merkle::Blake2sM31MerkleChannel;
@@ -79,12 +78,12 @@ fn check_privacy_recursion_circuit_preprocessed_root() {
         CIRCUIT_PCS_CONFIG.lifting_log_size,
         &base_column_pool,
     );
-    let expected_root: ReducedHashValue<QM31> = preprocessed_tree.commitment.root().into();
+    let root_hash = preprocessed_tree.commitment.root();
+    let raw_words: [u32; 8] = std::array::from_fn(|i| {
+        u32::from_le_bytes(root_hash.0[i * 4..i * 4 + 4].try_into().unwrap())
+    });
 
-    assert_eq!(
-        expected_root,
-        PRIVACY_RECURSION_CIRCUIT_PREPROCESSED_ROOT.into()
-    );
+    assert_eq!(raw_words, PRIVACY_RECURSION_CIRCUIT_PREPROCESSED_ROOT,);
 }
 
 #[test]

crates/privacy_circuit_verify/src/tests.rs

@@ -36,23 +36,23 @@ cairo-vm = { workspace = true, features = [
 ] }
 
 # stwo cairo
-cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a837f0eaa40db776f39f2677885d7059ced867ba" }
-stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a837f0eaa40db776f39f2677885d7059ced867ba" }
-stwo-cairo-prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a837f0eaa40db776f39f2677885d7059ced867ba" }
-stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a837f0eaa40db776f39f2677885d7059ced867ba" }
-stwo-cairo-common = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a837f0eaa40db776f39f2677885d7059ced867ba" }
+cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" }
+stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" }
+stwo-cairo-prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" }
+stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" }
+stwo-cairo-common = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" }
 
 # stwo circuits
-circuit-cairo-verifier = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "041ec6101ba782aa00e325433929cda6ef15c1b9" }
-circuits-stark-verifier = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "041ec6101ba782aa00e325433929cda6ef15c1b9" }
-circuits = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "041ec6101ba782aa00e325433929cda6ef15c1b9" }
-circuit-serialize = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "041ec6101ba782aa00e325433929cda6ef15c1b9" }
-circuit-prover = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "041ec6101ba782aa00e325433929cda6ef15c1b9" }
-circuit-common = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "041ec6101ba782aa00e325433929cda6ef15c1b9" }
-circuit-verifier = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "041ec6101ba782aa00e325433929cda6ef15c1b9" }
+circuit-cairo-verifier = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "0451681a86cc4755b848d342f6edbf3a240f2627" }
+circuits-stark-verifier = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "0451681a86cc4755b848d342f6edbf3a240f2627" }
+circuits = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "0451681a86cc4755b848d342f6edbf3a240f2627" }
+circuit-serialize = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "0451681a86cc4755b848d342f6edbf3a240f2627" }
+circuit-prover = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "0451681a86cc4755b848d342f6edbf3a240f2627" }
+circuit-common = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "0451681a86cc4755b848d342f6edbf3a240f2627" }
+circuit-verifier = { git = "https://github.com/starkware-libs/stwo-circuits", rev = "0451681a86cc4755b848d342f6edbf3a240f2627" }
 
 # stwo
-stwo = { git = "https://github.com/starkware-libs/stwo", rev = "74951f79", features = ["parallel"] }
+stwo = { git = "https://github.com/starkware-libs/stwo", rev = "5ea05973", features = ["parallel"] }
 
 [dev-dependencies]
 ctor.workspace = true