Bump stwo version.

Author: Gilad Chase

Cargo.lock

@@ -28,7 +28,7 @@ serde_json = "1.0.1"
 sonic-rs = "0.3.10"
 starknet-ff = "0.3.7"
 # TODO(ShaharS): take stwo version from the source repository.
-stwo-prover = { git = "https://github.com/starkware-libs/stwo", rev = "bede666c" }
+stwo-prover = { git = "https://github.com/starkware-libs/stwo", rev = "81d1fe3" }
 thiserror = "1.0.63"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"

Cargo.toml

@@ -1,7 +1,6 @@
 use itertools::{chain, Itertools};
 use num_traits::Zero;
 use serde::{Deserialize, Serialize};
-use stwo_prover::constraint_framework::preprocessed_columns::gen_is_first;
 use stwo_prover::constraint_framework::{Relation, TraceLocationAllocator};
 use stwo_prover::core::air::{Component, ComponentProver};
 use stwo_prover::core::backend::simd::SimdBackend;
@@ -136,7 +135,7 @@ impl CairoComponents {
                         interaction_elements.addr_to_value_lookup.clone(),
                         interaction_claim.clone(),
                     ),
-                    (interaction_claim.claimed_sum, None),
+                    interaction_claim.claimed_sum,
                 )
             })
             .collect_vec();
@@ -148,7 +147,7 @@ impl CairoComponents {
                 interaction_elements.addr_to_value_lookup.clone(),
                 interaction_claim.addr_to_value.clone(),
             ),
-            (interaction_claim.addr_to_value.clone().claimed_sum, None),
+            interaction_claim.addr_to_value.clone().claimed_sum,
         );
         Self {
             ret: ret_components,
@@ -254,21 +253,6 @@ pub fn prove_cairo(input: CairoInput) -> Result<CairoProof<Blake2sMerkleHasher>,
     interaction_claim.mix_into(channel);
     tree_builder.commit(channel);
 
-    // Fixed trace.
-    let mut tree_builder = commitment_scheme.tree_builder();
-    let addr_to_value_constant_trace =
-        gen_is_first::<SimdBackend>(claim.addr_to_value.log_sizes()[2][0]);
-    let range_check9_9_constant_trace = gen_is_first::<SimdBackend>(18);
-    tree_builder.extend_evals(
-        [
-            vec![addr_to_value_constant_trace],
-            vec![range_check9_9_constant_trace],
-        ]
-        .into_iter()
-        .flatten(),
-    );
-    tree_builder.commit(channel);
-
     // Component provers.
     let component_builder = CairoComponents::new(&claim, &interaction_elements, &interaction_claim);
     let components = component_builder.provers();

crates/prover/src/cairo_air/mod.rs

@@ -1,13 +1,13 @@
 use itertools::{chain, Itertools};
 use num_traits::One;
 use serde::{Deserialize, Serialize};
-use stwo_prover::constraint_framework::logup::LogupSums;
 use stwo_prover::constraint_framework::{
     EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry,
 };
 use stwo_prover::core::backend::simd::m31::LOG_N_LANES;
 use stwo_prover::core::channel::Channel;
 use stwo_prover::core::fields::m31::M31;
+use stwo_prover::core::fields::qm31::SecureField;
 use stwo_prover::core::fields::secure_column::SECURE_EXTENSION_DEGREE;
 use stwo_prover::core::pcs::TreeVec;
 
@@ -176,15 +176,10 @@ impl Claim {
 #[derive(Clone, Serialize, Deserialize)]
 pub struct InteractionClaim {
     pub log_size: u32,
-    pub logup_sums: LogupSums,
+    pub claimed_sum: SecureField,
 }
 impl InteractionClaim {
     pub fn mix_into(&self, channel: &mut impl Channel) {
-        let (total_sum, claimed_sum) = self.logup_sums;
-        channel.mix_felts(&[total_sum]);
-        if let Some(claimed_sum) = claimed_sum {
-            channel.mix_felts(&[claimed_sum.0]);
-            channel.mix_u64(claimed_sum.1 as u64);
-        }
+        channel.mix_felts(&[self.claimed_sum]);
     }
 }

crates/prover/src/components/add_mul_opcode/component.rs

@@ -11,7 +11,6 @@ mod tests {
     use num_traits::Zero;
     use rand::rngs::SmallRng;
     use rand::{Rng, SeedableRng};
-    use stwo_prover::constraint_framework::preprocessed_columns::gen_is_first;
     use stwo_prover::constraint_framework::{
         FrameworkComponent, FrameworkEval, TraceLocationAllocator,
     };
@@ -111,10 +110,8 @@ mod tests {
                 config, &twiddles,
             );
 
-        // Preprocessed trace.
-        let mut tree_builder = commitment_scheme.tree_builder();
-        let range_check_preprocessed_trace = gen_is_first::<SimdBackend>(LOG_HEIGHT);
-        tree_builder.extend_evals([range_check_preprocessed_trace]);
+        // Preprocessed.
+        let tree_builder = commitment_scheme.tree_builder();
         tree_builder.commit(channel);
 
         let mut tree_builder = commitment_scheme.tree_builder();
@@ -137,7 +134,7 @@ mod tests {
         let component = FrameworkComponent::new(
             trace_location_allocator,
             Eval::new(claim, memory_relation, state_relation),
-            interaction_claim.logup_sums,
+            interaction_claim.claimed_sum,
         );
 
         let trace_polys = commitment_scheme
@@ -151,7 +148,7 @@ mod tests {
             |eval| {
                 component.evaluate(eval);
             },
-            interaction_claim.logup_sums,
+            interaction_claim.claimed_sum,
         )
     }
 }

crates/prover/src/components/add_mul_opcode/mod.rs

@@ -138,20 +138,12 @@ impl InteractionClaimGenerator {
         }
         col2.finalize_col();
 
-        let (trace, total_sum, claimed_sum) = if self.n_calls == 1 << log_size {
-            let (trace, claimed_sum) = logup_gen.finalize_last();
-            (trace, claimed_sum, None)
-        } else {
-            let (trace, [total_sum, claimed_sum]) =
-                logup_gen.finalize_at([(1 << log_size) - 1, self.n_calls - 1]);
-            (trace, total_sum, Some((claimed_sum, self.n_calls - 1)))
-        };
-
+        let (trace, claimed_sum) = logup_gen.finalize_last();
         tree_builder.extend_evals(trace);
 
         InteractionClaim {
             log_size,
-            logup_sums: (total_sum, claimed_sum),
+            claimed_sum,
         }
     }
 }