Fix

evm/src/all_stark.rs

@@ -87,11 +87,11 @@ mod tests {
         let keccak_stark = KeccakStark::<F, D> {
             f: Default::default(),
         };
-        let keccak_rows = (2 * NUM_ROUNDS + 1).next_power_of_two();
+        let keccak_rows = (6 * NUM_ROUNDS + 1).next_power_of_two();
         let keccak_looked_col = 3;
 
         let mut rng = ChaCha8Rng::seed_from_u64(0x6feb51b7ec230f25);
-        let num_inputs = 2;
+        let num_inputs = 6;
         let keccak_inputs = (0..num_inputs)
             .map(|_| [0u64; INPUT_LIMBS].map(|_| rng.gen()))
             .collect_vec();

evm/src/keccak/keccak_stark.rs

@@ -51,14 +51,11 @@ impl<F: RichField + Extendable<D>, const D: usize> KeccakStark<F, D> {
             rows.extend(self.generate_trace_rows_for_perm(*input));
         }
 
-        // Pad rows to power of two.
+        let pad_rows = self.generate_trace_rows_for_perm([0; INPUT_LIMBS]);
-        for i in rows.len()..num_rows {
+        while rows.len() < num_rows {
-            let mut row = [F::ZERO; NUM_REGISTERS];
+            rows.extend(&pad_rows);
-            self.copy_output_to_input(rows[i - 1], &mut row);
-            self.generate_trace_row_for_round(&mut row, i % NUM_ROUNDS);
-            rows.push(row);
         }
-
+        rows.drain(num_rows..);
         rows
     }
 
@@ -400,6 +397,16 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for KeccakStark<F
             let diff = builder.sub_extension(local_input_limb, next_input_limb);
             let constraint = builder.mul_sub_extension(is_last_round, diff, diff);
             yield_constr.constraint_transition(builder, constraint);
+
+            let range = if i % 2 == 0 { 0..32 } else { 32..64 };
+            let bits = range
+                .map(|j| vars.local_values[reg_a((i / 2) / 5, (i / 2) % 5, j)])
+                .collect::<Vec<_>>();
+            let expected_input_limb = reduce_with_powers_ext_circuit(builder, &bits, two);
+            let is_first_round = vars.local_values[reg_step(0)];
+            let diff = builder.sub_extension(local_input_limb, expected_input_limb);
+            let constraint = builder.mul_extension(is_first_round, diff);
+            yield_constr.constraint(builder, constraint);
         }
 
         // C_partial[x] = xor(A[x, 0], A[x, 1], A[x, 2])

evm/src/prover.rs

@@ -523,13 +523,7 @@ fn check_constraints<'a, F, C, S, const D: usize>(
                 &ctl_vars,
                 &mut consumer,
             );
-            let accs = consumer.accumulators();
+            consumer.accumulators()
-            for a in &accs {
-                if !a.is_zero() {
-                    dbg!(i);
-                }
-            }
-            accs
         })
         .collect::<Vec<_>>();