Merge branch 'zkvm/keccak/framework' into zkvm/keccak/optimized

o1-labs · Nov 2, 2023 · fde4035 · fde4035
2 parents 461f9f8 + 1b053ac
commit fde4035
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 0 deletions.
diff --git a/kimchi/src/circuits/berkeley_columns.rs b/kimchi/src/circuits/berkeley_columns.rs
@@ -138,6 +138,12 @@ impl<F: Copy, const COLUMNS: usize> ColumnEvaluations<F>
             Index(GateType::Rot64) => self
                 .rot_selector
                 .ok_or(ExprError::MissingIndexEvaluation(col)),
+            Index(GateType::KeccakRound) => self
+                .keccak_round_selector
+                .ok_or(ExprError::MissingIndexEvaluation(col)),
+            Index(GateType::KeccakSponge) => self
+                .keccak_sponge_selector
+                .ok_or(ExprError::MissingIndexEvaluation(col)),
             Permutation(i) => Ok(self.s[i]),
             Coefficient(i) => Ok(self.coefficients[i]),
             LookupKindIndex(LookupPattern::Xor) => self

diff --git a/kimchi/src/tests/keccak.rs b/kimchi/src/tests/keccak.rs
diff --git a/kimchi/src/verifier.rs b/kimchi/src/verifier.rs
@@ -1042,6 +1042,18 @@ where
             .as_ref()
             .map(|_| Column::Index(GateType::Rot64)),
     )
+    .chain(
+        verifier_index
+            .keccak_round_comm
+            .as_ref()
+            .map(|_| Column::Index(GateType::KeccakRound)),
+    )
+    .chain(
+        verifier_index
+            .keccak_sponge_comm
+            .as_ref()
+            .map(|_| Column::Index(GateType::KeccakSponge)),
+    )
     //~~ * lookup commitments
     //~
     .chain(