From 8af99cba5d5dffd0f06039f423f58f060c84c97e Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Thu, 9 Jun 2022 22:42:48 +0200
Subject: [PATCH] Progress

---
 evm/src/keccak/keccak_stark.rs | 9 ++++++++-
 evm/src/prover.rs              | 8 +++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/evm/src/keccak/keccak_stark.rs b/evm/src/keccak/keccak_stark.rs
index 1af02d7f..56388626 100644
--- a/evm/src/keccak/keccak_stark.rs
+++ b/evm/src/keccak/keccak_stark.rs
@@ -233,14 +233,21 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for KeccakStark<F
     {
         eval_round_flags(vars, yield_constr);
 
-        // Constraint the input registers to be equal throughout the rounds of a permutation.
         for i in 0..2 * INPUT_LIMBS {
             let local_input_limb = vars.local_values[reg_input_limb(i)];
             let next_input_limb = vars.next_values[reg_input_limb(i)];
             let is_last_round = vars.local_values[reg_step(NUM_ROUNDS - 1)];
+            // Constrain the input registers to be equal throughout the rounds of a permutation.
             yield_constr.constraint_transition(
                 (P::ONES - is_last_round) * (next_input_limb - local_input_limb),
             );
+
+            // Verify that the bit decomposition is done correctly.
+            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)]);
+            let expected_input_limb = bits.rev().fold(P::ZEROS, |acc, b| acc.doubles() + b);
+            let is_first_round = vars.local_values[reg_step(0)];
+            yield_constr.constraint(is_first_round * (local_input_limb - expected_input_limb));
         }
 
         // C_partial[x] = xor(A[x, 0], A[x, 1], A[x, 2])
diff --git a/evm/src/prover.rs b/evm/src/prover.rs
index c0cc387a..b83e083b 100644
--- a/evm/src/prover.rs
+++ b/evm/src/prover.rs
@@ -523,7 +523,13 @@ fn check_constraints<'a, F, C, S, const D: usize>(
                 &ctl_vars,
                 &mut consumer,
             );
-            consumer.accumulators()
+            let accs = consumer.accumulators();
+            for a in &accs {
+                if !a.is_zero() {
+                    dbg!(i);
+                }
+            }
+            accs
         })
         .collect::<Vec<_>>();