feat: merge-train/barretenberg (#17157)

BEGIN_COMMIT_OVERRIDE
chore: Tube-related clean up (#17064)
chore: cycle group cleanup #5 (#17026)
chore: `field_conversion` clean-up/int audit (#16898)
fix: bigfield veridise audit fixes (#16842)
END_COMMIT_OVERRIDE

Author: AztecBot

barretenberg/acir_tests/bootstrap.sh

@@ -176,9 +176,6 @@ function test_cmds {
   # the prove then verify flow for UltraHonk. This makes sure we have the same circuit for different witness inputs.
   echo "$tests_hash $scripts/bbjs_prove.sh a_6_array"
 
-  # Fold and verify an ACIR program stack using ClientIVC, recursively verify as part of the Tube circuit and produce and verify a Honk proof
-  echo "$tests_hash $scripts/bb_tube_prove.sh a_6_array"
-
   for t in $non_recursive_tests; do
     echo "$tests_hash $scripts/bb_prove.sh $(basename $t)"
   done

barretenberg/acir_tests/scripts/bb_tube_prove.sh

@@ -13,7 +13,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_short_hash="5aa55c9f"
+pinned_short_hash="8ba25b76"
 pinned_civc_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-civc-inputs-${pinned_short_hash}.tar.gz"
 
 function compress_and_upload {

barretenberg/cpp/scripts/test_civc_standalone_vks_havent_changed.sh

@@ -19,7 +19,6 @@
 #include "barretenberg/api/api_msgpack.hpp"
 #include "barretenberg/api/api_ultra_honk.hpp"
 #include "barretenberg/api/file_io.hpp"
-#include "barretenberg/api/prove_tube.hpp"
 #include "barretenberg/bb/cli11_formatter.hpp"
 #include "barretenberg/bbapi/bbapi.hpp"
 #include "barretenberg/bbapi/bbapi_ultra_honk.hpp"
@@ -521,30 +520,6 @@ int parse_and_run_cli_command(int argc, char* argv[])
     msgpack_run_command->add_option(
         "-i,--input", msgpack_input_file, "Input file containing msgpack buffers (defaults to stdin)");
 
-    /***************************************************************************************************************
-     * Subcommand: prove_tube
-     ***************************************************************************************************************/
-    CLI ::App* prove_tube_command = app.add_subcommand("prove_tube", "");
-    prove_tube_command->group(""); // hide from list of subcommands
-    add_verbose_flag(prove_tube_command);
-    add_debug_flag(prove_tube_command);
-    add_crs_path_option(prove_tube_command);
-    add_vk_path_option(prove_tube_command);
-    std::string prove_tube_output_path{ "./target" };
-    add_output_path_option(prove_tube_command, prove_tube_output_path);
-
-    /***************************************************************************************************************
-     * Subcommand: verify_tube
-     ***************************************************************************************************************/
-    CLI::App* verify_tube_command = app.add_subcommand("verify_tube", "");
-    verify_tube_command->group(""); // hide from list of subcommands
-    add_verbose_flag(verify_tube_command);
-    add_debug_flag(verify_tube_command);
-    add_crs_path_option(verify_tube_command);
-    // doesn't make sense that this is set by -o but that's how it was
-    std::string tube_proof_and_vk_path{ "./target" };
-    add_output_path_option(verify_tube_command, tube_proof_and_vk_path);
-
     /***************************************************************************************************************
      * Build the CLI11 App
      ***************************************************************************************************************/
@@ -614,19 +589,6 @@ int parse_and_run_cli_command(int argc, char* argv[])
         if (msgpack_run_command->parsed()) {
             return execute_msgpack_run(msgpack_input_file);
         }
-        // TUBE
-        if (prove_tube_command->parsed()) {
-            // TODO(https://github.com/AztecProtocol/barretenberg/issues/1201): Potentially remove this extra logic.
-            prove_tube(prove_tube_output_path, vk_path);
-        } else if (verify_tube_command->parsed()) {
-            // TODO(https://github.com/AztecProtocol/barretenberg/issues/1322): Remove verify_tube logic.
-            auto tube_public_inputs_path = tube_proof_and_vk_path + "/public_inputs";
-            auto tube_proof_path = tube_proof_and_vk_path + "/proof";
-            auto tube_vk_path = tube_proof_and_vk_path + "/vk";
-            UltraHonkAPI api;
-            return api.verify({ .ipa_accumulation = true }, tube_public_inputs_path, tube_proof_path, tube_vk_path) ? 0
-                                                                                                                    : 1;
-        }
         // AVM
 #ifndef DISABLE_AZTEC_VM
         else if (avm_prove_command->parsed()) {

barretenberg/cpp/src/barretenberg/api/prove_tube.cpp

@@ -177,8 +177,7 @@ bool _verify(const bool ipa_accumulation,
         const std::ptrdiff_t honk_proof_with_pub_inputs_length =
             static_cast<std::ptrdiff_t>(HONK_PROOF_LENGTH + num_public_inputs);
         auto ipa_proof = Proof(complete_proof.begin() + honk_proof_with_pub_inputs_length, complete_proof.end());
-        auto tube_honk_proof =
-            Proof(complete_proof.begin(), complete_proof.begin() + honk_proof_with_pub_inputs_length);
+        auto honk_proof = Proof(complete_proof.begin(), complete_proof.begin() + honk_proof_with_pub_inputs_length);
         verified = verifier.template verify_proof<RollupIO>(complete_proof, ipa_proof).result;
     } else {
         verified = verifier.template verify_proof<DefaultIO>(complete_proof).result;

barretenberg/cpp/src/barretenberg/api/prove_tube.hpp

@@ -22,8 +22,9 @@ UltraCircuitBuilder_<UltraExecutionTraceBlocks> UltraCircuitChecker::prepare_cir
 {
     // Create a copy of the input circuit
     UltraCircuitBuilder_<UltraExecutionTraceBlocks> builder{ builder_in };
-
-    builder.finalize_circuit(/*ensure_nonzero=*/true); // Test the ensure_nonzero gates as well
+    if (!builder.circuit_finalized) { // avoid warnings about finalizing an already finalized circuit
+        builder.finalize_circuit(/*ensure_nonzero=*/true); // Test the ensure_nonzero gates as well
+    }
 
     return builder;
 }

barretenberg/cpp/src/barretenberg/bb/cli.cpp

@@ -303,19 +303,29 @@ void build_constraints(Builder& builder, AcirProgram& program, const ProgramMeta
         bool has_pairing_points =
             has_honk_recursion_constraints || has_civc_recursion_constraints || has_avm_recursion_constraints;
 
-        // TODO(https://github.com/AztecProtocol/barretenberg/issues/1523): Only handle either HONK or CIVC + AVM and
-        // fail fast otherwise
+        // We only handle:
+        // - CIVC recursion constraints (Private Base Rollup)
+        // - HONK + AVM recursion constraints (Public Base Rollup)
+        // - HONK recursion constraints
+        // - AVM recursion constraints
+        // However, as mock protocol circuits use CIVC + AVM (mock Public Base Rollup), instead of throwing an assert we
+        // return a vinfo for the case of CIVC + AVM
         BB_ASSERT_EQ(has_pg_recursion_constraints,
                      false,
                      "Invalid circuit: pg recursion constraints are present with UltraBuilder.");
-        BB_ASSERT_EQ(!(has_honk_recursion_constraints && has_civc_recursion_constraints),
+        BB_ASSERT_EQ(!(has_civc_recursion_constraints && has_honk_recursion_constraints),
                      true,
                      "Invalid circuit: both honk and civc recursion constraints are present.");
         BB_ASSERT_EQ(
             !(has_honk_recursion_constraints || has_civc_recursion_constraints || has_avm_recursion_constraints) ||
                 is_recursive_circuit,
             true,
             "Invalid circuit: honk, civc, or avm recursion constraints present but the circuit is not recursive.");
+        if (has_civc_recursion_constraints && has_avm_recursion_constraints) {
+            vinfo("WARNING: both civc and avm recursion constraints are present. While we support this combination, we "
+                  "expect to see it only in a mock "
+                  "circuit.");
+        }
 
         // Container for data to be propagated
         HonkRecursionConstraintsOutput<Builder> honk_output;

barretenberg/cpp/src/barretenberg/bbapi/bbapi_ultra_honk.cpp

@@ -111,7 +111,7 @@ create_civc_recursion_constraints(Builder& builder,
     }
 
     // Recursively verify CIVC proof
-    auto mega_vk = std::make_shared<VerificationKey>(builder, key_fields);
+    auto mega_vk = std::make_shared<VerificationKey>(key_fields);
     auto mega_vk_and_hash = std::make_shared<RecursiveVKAndHash>(mega_vk, vk_hash);
     ClientIVCRecursiveVerifier::StdlibProof stdlib_proof(proof_fields, input.public_inputs.size());