fix: Patches to cycle_group and cycle_group fuzzer

barretenberg/cpp/CMakePresets.json

@@ -270,6 +270,11 @@
       "binaryDir": "build-fuzzing",
       "cacheVariables": {
         "FUZZING": "ON"
+      },
+      "environment": {
+        "CFLAGS": "-fsanitize-coverage=indirect-calls,trace-pc-guard",
+        "CXXFLAGS": "-fsanitize-coverage=indirect-calls,trace-pc-guard",
+        "LDFLAGS": "-fsanitize-coverage=indirect-calls,trace-pc-guard"
       }
     },
     {
@@ -282,6 +287,11 @@
         "FUZZING": "ON",
         "ENABLE_ASAN": "ON",
         "DISABLE_ASM": "ON"
+      },
+      "environment": {
+        "CFLAGS": "-fsanitize-coverage=func",
+        "CXXFLAGS": "-fsanitize-coverage=func",
+        "LDFLAGS": "-fsanitize-coverage=func"
       }
     },
     {

barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.hpp

@@ -531,7 +531,8 @@ template <typename Curve_> class IPA {
         msm_scalars.emplace_back(a_zero);
         msm_scalars.emplace_back(generator_challenge * a_zero.madd(b_zero, {-opening_claim.opening_pair.evaluation}));
         GroupElement ipa_relation = GroupElement::batch_mul(msm_elements, msm_scalars);
-        ipa_relation.assert_equal(-opening_claim.commitment);
+        auto neg_commitment = -opening_claim.commitment;
+        ipa_relation.assert_equal(neg_commitment);
 
         // TODO(https://github.com/AztecProtocol/barretenberg/issues/1144): Add proper constraints for taking the log of a field_t.
         Fr stdlib_log_poly_length(static_cast<uint256_t>(log_poly_length));
@@ -727,7 +728,8 @@ template <typename Curve_> class IPA {
         msm_scalars.emplace_back(a_zero);
         msm_scalars.emplace_back(generator_challenge * a_zero.madd(b_zero, {-opening_claim.opening_pair.evaluation}));
         GroupElement ipa_relation = GroupElement::batch_mul(msm_elements, msm_scalars);
-        ipa_relation.assert_equal(-opening_claim.commitment);
+        auto neg_commitment = -opening_claim.commitment;
+        ipa_relation.assert_equal(neg_commitment);
 
         return (ipa_relation.get_value() == -opening_claim.commitment.get_value());
     }

barretenberg/cpp/src/barretenberg/common/fuzzer.hpp

@@ -21,7 +21,7 @@
         ASSERT_EQUAL, ASSERT_NOT_EQUAL, SQR_ADD, ASSERT_EQUAL, ASSERT_NOT_EQUAL, SQR_ADD, SUBTRACT_WITH_CONSTRAINT,    \
         DIVIDE_WITH_CONSTRAINTS, SLICE, ASSERT_ZERO, ASSERT_NOT_ZERO, COND_NEGATE, ADD_MULTI, ASSERT_VALID,            \
         COND_SELECT, DOUBLE, RANDOMSEED, SELECT_IF_ZERO, SELECT_IF_EQ, REVERSE, GET_BIT, SET_BIT, SET, INVERT, AND,    \
-        OR, XOR, MODULO, SHL, SHR, ROL, ROR, NOT
+        OR, XOR, MODULO, SHL, SHR, ROL, ROR, NOT, BATCH_MUL, COND_ASSIGN
 
 struct HavocSettings {
     size_t GEN_LLVM_POST_MUTATION_PROB; // Controls frequency of additional mutation after structural ones

barretenberg/cpp/src/barretenberg/examples/join_split/join_split_circuit.cpp

@@ -157,8 +157,11 @@ join_split_outputs join_split_circuit_component(join_split_inputs const& inputs)
 
         // When allowing chaining, ensure propagation is to one's self (and not to some other user).
         group_ct self = input_note_1.owner;
-        allow_chain_1.must_imply(output_note_1.owner == self, "inter-user chaining disallowed");
-        allow_chain_2.must_imply(output_note_2.owner == self, "inter-user chaining disallowed");
+
+        group_ct output_note_1_owner = output_note_1.owner;
+        group_ct output_note_2_owner = output_note_2.owner;
+        allow_chain_1.must_imply(output_note_1_owner == self, "inter-user chaining disallowed");
+        allow_chain_2.must_imply(output_note_2_owner == self, "inter-user chaining disallowed");
 
         // Prevent chaining from a partial claim note.
         is_defi_deposit.must_imply(!allow_chain_1, "cannot chain from a partial claim note");
@@ -190,7 +193,9 @@ join_split_outputs join_split_circuit_component(join_split_inputs const& inputs)
      */
 
     // Verify input notes have the same account public key and account_required.
-    input_note_1.owner.assert_equal(input_note_2.owner, "input note owners don't match");
+    group_ct input_note_1_owner = input_note_1.owner;
+    group_ct input_note_2_owner = input_note_2.owner;
+    input_note_1_owner.assert_equal(input_note_2_owner, "input note owners don't match");
     input_note_1.account_required.assert_equal(input_note_2.account_required,
                                                "input note account_required don't match");
 
@@ -199,7 +204,7 @@ join_split_outputs join_split_circuit_component(join_split_inputs const& inputs)
     inputs.account_private_key.assert_is_not_zero("account private key is zero");
     auto account_public_key = group_ct(grumpkin::g1::affine_one) *
                               group_ct::cycle_scalar::create_from_bn254_scalar(inputs.account_private_key);
-    account_public_key.assert_equal(input_note_1.owner, "account_private_key incorrect");
+    account_public_key.assert_equal(input_note_1_owner, "account_private_key incorrect");
     inputs.account_required.assert_equal(input_note_1.account_required, "account_required incorrect");
 
     // Verify output notes creator_pubkey is either account_public_key.x or 0.

barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp

@@ -330,6 +330,10 @@ template <typename Builder> bool_t<Builder> bool_t<Builder>::operator^(const boo
 template <typename Builder> bool_t<Builder> bool_t<Builder>::operator!() const
 {
     bool_t<Builder> result(*this);
+    if (result.is_constant()) {
+        result.witness_bool = !result.witness_bool;
+        return result;
+    }
     result.witness_inverted = !result.witness_inverted;
     return result;
 }
@@ -441,6 +445,18 @@ bool_t<Builder> bool_t<Builder>::conditional_assign(const bool_t<Builder>& predi
                                                     const bool_t& lhs,
                                                     const bool_t& rhs)
 {
+    if (predicate.is_constant()) {
+        auto result = bool_t(predicate.get_value() ? lhs : rhs);
+        result.set_origin_tag(OriginTag(predicate.get_origin_tag(), lhs.get_origin_tag(), rhs.get_origin_tag()));
+        return result;
+    }
+
+    bool same = lhs.witness_index == rhs.witness_index;
+    bool witness_same = same && lhs.witness_index != IS_CONSTANT && (lhs.witness_inverted == rhs.witness_inverted);
+    bool const_same = same && (lhs.witness_index == IS_CONSTANT) && (lhs.witness_bool == rhs.witness_bool);
+    if (witness_same || const_same) {
+        return lhs;
+    }
     return (predicate && lhs) || (!predicate && rhs);
 }
 
@@ -527,7 +543,8 @@ template <typename Builder> bool_t<Builder> bool_t<Builder>::implies_both_ways(c
 
 template <typename Builder> bool_t<Builder> bool_t<Builder>::normalize() const
 {
-    if (is_constant() || !witness_inverted) {
+    if (is_constant()) {
+        ASSERT(!this->witness_inverted);
         return *this;
     }