Merge pull request #3543 from o1-labs/mesa/fully-remove-cairo

Fully remove Cairo gates

Author: querolita

CHANGELOG.md

@@ -20,6 +20,11 @@ and this project adheres to
 - Fix lookup selector polynomials to work correctly when chunking is in place
   ([#3541](https://github.com/o1-labs/proof-systems/pull/3541))
 
+### Removed
+
+- Fully remove Cairo gate variants in `GateType`
+  ([#3543](https://github.com/o1-labs/proof-systems/pull/3543))
+
 ## 0.5.0
 
 ### [kimchi](./kimchi)

README.md

@@ -70,7 +70,6 @@ The project is organized in the following way:
 - [poseidon/](poseidon/). Implementation of the poseidon hash function.
 - [signer/](signer/). Interfaces for mina signature schemes.
 - [tools/](tools/). Various tooling to help us work on kimchi.
-- [turshi/](turshi/). A Cairo runner written in rust.
 - [utils/](utils/). Collection of useful functions and traits.
 
 ## Contributing

kimchi/src/circuits/gate.rs

@@ -82,12 +82,6 @@ pub enum GateType {
     EndoMulScalar,
     // Lookup
     Lookup,
-    // TODO: remove Cairo gate types
-    /// Cairo
-    CairoClaim,
-    CairoInstruction,
-    CairoFlags,
-    CairoTransition,
     /// Range check
     RangeCheck0,
     RangeCheck1,
@@ -183,7 +177,6 @@ impl<F: PrimeField> CircuitGate<F> {
             // TODO: implement the verification for the lookup gate
             // See https://github.com/MinaProtocol/mina/issues/14011
             Lookup => Ok(()),
-            CairoClaim | CairoInstruction | CairoFlags | CairoTransition => Ok(()),
             RangeCheck0 | RangeCheck1 => self
                 .verify_witness::<FULL_ROUNDS, G>(row, witness, &index.cs, public)
                 .map_err(|e| e.to_string()),
@@ -282,13 +275,6 @@ impl<F: PrimeField> CircuitGate<F> {
                 // See https://github.com/MinaProtocol/mina/issues/14011
                 vec![]
             }
-            // TODO: remove Cairo gate types
-            GateType::CairoClaim
-            | GateType::CairoInstruction
-            | GateType::CairoFlags
-            | GateType::CairoTransition => {
-                vec![]
-            }
             GateType::RangeCheck0 => {
                 range_check::circuitgates::RangeCheck0::constraint_checks(&env, &mut cache)
             }

kimchi/src/verifier.rs

@@ -95,7 +95,6 @@ impl<
                     EndoMul => Some(&self.verifier_index.emul_comm),
                     EndoMulScalar => Some(&self.verifier_index.endomul_scalar_comm),
                     Poseidon => Some(&self.verifier_index.psm_comm),
-                    CairoClaim | CairoInstruction | CairoFlags | CairoTransition => None,
                     RangeCheck0 => Some(self.verifier_index.range_check0_comm.as_ref()?),
                     RangeCheck1 => Some(self.verifier_index.range_check1_comm.as_ref()?),
                     ForeignFieldAdd => Some(self.verifier_index.foreign_field_add_comm.as_ref()?),