From a4be58557ea6cfddc2af3efff432a3e556b5dbc5 Mon Sep 17 00:00:00 2001
From: Daniel Lubarov <daniel@lubarov.com>
Date: Thu, 20 May 2021 05:35:16 -0700
Subject: [PATCH] Fix GMiMCGate

---
 src/gates/gmimc.rs         | 7 ++++++-
 src/gates/interpolation.rs | 1 +
 src/plonk_challenger.rs    | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/gates/gmimc.rs b/src/gates/gmimc.rs
index 8263c46a..da8ce670 100644
--- a/src/gates/gmimc.rs
+++ b/src/gates/gmimc.rs
@@ -59,6 +59,11 @@ impl<F: Field, const R: usize> GMiMCGate<F, R> {
     fn wire_cubing_input(i: usize) -> usize {
         2 * W + 3 + i
     }
+
+    /// End of wire indices, exclusive.
+    fn end() -> usize {
+        2 * W + 3 + R
+    }
 }
 
 impl<F: Field, const R: usize> Gate<F> for GMiMCGate<F, R> {
@@ -223,7 +228,7 @@ impl<F: Field, const R: usize> Gate<F> for GMiMCGate<F, R> {
     }
 
     fn num_wires(&self) -> usize {
-        W + 1 + R
+        Self::end()
     }
 
     fn num_constants(&self) -> usize {
diff --git a/src/gates/interpolation.rs b/src/gates/interpolation.rs
index 272c0a05..732f28ba 100644
--- a/src/gates/interpolation.rs
+++ b/src/gates/interpolation.rs
@@ -86,6 +86,7 @@ impl<F: Field + Extendable<D>, const D: usize> InterpolationGate<F, D> {
         start..start + D
     }
 
+    /// End of wire indices, exclusive.
     fn end(&self) -> usize {
         self.start_coeffs() + self.num_points * D
     }
diff --git a/src/plonk_challenger.rs b/src/plonk_challenger.rs
index 67957e13..6a1a8888 100644
--- a/src/plonk_challenger.rs
+++ b/src/plonk_challenger.rs
@@ -304,7 +304,7 @@ mod tests {
         }
 
         let config = CircuitConfig {
-            num_wires: 114,
+            num_wires: 12 + 12 + 3 + 101,
             num_routed_wires: 27,
             ..CircuitConfig::default()
         };