From a4f21f137d5d5d4da96b2cd209fbc00c43114482 Mon Sep 17 00:00:00 2001 From: Shahar Samocha Date: Mon, 13 Jan 2025 11:01:37 +0200 Subject: [PATCH] Rename total_sum to claimed_sum --- .../prover/src/constraint_framework/assert.rs | 8 ++--- .../src/constraint_framework/component.rs | 16 ++++----- .../src/constraint_framework/cpu_domain.rs | 4 +-- .../constraint_framework/expr/evaluator.rs | 10 +++--- .../prover/src/constraint_framework/info.rs | 4 +-- .../prover/src/constraint_framework/logup.rs | 12 +++---- .../prover/src/constraint_framework/point.rs | 4 +-- .../src/constraint_framework/simd_domain.rs | 4 +-- crates/prover/src/examples/blake/air.rs | 8 ++--- .../src/examples/blake/round/constraints.rs | 2 +- crates/prover/src/examples/blake/round/mod.rs | 12 +++---- .../src/examples/blake/scheduler/mod.rs | 10 +++--- crates/prover/src/examples/plonk/mod.rs | 10 +++--- crates/prover/src/examples/poseidon/mod.rs | 12 +++---- .../src/examples/state_machine/components.rs | 8 ++--- .../prover/src/examples/state_machine/gen.rs | 4 +-- .../prover/src/examples/state_machine/mod.rs | 34 +++++++++---------- 17 files changed, 81 insertions(+), 81 deletions(-) diff --git a/crates/prover/src/constraint_framework/assert.rs b/crates/prover/src/constraint_framework/assert.rs index e96725a90..c4a00b42f 100644 --- a/crates/prover/src/constraint_framework/assert.rs +++ b/crates/prover/src/constraint_framework/assert.rs @@ -23,13 +23,13 @@ impl<'a> AssertEvaluator<'a> { trace: &'a TreeVec>>, row: usize, log_size: u32, - total_sum: SecureField, + claimed_sum: SecureField, ) -> Self { Self { trace, col_index: TreeVec::new(vec![0; trace.len()]), row, - logup: LogupAtRow::new(INTERACTION_TRACE_IDX, total_sum, log_size), + logup: LogupAtRow::new(INTERACTION_TRACE_IDX, claimed_sum, log_size), } } } @@ -78,7 +78,7 @@ pub fn assert_constraints( trace_polys: &TreeVec>>, trace_domain: CanonicCoset, assert_func: impl Fn(AssertEvaluator<'_>), - total_sum: SecureField, + claimed_sum: SecureField, ) { let traces = trace_polys.as_ref().map(|tree| { tree.iter() @@ -94,7 +94,7 @@ pub fn assert_constraints( .collect() }); for row in 0..trace_domain.size() { - let eval = AssertEvaluator::new(&traces, row, trace_domain.log_size(), total_sum); + let eval = AssertEvaluator::new(&traces, row, trace_domain.log_size(), claimed_sum); assert_func(eval); } diff --git a/crates/prover/src/constraint_framework/component.rs b/crates/prover/src/constraint_framework/component.rs index 8d21d724a..bb339c381 100644 --- a/crates/prover/src/constraint_framework/component.rs +++ b/crates/prover/src/constraint_framework/component.rs @@ -123,16 +123,16 @@ pub struct FrameworkComponent { trace_locations: TreeVec, info: InfoEvaluator, preprocessed_column_indices: Vec, - total_sum: SecureField, + claimed_sum: SecureField, } impl FrameworkComponent { pub fn new( location_allocator: &mut TraceLocationAllocator, eval: E, - total_sum: SecureField, + claimed_sum: SecureField, ) -> Self { - let info = eval.evaluate(InfoEvaluator::new(eval.log_size(), vec![], total_sum)); + let info = eval.evaluate(InfoEvaluator::new(eval.log_size(), vec![], claimed_sum)); let trace_locations = location_allocator.next_for_structure(&info.mask_offsets); let preprocessed_column_indices = info @@ -166,7 +166,7 @@ impl FrameworkComponent { trace_locations, info, preprocessed_column_indices, - total_sum, + claimed_sum, } } @@ -237,7 +237,7 @@ impl Component for FrameworkComponent { evaluation_accumulator, coset_vanishing(CanonicCoset::new(self.eval.log_size()).coset, point).inverse(), self.eval.log_size(), - self.total_sum, + self.claimed_sum, )); } } @@ -318,7 +318,7 @@ impl ComponentProver for FrameworkComponen trace_domain.log_size(), eval_domain.log_size(), self.eval.log_size(), - self.total_sum, + self.claimed_sum, ); let row_res = self.eval.evaluate(eval).row_res; @@ -347,7 +347,7 @@ impl ComponentProver for FrameworkComponen // Define any `self` values outside the loop to prevent the compiler thinking there is a // `Sync` requirement on `Self`. let self_eval = &self.eval; - let self_total_sum = self.total_sum; + let self_claimed_sum = self.claimed_sum; iter.for_each(|(chunk_idx, mut chunk)| { let trace_cols = trace.as_cols_ref().map_cols(|c| c.as_ref()); @@ -362,7 +362,7 @@ impl ComponentProver for FrameworkComponen trace_domain.log_size(), eval_domain.log_size(), self_eval.log_size(), - self_total_sum, + self_claimed_sum, ); let row_res = self_eval.evaluate(eval).row_res; diff --git a/crates/prover/src/constraint_framework/cpu_domain.rs b/crates/prover/src/constraint_framework/cpu_domain.rs index 4f6e013b0..22b510d3d 100644 --- a/crates/prover/src/constraint_framework/cpu_domain.rs +++ b/crates/prover/src/constraint_framework/cpu_domain.rs @@ -36,7 +36,7 @@ impl<'a> CpuDomainEvaluator<'a> { domain_log_size: u32, eval_log_size: u32, log_size: u32, - total_sum: SecureField, + claimed_sum: SecureField, ) -> Self { Self { trace_eval, @@ -47,7 +47,7 @@ impl<'a> CpuDomainEvaluator<'a> { constraint_index: 0, domain_log_size, eval_domain_log_size: eval_log_size, - logup: LogupAtRow::new(INTERACTION_TRACE_IDX, total_sum, log_size), + logup: LogupAtRow::new(INTERACTION_TRACE_IDX, claimed_sum, log_size), } } } diff --git a/crates/prover/src/constraint_framework/expr/evaluator.rs b/crates/prover/src/constraint_framework/expr/evaluator.rs index bd7576365..f44c08fe6 100644 --- a/crates/prover/src/constraint_framework/expr/evaluator.rs +++ b/crates/prover/src/constraint_framework/expr/evaluator.rs @@ -10,7 +10,7 @@ use crate::core::lookups::utils::Fraction; pub struct FormalLogupAtRow { pub interaction: usize, - pub total_sum: ExtExpr, + pub claimed_sum: ExtExpr, pub fracs: Vec>, pub is_finalized: bool, pub is_first: BaseExpr, @@ -20,16 +20,16 @@ pub struct FormalLogupAtRow { impl FormalLogupAtRow { pub fn new(interaction: usize, log_size: u32) -> Self { - let total_sum_name = "total_sum".to_string(); + let claimed_sum_name = "claimed_sum".to_string(); Self { interaction, // TODO(alont): Should these be Expr::SecureField? - total_sum: ExtExpr::Param(total_sum_name.clone()), + claimed_sum: ExtExpr::Param(claimed_sum_name.clone()), fracs: vec![], is_finalized: true, is_first: BaseExpr::zero(), - cumsum_shift: ExtExpr::Param(total_sum_name) + cumsum_shift: ExtExpr::Param(claimed_sum_name) * BaseExpr::Inv(Box::new(BaseExpr::pow( &BaseExpr::Const(M31(2)), log_size as u128, @@ -207,7 +207,7 @@ mod tests { \ let constraint_1 = (QM31Impl::from_partial_evals([trace_2_column_3_offset_0, trace_2_column_4_offset_0, trace_2_column_5_offset_0, trace_2_column_6_offset_0]) \ - (QM31Impl::from_partial_evals([trace_2_column_3_offset_neg_1, trace_2_column_4_offset_neg_1, trace_2_column_5_offset_neg_1, trace_2_column_6_offset_neg_1])) \ - + (total_sum) * (qm31(32768, 0, 0, 0))) \ + + (claimed_sum) * (qm31(32768, 0, 0, 0))) \ * (intermediate1) \ - (qm31(1, 0, 0, 0));" .to_string(); diff --git a/crates/prover/src/constraint_framework/info.rs b/crates/prover/src/constraint_framework/info.rs index 53ea877c2..e2c6f7095 100644 --- a/crates/prover/src/constraint_framework/info.rs +++ b/crates/prover/src/constraint_framework/info.rs @@ -30,13 +30,13 @@ impl InfoEvaluator { pub fn new( log_size: u32, preprocessed_columns: Vec, - total_sum: SecureField, + claimed_sum: SecureField, ) -> Self { Self { mask_offsets: Default::default(), n_constraints: Default::default(), preprocessed_columns, - logup: LogupAtRow::new(INTERACTION_TRACE_IDX, total_sum, log_size), + logup: LogupAtRow::new(INTERACTION_TRACE_IDX, claimed_sum, log_size), arithmetic_counts: Default::default(), } } diff --git a/crates/prover/src/constraint_framework/logup.rs b/crates/prover/src/constraint_framework/logup.rs index 0d8450f52..82a0da0dc 100644 --- a/crates/prover/src/constraint_framework/logup.rs +++ b/crates/prover/src/constraint_framework/logup.rs @@ -21,7 +21,7 @@ use crate::core::poly::BitReversedOrder; use crate::core::ColumnVec; /// Evaluates constraints for batched logups. -/// These constraint enforce the sum of multiplicity_i / (z + sum_j alpha^j * x_j) = total_sum. +/// These constraint enforce the sum of multiplicity_i / (z + sum_j alpha^j * x_j) = claimed_sum. pub struct LogupAtRow { /// The index of the interaction used for the cumulative sum columns. pub interaction: usize, @@ -39,10 +39,10 @@ impl Default for LogupAtRow { } } impl LogupAtRow { - pub fn new(interaction: usize, total_sum: SecureField, log_size: u32) -> Self { + pub fn new(interaction: usize, claimed_sum: SecureField, log_size: u32) -> Self { Self { interaction, - cumsum_shift: total_sum / BaseField::from_u32_unchecked(1 << log_size), + cumsum_shift: claimed_sum / BaseField::from_u32_unchecked(1 << log_size), fracs: vec![], is_finalized: true, log_size, @@ -167,8 +167,8 @@ impl LogupTraceGenerator { .sum::() .pointwise_sum() }); - let total_sum = SecureField::from_m31_array(coordinate_sums); - let cumsum_shift = total_sum / BaseField::from_u32_unchecked(1 << self.log_size); + let claimed_sum = SecureField::from_m31_array(coordinate_sums); + let cumsum_shift = claimed_sum / BaseField::from_u32_unchecked(1 << self.log_size); let packed_cumsum_shift = PackedSecureField::broadcast(cumsum_shift); last_col_coords.iter_mut().enumerate().for_each(|(i, c)| { @@ -190,7 +190,7 @@ impl LogupTraceGenerator { }) }) .collect_vec(); - (trace, total_sum) + (trace, claimed_sum) } } diff --git a/crates/prover/src/constraint_framework/point.rs b/crates/prover/src/constraint_framework/point.rs index fb2ab0661..f01712f11 100644 --- a/crates/prover/src/constraint_framework/point.rs +++ b/crates/prover/src/constraint_framework/point.rs @@ -23,7 +23,7 @@ impl<'a> PointEvaluator<'a> { evaluation_accumulator: &'a mut PointEvaluationAccumulator, denom_inverse: SecureField, log_size: u32, - total_sum: SecureField, + claimed_sum: SecureField, ) -> Self { let col_index = vec![0; mask.len()]; Self { @@ -31,7 +31,7 @@ impl<'a> PointEvaluator<'a> { evaluation_accumulator, col_index, denom_inverse, - logup: LogupAtRow::new(INTERACTION_TRACE_IDX, total_sum, log_size), + logup: LogupAtRow::new(INTERACTION_TRACE_IDX, claimed_sum, log_size), } } } diff --git a/crates/prover/src/constraint_framework/simd_domain.rs b/crates/prover/src/constraint_framework/simd_domain.rs index ba827cd68..f9a89627e 100644 --- a/crates/prover/src/constraint_framework/simd_domain.rs +++ b/crates/prover/src/constraint_framework/simd_domain.rs @@ -42,7 +42,7 @@ impl<'a> SimdDomainEvaluator<'a> { domain_log_size: u32, eval_log_size: u32, log_size: u32, - total_sum: SecureField, + claimed_sum: SecureField, ) -> Self { Self { trace_eval, @@ -53,7 +53,7 @@ impl<'a> SimdDomainEvaluator<'a> { constraint_index: 0, domain_log_size, eval_domain_log_size: eval_log_size, - logup: LogupAtRow::new(INTERACTION_TRACE_IDX, total_sum, log_size), + logup: LogupAtRow::new(INTERACTION_TRACE_IDX, claimed_sum, log_size), } } } diff --git a/crates/prover/src/examples/blake/air.rs b/crates/prover/src/examples/blake/air.rs index 4707ff3d8..e9bf18577 100644 --- a/crates/prover/src/examples/blake/air.rs +++ b/crates/prover/src/examples/blake/air.rs @@ -209,7 +209,7 @@ impl BlakeComponents { log_size: stmt0.log_size, blake_lookup_elements: all_elements.blake_elements.clone(), round_lookup_elements: all_elements.round_elements.clone(), - total_sum: stmt1.scheduler_claimed_sum, + claimed_sum: stmt1.scheduler_claimed_sum, }, stmt1.scheduler_claimed_sum, ), @@ -223,7 +223,7 @@ impl BlakeComponents { log_size: stmt0.log_size + l, xor_lookup_elements: all_elements.xor_elements.clone(), round_lookup_elements: all_elements.round_elements.clone(), - total_sum: claimed_sum, + claimed_sum, }, claimed_sum, ) @@ -532,7 +532,7 @@ pub fn verify_blake( let components = BlakeComponents::new(&stmt0, &all_elements, &stmt1); // Check that all sums are correct. - let total_sum = stmt1.scheduler_claimed_sum + let claimed_sum = stmt1.scheduler_claimed_sum + stmt1.round_claimed_sums.iter().sum::() + stmt1.xor12_claimed_sum + stmt1.xor9_claimed_sum @@ -541,7 +541,7 @@ pub fn verify_blake( + stmt1.xor4_claimed_sum; // TODO(shahars): Add inputs to sum, and constraint them. - assert_eq!(total_sum, SecureField::zero()); + assert_eq!(claimed_sum, SecureField::zero()); verify( &components.components(), diff --git a/crates/prover/src/examples/blake/round/constraints.rs b/crates/prover/src/examples/blake/round/constraints.rs index f291f44e1..2aeef1bad 100644 --- a/crates/prover/src/examples/blake/round/constraints.rs +++ b/crates/prover/src/examples/blake/round/constraints.rs @@ -15,7 +15,7 @@ pub struct BlakeRoundEval<'a, E: EvalAtRow> { pub xor_lookup_elements: &'a BlakeXorElements, pub round_lookup_elements: &'a RoundElements, // TODO(first): validate logup. - pub _total_sum: SecureField, + pub _claimed_sum: SecureField, pub _log_size: u32, } impl BlakeRoundEval<'_, E> { diff --git a/crates/prover/src/examples/blake/round/mod.rs b/crates/prover/src/examples/blake/round/mod.rs index 824bea873..7878d175d 100644 --- a/crates/prover/src/examples/blake/round/mod.rs +++ b/crates/prover/src/examples/blake/round/mod.rs @@ -18,7 +18,7 @@ pub struct BlakeRoundEval { pub log_size: u32, pub xor_lookup_elements: BlakeXorElements, pub round_lookup_elements: RoundElements, - pub total_sum: SecureField, + pub claimed_sum: SecureField, } impl FrameworkEval for BlakeRoundEval { @@ -33,7 +33,7 @@ impl FrameworkEval for BlakeRoundEval { eval, xor_lookup_elements: &self.xor_lookup_elements, round_lookup_elements: &self.round_lookup_elements, - _total_sum: self.total_sum, + _claimed_sum: self.claimed_sum, _log_size: self.log_size, }; blake_eval.eval() @@ -45,7 +45,7 @@ pub fn blake_round_info() -> InfoEvaluator { log_size: 1, xor_lookup_elements: BlakeXorElements::dummy(), round_lookup_elements: RoundElements::dummy(), - total_sum: SecureField::zero(), + claimed_sum: SecureField::zero(), }; component.evaluate(InfoEvaluator::empty()) } @@ -85,7 +85,7 @@ mod tests { let xor_lookup_elements = BlakeXorElements::dummy(); let round_lookup_elements = RoundElements::dummy(); - let (interaction_trace, total_sum) = generate_interaction_trace( + let (interaction_trace, claimed_sum) = generate_interaction_trace( LOG_SIZE, lookup_data, &xor_lookup_elements, @@ -103,7 +103,7 @@ mod tests { log_size: LOG_SIZE, xor_lookup_elements, round_lookup_elements, - total_sum, + claimed_sum, }; crate::constraint_framework::assert_constraints( &trace_polys, @@ -111,7 +111,7 @@ mod tests { |eval| { component.evaluate(eval); }, - total_sum, + claimed_sum, ) } } diff --git a/crates/prover/src/examples/blake/scheduler/mod.rs b/crates/prover/src/examples/blake/scheduler/mod.rs index 5859e2e76..05a888ac0 100644 --- a/crates/prover/src/examples/blake/scheduler/mod.rs +++ b/crates/prover/src/examples/blake/scheduler/mod.rs @@ -22,7 +22,7 @@ pub struct BlakeSchedulerEval { pub blake_lookup_elements: BlakeElements, pub round_lookup_elements: RoundElements, // TODO(first): validate logup. - pub total_sum: SecureField, + pub claimed_sum: SecureField, } impl FrameworkEval for BlakeSchedulerEval { fn log_size(&self) -> u32 { @@ -46,7 +46,7 @@ pub fn blake_scheduler_info() -> InfoEvaluator { log_size: 1, blake_lookup_elements: BlakeElements::dummy(), round_lookup_elements: RoundElements::dummy(), - total_sum: SecureField::zero(), + claimed_sum: SecureField::zero(), }; component.evaluate(InfoEvaluator::empty()) } @@ -82,7 +82,7 @@ mod tests { let round_lookup_elements = RoundElements::dummy(); let blake_lookup_elements = BlakeElements::dummy(); - let (interaction_trace, total_sum) = gen_interaction_trace( + let (interaction_trace, claimed_sum) = gen_interaction_trace( LOG_SIZE, lookup_data, &round_lookup_elements, @@ -100,7 +100,7 @@ mod tests { log_size: LOG_SIZE, blake_lookup_elements, round_lookup_elements, - total_sum, + claimed_sum, }; crate::constraint_framework::assert_constraints( &trace_polys, @@ -108,7 +108,7 @@ mod tests { |eval| { component.evaluate(eval); }, - total_sum, + claimed_sum, ) } } diff --git a/crates/prover/src/examples/plonk/mod.rs b/crates/prover/src/examples/plonk/mod.rs index ba8fba4b1..769c62fcd 100644 --- a/crates/prover/src/examples/plonk/mod.rs +++ b/crates/prover/src/examples/plonk/mod.rs @@ -32,7 +32,7 @@ relation!(PlonkLookupElements, 2); pub struct PlonkEval { pub log_n_rows: u32, pub lookup_elements: PlonkLookupElements, - pub total_sum: SecureField, + pub claimed_sum: SecureField, pub base_trace_location: TreeSubspan, pub interaction_trace_location: TreeSubspan, pub constants_trace_location: TreeSubspan, @@ -223,7 +223,7 @@ pub fn prove_fibonacci_plonk( // Interaction trace. let span = span!(Level::INFO, "Interaction").entered(); - let (trace, total_sum) = gen_interaction_trace(log_n_rows, &circuit, &lookup_elements.0); + let (trace, claimed_sum) = gen_interaction_trace(log_n_rows, &circuit, &lookup_elements.0); let mut tree_builder = commitment_scheme.tree_builder(); let interaction_trace_location = tree_builder.extend_evals(trace); tree_builder.commit(channel); @@ -234,12 +234,12 @@ pub fn prove_fibonacci_plonk( PlonkEval { log_n_rows, lookup_elements, - total_sum, + claimed_sum, base_trace_location, interaction_trace_location, constants_trace_location, }, - total_sum, + claimed_sum, ); // Sanity check. Remove for production. @@ -253,7 +253,7 @@ pub fn prove_fibonacci_plonk( |mut eval| { component.evaluate(eval); }, - total_sum, + claimed_sum, ); let proof = prove(&[&component], channel, commitment_scheme).unwrap(); diff --git a/crates/prover/src/examples/poseidon/mod.rs b/crates/prover/src/examples/poseidon/mod.rs index 8bcb161a5..98bfc2794 100644 --- a/crates/prover/src/examples/poseidon/mod.rs +++ b/crates/prover/src/examples/poseidon/mod.rs @@ -50,7 +50,7 @@ relation!(PoseidonElements, N_STATE); pub struct PoseidonEval { pub log_n_rows: u32, pub lookup_elements: PoseidonElements, - pub total_sum: SecureField, + pub claimed_sum: SecureField, } impl FrameworkEval for PoseidonEval { fn log_size(&self) -> u32 { @@ -366,7 +366,7 @@ pub fn prove_poseidon( // Interaction trace. let span = span!(Level::INFO, "Interaction").entered(); - let (trace, total_sum) = gen_interaction_trace(log_n_rows, lookup_data, &lookup_elements); + let (trace, claimed_sum) = gen_interaction_trace(log_n_rows, lookup_data, &lookup_elements); let mut tree_builder = commitment_scheme.tree_builder(); tree_builder.extend_evals(trace); tree_builder.commit(channel); @@ -378,9 +378,9 @@ pub fn prove_poseidon( PoseidonEval { log_n_rows, lookup_elements, - total_sum, + claimed_sum, }, - total_sum, + claimed_sum, ); info!("Poseidon component info:\n{}", component); let proof = prove(&[&component], channel, commitment_scheme).unwrap(); @@ -467,7 +467,7 @@ mod tests { // Trace. let (trace0, interaction_data) = gen_trace(LOG_N_ROWS); let lookup_elements = PoseidonElements::dummy(); - let (trace1, total_sum) = + let (trace1, claimed_sum) = gen_interaction_trace(LOG_N_ROWS, interaction_data, &lookup_elements); let traces = TreeVec::new(vec![vec![], trace0, trace1]); @@ -479,7 +479,7 @@ mod tests { |mut eval| { eval_poseidon_constraints(&mut eval, &lookup_elements); }, - total_sum, + claimed_sum, ); } diff --git a/crates/prover/src/examples/state_machine/components.rs b/crates/prover/src/examples/state_machine/components.rs index 3b0cc57fa..8f857063b 100644 --- a/crates/prover/src/examples/state_machine/components.rs +++ b/crates/prover/src/examples/state_machine/components.rs @@ -34,7 +34,7 @@ pub type StateMachineOp1Component = FrameworkComponent>; pub struct StateTransitionEval { pub log_n_rows: u32, pub lookup_elements: StateMachineElements, - pub total_sum: QM31, + pub claimed_sum: QM31, } impl FrameworkEval for StateTransitionEval { @@ -106,7 +106,7 @@ fn state_transition_info() -> InfoEvaluator { let component = StateTransitionEval:: { log_n_rows: 1, lookup_elements: StateMachineElements::dummy(), - total_sum: QM31::zero(), + claimed_sum: QM31::zero(), }; component.evaluate(InfoEvaluator::empty()) } @@ -145,7 +145,7 @@ pub fn track_state_machine_relations( StateTransitionEval::<0> { log_n_rows: x_axis_log_n_rows, lookup_elements: StateMachineElements::dummy(), - total_sum: QM31::zero(), + claimed_sum: QM31::zero(), }, 1 << x_axis_log_n_rows, ) @@ -157,7 +157,7 @@ pub fn track_state_machine_relations( StateTransitionEval::<1> { log_n_rows: y_axis_log_n_rows, lookup_elements: StateMachineElements::dummy(), - total_sum: QM31::zero(), + claimed_sum: QM31::zero(), }, 1 << y_axis_log_n_rows, ) diff --git a/crates/prover/src/examples/state_machine/gen.rs b/crates/prover/src/examples/state_machine/gen.rs index f32db6616..bfc6308b3 100644 --- a/crates/prover/src/examples/state_machine/gen.rs +++ b/crates/prover/src/examples/state_machine/gen.rs @@ -131,12 +131,12 @@ mod tests { let first_state_comb: QM31 = lookup_elements.combine(&first_state); let last_state_comb: QM31 = lookup_elements.combine(&last_state); - let (interaction_trace, total_sum) = + let (interaction_trace, claimed_sum) = gen_interaction_trace(&trace, inc_index, &lookup_elements); assert_eq!(interaction_trace.len(), SECURE_EXTENSION_DEGREE); // One extension column. assert_eq!( - total_sum, + claimed_sum, first_state_comb.inverse() - last_state_comb.inverse() ); } diff --git a/crates/prover/src/examples/state_machine/mod.rs b/crates/prover/src/examples/state_machine/mod.rs index f1587ca05..e437bceb1 100644 --- a/crates/prover/src/examples/state_machine/mod.rs +++ b/crates/prover/src/examples/state_machine/mod.rs @@ -88,14 +88,14 @@ pub fn prove_state_machine( let lookup_elements = StateMachineElements::draw(channel); // Interaction trace. - let (interaction_trace_op0, total_sum_op0) = + let (interaction_trace_op0, claimed_sum_op0) = gen_interaction_trace(&trace_op0, 0, &lookup_elements); - let (interaction_trace_op1, total_sum_op1) = + let (interaction_trace_op1, claimed_sum_op1) = gen_interaction_trace(&trace_op1, 1, &lookup_elements); let stmt1 = StateMachineStatement1 { - x_axis_claimed_sum: total_sum_op0, - y_axis_claimed_sum: total_sum_op1, + x_axis_claimed_sum: claimed_sum_op0, + y_axis_claimed_sum: claimed_sum_op1, }; stmt1.mix_into(channel); @@ -110,18 +110,18 @@ pub fn prove_state_machine( StateTransitionEval { log_n_rows: x_axis_log_rows, lookup_elements: lookup_elements.clone(), - total_sum: total_sum_op0, + claimed_sum: claimed_sum_op0, }, - total_sum_op0, + claimed_sum_op0, ); let component1 = StateMachineOp1Component::new( tree_span_provider, StateTransitionEval { log_n_rows: y_axis_log_rows, lookup_elements, - total_sum: total_sum_op1, + claimed_sum: claimed_sum_op1, }, - total_sum_op1, + claimed_sum_op1, ); let components = StateMachineComponents { @@ -207,16 +207,16 @@ mod tests { let lookup_elements = StateMachineElements::draw(&mut Blake2sChannel::default()); // Interaction trace. - let (interaction_trace, total_sum) = gen_interaction_trace(&trace, 0, &lookup_elements); + let (interaction_trace, claimed_sum) = gen_interaction_trace(&trace, 0, &lookup_elements); let component = StateMachineOp0Component::new( &mut TraceLocationAllocator::default(), StateTransitionEval { log_n_rows, lookup_elements, - total_sum, + claimed_sum, }, - total_sum, + claimed_sum, ); let trace = TreeVec::new(vec![vec![], trace, interaction_trace]); @@ -227,7 +227,7 @@ mod tests { |eval| { component.evaluate(eval); }, - total_sum, + claimed_sum, ); } @@ -253,7 +253,7 @@ mod tests { let last_state_comb: QM31 = interaction_elements.combine(&last_state); assert_eq!( - component.component0.total_sum + component.component1.total_sum, + component.component0.claimed_sum + component.component1.claimed_sum, initial_state_comb.inverse() - last_state_comb.inverse() ); } @@ -319,16 +319,16 @@ mod tests { let trace = gen_trace(log_n_rows, initial_state, 0); let lookup_elements = StateMachineElements::draw(&mut Blake2sChannel::default()); - let (_, total_sum) = gen_interaction_trace(&trace, 0, &lookup_elements); + let (_, claimed_sum) = gen_interaction_trace(&trace, 0, &lookup_elements); let component = StateMachineOp0Component::new( &mut TraceLocationAllocator::default(), StateTransitionEval { log_n_rows, lookup_elements, - total_sum, + claimed_sum, }, - total_sum, + claimed_sum, ); let eval = component.evaluate(ExprEvaluator::new(log_n_rows)); @@ -344,7 +344,7 @@ mod tests { \ let constraint_0 = (QM31Impl::from_partial_evals([trace_2_column_2_offset_0, trace_2_column_3_offset_0, trace_2_column_4_offset_0, trace_2_column_5_offset_0]) \ - (QM31Impl::from_partial_evals([trace_2_column_2_offset_neg_1, trace_2_column_3_offset_neg_1, trace_2_column_4_offset_neg_1, trace_2_column_5_offset_neg_1])) \ - + (total_sum) * (qm31(8388608, 0, 0, 0))\ + + (claimed_sum) * (qm31(8388608, 0, 0, 0))\ ) \ * ((intermediate0) * (intermediate1)) \ - (intermediate1 - (intermediate0));"