missing columns in AIR table for poseidons 24

Author: TomWambsgans

crates/lean_prover/src/common.rs

@@ -13,11 +13,9 @@ pub fn get_base_dims(
     private_memory_len: usize,
     bytecode_ending_pc: usize,
     poseidon_counts: (usize, usize),
-    poseidon_widths: (usize, usize),
     n_rows_table_dot_products: usize,
 ) -> Vec<ColDims<F>> {
     let (n_poseidons_16, n_poseidons_24) = poseidon_counts;
-    let (p16_air_width, p24_air_width) = poseidon_widths;
     let default_p16_row =
         default_poseidon16_air_row(POSEIDON_16_DEFAULT_COMPRESSION, POSEIDON_16_NULL_HASH_PTR);
     let default_p24_row = default_poseidon24_air_row();
@@ -36,10 +34,10 @@ pub fn get_base_dims(
             ColDims::padded(n_poseidons_24, F::from_usize(ZERO_VEC_PTR)), // poseidon24 index b
             ColDims::padded(n_poseidons_24, F::from_usize(POSEIDON_24_NULL_HASH_PTR)), // poseidon24 index res
         ],
-        (0..p16_air_width - 16 * 2)
+        (0..POSEIDON16_AIR_N_COLS - 16 * 2)
             .map(|i| ColDims::padded(n_poseidons_16, default_p16_row[16 + i]))
             .collect::<Vec<_>>(), // rest of poseidon16 table
-        (0..p24_air_width - 24 * 2)
+        (0..POSEIDON24_AIR_N_COLS - 24 - 8)
             .map(|i| ColDims::padded(n_poseidons_24, default_p24_row[24 + i]))
             .collect::<Vec<_>>(), // rest of poseidon24 table
         vec![

crates/lean_prover/src/prove_execution.rs

@@ -167,7 +167,6 @@ pub fn prove_execution(
         private_memory.len(),
         bytecode.ending_pc,
         (n_poseidons_16, n_poseidons_24),
-        (p16_air.width(), p24_air.width()),
         n_rows_table_dot_products,
     );
 
@@ -193,7 +192,7 @@ pub fn prove_execution(
             .iter()
             .map(Vec::as_slice)
             .collect::<Vec<_>>(),
-        p24_columns[24..p24_air.width() - 24]
+        p24_columns[24..p24_air.width() - 8]
             .iter()
             .map(Vec::as_slice)
             .collect::<Vec<_>>(),
@@ -560,7 +559,7 @@ pub fn prove_execution(
     let p24_columns_ref = p24_columns.iter().map(Vec::as_slice).collect::<Vec<_>>();
     let (p24_air_point, p24_evals_to_prove) = info_span!("Poseidon-24 AIR proof")
         .in_scope(|| p24_table.prove_base(&mut prover_state, UNIVARIATE_SKIPS, &p24_columns_ref));
-    let p24_statements = p24_evals_to_prove[24..p24_air.width() - 24]
+    let p24_statements = p24_evals_to_prove[24..p24_air.width() - 8]
         .iter()
         .map(|&e| vec![Evaluation::new(p24_air_point.clone(), e)])
         .collect();

crates/lean_prover/src/verify_execution.rs

@@ -111,7 +111,6 @@ pub fn verify_execution(
         private_memory_len,
         bytecode.ending_pc,
         (n_poseidons_16, n_poseidons_24),
-        (p16_air.width(), p24_air.width()),
         n_rows_table_dot_products,
     );
 
@@ -360,7 +359,7 @@ pub fn verify_execution(
         p16_grand_product_evals_on_indexes_res,
     ));
 
-    let p24_statements = p24_evals_to_verify[24..p24_air.width() - 24]
+    let p24_statements = p24_evals_to_verify[24..p24_air.width() - 8]
         .iter()
         .map(|&e| vec![Evaluation::new(p24_air_point.clone(), e)])
         .collect();