chore: add goblin ops in add_gates_to_ensure_all_polys_are_non_zero

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

@@ -46,7 +46,6 @@ class ClientIVCTests : public ::testing::Test {
     {
         Builder circuit{ ivc.goblin.op_queue };
         MockCircuits::construct_arithmetic_circuit(circuit, log2_num_gates);
-        MockCircuits::construct_goblin_ecc_op_circuit(circuit);
         return circuit;
     }
 
@@ -114,11 +113,11 @@ TEST_F(ClientIVCTests, Full)
     Builder function_circuit = create_mock_circuit(ivc);
     ivc.initialize(function_circuit);
 
-    auto function_vk = std::make_shared<VerificationKey>(ivc.prover_fold_output.accumulator->proving_key);
-    auto foo_verifier_instance = std::make_shared<VerifierInstance>(function_vk);
     // Accumulate kernel circuit (first kernel mocked as simple circuit since no folding proofs yet)
     Builder kernel_circuit = create_mock_circuit(ivc);
     FoldProof kernel_fold_proof = ivc.accumulate(kernel_circuit);
+    auto function_vk = std::make_shared<VerificationKey>(ivc.prover_fold_output.accumulator->proving_key);
+    auto foo_verifier_instance = std::make_shared<VerifierInstance>(function_vk);
     // This will have a different verification key because we added the recursive merge verification to the circuit
     auto function_vk_with_merge = std::make_shared<VerificationKey>(ivc.prover_instance->proving_key);
     auto kernel_vk = function_vk_with_merge;

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

@@ -247,10 +247,6 @@ GoblinUltraCircuitBuilder create_circuit(const AcirFormat& constraint_system,
     bool has_valid_witness_assignments = !witness.empty();
     acir_format::build_constraints(builder, constraint_system, has_valid_witness_assignments);
 
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/817): Add some arbitrary op gates to ensure the
-    // associated polynomials are non-zero and to give ECCVM and Translator some ECC ops to process.
-    MockCircuits::construct_goblin_ecc_op_circuit(builder);
-
     return builder;
 };
 

barretenberg/cpp/src/barretenberg/dsl/acir_proofs/goblin_acir_composer.cpp

@@ -15,10 +15,6 @@ void GoblinAcirComposer::create_circuit(acir_format::AcirFormat& constraint_syst
 
     // Populate constraints in the builder via the data in constraint_system
     acir_format::build_constraints(builder_, constraint_system, true);
-
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/817): Add some arbitrary op gates to ensure the
-    // associated polynomials are non-zero and to give ECCVM and Translator some ECC ops to process.
-    MockCircuits::construct_goblin_ecc_op_circuit(builder_);
 }
 
 std::vector<bb::fr> GoblinAcirComposer::accumulate_and_prove()

barretenberg/cpp/src/barretenberg/goblin/goblin_recursion.test.cpp

@@ -48,7 +48,6 @@ TEST_F(GoblinRecursionTests, Vanilla)
         // Construct and accumulate a mock function circuit
         GoblinUltraCircuitBuilder function_circuit{ goblin.op_queue };
         MockCircuits::construct_arithmetic_circuit(function_circuit, /*target_log2_dyadic_size=*/8);
-        MockCircuits::construct_goblin_ecc_op_circuit(function_circuit);
         goblin.merge(function_circuit);
         auto function_accum = construct_accumulator(function_circuit);
 

barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp

@@ -69,11 +69,6 @@ class GoblinMockCircuits {
         stdlib::generate_sha256_test_circuit(builder, NUM_ITERATIONS);             // min gates: ~39k
         stdlib::generate_ecdsa_verification_test_circuit(builder, NUM_ITERATIONS); // min gates: ~41k
         stdlib::generate_merkle_membership_test_circuit(builder, NUM_ITERATIONS);  // min gates: ~29k
-
-        // Note: its not clear whether goblin ops will be supported for function circuits initially but currently
-        // UGH can only be used if some op gates are included so for now we'll assume each function circuit has
-        // some.
-        MockCircuits::construct_goblin_ecc_op_circuit(builder);
     }
 
     /**
@@ -92,8 +87,11 @@ class GoblinMockCircuits {
     {
         bb::GoblinUltraCircuitBuilder builder{ op_queue };
 
-        // Add some goblinized ecc ops
-        MockCircuits::construct_goblin_ecc_op_circuit(builder);
+        // Add some goblinized ecc ops: a mul accum op and an equality op
+        auto point = Point::one() * FF::random_element();
+        auto scalar = FF::random_element();
+        builder.queue_ecc_mul_accum(point, scalar);
+        builder.queue_ecc_eq();
 
         op_queue->set_size_data();
 

barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/goblin_ultra_circuit_builder.cpp

@@ -82,6 +82,10 @@ template <typename FF> void GoblinUltraCircuitBuilder_<FF>::add_gates_to_ensure_
     // dummy gate to be read into by previous poseidon internal gate via shifts
     this->create_dummy_gate(
         this->blocks.poseidon_internal, this->zero_idx, this->zero_idx, this->zero_idx, this->zero_idx);
+
+    // add dummy mul accum op and an equality op
+    this->queue_ecc_mul_accum(bb::g1::affine_element::one() * FF::random_element(), FF::random_element());
+    this->queue_ecc_eq();
 }
 
 /**