chore: kernels start with eq and reset

barretenberg/cpp/scripts/test_civc_standalone_vks_havent_changed.sh

@@ -11,7 +11,7 @@ cd ..
 # - Generate a hash for versioning: sha256sum bb-civc-inputs.tar.gz
 # - Upload the compressed results: aws s3 cp bb-civc-inputs.tar.gz s3://aztec-ci-artifacts/protocol/bb-civc-inputs-[hash(0:8)].tar.gz
 # Note: In case of the "Test suite failed to run ... Unexpected token 'with' " error, need to run: docker pull aztecprotocol/build:3.0
-pinned_civc_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-civc-inputs-ff124547.tar.gz"
+pinned_civc_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-civc-inputs-c373cc52.tar.gz"
 
 # For easily rerunning the inputs generation
 if [[ "${1:-}" == "--update_inputs" ]]; then

barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.cpp

@@ -181,7 +181,6 @@ ClientIVC::PairingPoints ClientIVC::perform_recursive_verification_and_databus_c
  */
 void ClientIVC::complete_kernel_circuit_logic(ClientCircuit& circuit)
 {
-    circuit.is_kernel = true;
 
     // Transcript to be shared shared across recursive verification of the folding of K_{i-1} (kernel), A_{i,1} (app),
     // .., A_{i, n} (app)
@@ -235,8 +234,6 @@ void ClientIVC::accumulate(ClientCircuit& circuit,
     BB_ASSERT_LT(
         num_circuits_accumulated, num_circuits, "ClientIVC: Attempting to accumulate more circuits than expected.");
 
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/1454): Investigate whether is_kernel should be part of
-    // the circuit VK
     if (circuit.is_kernel) {
         // Transcript to be shared across folding of K_{i} (kernel), A_{i+1,1} (app), .., A_{i+1, n} (app)
         accumulation_transcript = std::make_shared<Transcript>();

barretenberg/cpp/src/barretenberg/client_ivc/mock_circuit_producer.hpp

@@ -120,7 +120,7 @@ class PrivateFunctionExecutionMockCircuitProducer {
         // Assume only every second circuit is a kernel, unless force_is_kernel == true
         bool is_kernel = (circuit_counter % 2 == 0) || force_is_kernel;
 
-        ClientCircuit circuit{ ivc.goblin.op_queue };
+        ClientCircuit circuit{ ivc.goblin.op_queue, is_kernel };
         if (is_kernel) {
             GoblinMockCircuits::construct_mock_folding_kernel(circuit); // construct mock base logic
             mock_databus.populate_kernel_databus(circuit);              // populate databus inputs/outputs
@@ -183,18 +183,17 @@ class ClientIVCMockCircuitProducer {
      * only necessary if the structured trace is not in use).
      *
      */
-    static ClientCircuit create_mock_circuit(ClientIVC& ivc, size_t log2_num_gates = 16)
+    static ClientCircuit create_mock_circuit(ClientIVC& ivc, size_t log2_num_gates = 16, bool is_kernel = false)
     {
-        ClientCircuit circuit{ ivc.goblin.op_queue };
+        ClientCircuit circuit{ ivc.goblin.op_queue, is_kernel };
         MockCircuits::construct_arithmetic_circuit(circuit, log2_num_gates, /* include_public_inputs= */ false);
         return circuit;
     }
 
   public:
     ClientCircuit create_next_circuit(ClientIVC& ivc, size_t log2_num_gates = 16, const size_t num_public_inputs = 0)
     {
-        ClientCircuit circuit{ ivc.goblin.op_queue };
-        circuit = create_mock_circuit(ivc, log2_num_gates); // construct mock base logic
+        ClientCircuit circuit = create_mock_circuit(ivc, log2_num_gates, is_kernel); // construct mock base logic
         while (circuit.num_public_inputs() < num_public_inputs) {
             circuit.add_public_variable(13634816); // arbitrary number
         }

barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp

@@ -595,8 +595,11 @@ template <> MegaCircuitBuilder create_circuit(AcirProgram& program, const Progra
 
     auto op_queue = (metadata.ivc == nullptr) ? std::make_shared<ECCOpQueue>() : metadata.ivc->goblin.op_queue;
 
+    // If the incoming program is a kernel, it will have at least one ivc_recursion_constraint.
+    bool is_kernel = !constraints.ivc_recursion_constraints.empty();
+
     // Construct a builder using the witness and public input data from acir and with the goblin-owned op_queue
-    auto builder = MegaCircuitBuilder{ op_queue, witness, constraints.public_inputs, constraints.varnum };
+    auto builder = MegaCircuitBuilder{ op_queue, witness, constraints.public_inputs, constraints.varnum, is_kernel };
 
     // Populate constraints in the builder via the data in constraint_system
     build_constraints(builder, program, metadata);

barretenberg/cpp/src/barretenberg/relations/ecc_op_queue_relation.hpp

@@ -118,4 +118,4 @@ template <typename FF_> class EccOpQueueRelationImpl {
 
 template <typename FF> using EccOpQueueRelation = Relation<EccOpQueueRelationImpl<FF>>;
 
-} // namespace bb
+} // namespace bb

barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp

@@ -51,9 +51,11 @@ template <typename FF> class MegaCircuitBuilder_ : public UltraCircuitBuilder_<M
   public:
     MegaCircuitBuilder_(const size_t size_hint = 0,
                         std::shared_ptr<ECCOpQueue> op_queue_in = std::make_shared<ECCOpQueue>(),
+                        bool is_kernel = false,
                         MergeSettings settings = MergeSettings::PREPEND)
         : UltraCircuitBuilder_<MegaExecutionTraceBlocks>(size_hint)
         , op_queue(std::move(op_queue_in))
+        , is_kernel(is_kernel)
     {
         PROFILE_THIS();
         // Instantiate the subtable to be populated with goblin ecc ops from this circuit. The merge settings indicate
@@ -62,10 +64,18 @@ template <typename FF> class MegaCircuitBuilder_ : public UltraCircuitBuilder_<M
 
         // Set indices to constants corresponding to Goblin ECC op codes
         set_goblin_ecc_op_code_constant_variables();
+
+        // If the incoming circuit is a kernel, start its subtable with an eq and reset operation to ensure a
+        // neighbouring misconfigured subtable cannot affect the current one.
+        if (is_kernel) {
+            queue_ecc_eq();
+        }
     };
 
-    MegaCircuitBuilder_(std::shared_ptr<ECCOpQueue> op_queue_in, MergeSettings settings = MergeSettings::PREPEND)
-        : MegaCircuitBuilder_(0, op_queue_in, settings)
+    MegaCircuitBuilder_(std::shared_ptr<ECCOpQueue> op_queue_in,
+                        bool is_kernel = false,
+                        MergeSettings settings = MergeSettings::PREPEND)
+        : MegaCircuitBuilder_(0, op_queue_in, is_kernel, settings)
     {}
 
     /**
@@ -86,16 +96,24 @@ template <typename FF> class MegaCircuitBuilder_ : public UltraCircuitBuilder_<M
                         auto& witness_values,
                         const std::vector<uint32_t>& public_inputs,
                         size_t varnum,
+                        bool is_kernel = false,
                         MergeSettings merge_settings = MergeSettings::PREPEND)
         : UltraCircuitBuilder_<MegaExecutionTraceBlocks>(/*size_hint=*/0, witness_values, public_inputs, varnum)
         , op_queue(std::move(op_queue_in))
+        , is_kernel(is_kernel)
     {
         // Instantiate the subtable to be populated with goblin ecc ops from this circuit. The merge settings indicate
         // whether the subtable should be prepended or appended to the existing subtables from prior circuits.
         op_queue->initialize_new_subtable(merge_settings);
 
         // Set indices to constants corresponding to Goblin ECC op codes
         set_goblin_ecc_op_code_constant_variables();
+
+        // If the incoming circuit is a kernel, start its subtable with an eq and reset operation to ensure a
+        // neighbouring misconfigured subtable cannot affect the current one.
+        if (is_kernel) {
+            queue_ecc_eq();
+        }
     };
 
     /**