feat: merge-train/barretenberg (#17853)

BEGIN_COMMIT_OVERRIDE
chore.
chore: `Transcript` clean-up pt. 1 (#17772)
feat!: ECDSA audit 9 (#17865)
chore: improve elliptic relation consistency test and docs (#17773)
chore!: add assert_on_curve bool to cycle group constructor (#17774)
chore: remove srs size increment in commitment key (#17608)
vkeys 2
Revert "Merge branch 'merge-train/barretenberg' of
github.com:AztecProtocol/aztec-packages into merge-train/barretenberg"
Revert "vkeys 2"
test(bb): Static Analysis of IPA recursive verifier (#17790)
chore: tweak CLAUDE.md
feat!: Switch to using the new Sumcheck ClientIVC (#17917)
chore: add a test to the ECCVM circuit builder (#17908)
fix: avm_transpiler.h comments (#17829)
chore: circuit builder base cleanup (#17887)
chore: suppress git clone stderr in cmake dependency installation
(#17922)
chore: the great deletion (#17926)
END_COMMIT_OVERRIDE

Author: iakovenkos

.test_patterns.yml

@@ -304,10 +304,6 @@ tests:
     error_regex: "will propagate messages to peers at the same version"
     owners:
       - *palla
-  - regex: "src/client/test/p2p_client.integration_txs.test.ts"
-    error_regex: "Expected number of calls"
-    owners:
-      - *palla
   - regex: "src/client/test/p2p_client.integration_status_handshake.test.ts"
     error_regex: "Expected number of calls"
     owners:

avm-transpiler/avm_transpiler.h

@@ -24,34 +24,38 @@ typedef struct {
 } TranspileResult;
 
 /**
- * Transpiles an ACIR contract artifact file to AVM bytecode
+ * Transpiles a Brillig contract artifact file to AVM bytecode
  *
- * @param input_path Path to input ACIR contract artifact JSON file
+ * @param input_path Path to input Brillig contract artifact JSON file
  * @param output_path Path to output transpiled contract artifact JSON file
- * @return TranspileResult containing success status, output data, or error message
+ * @return TranspileResult containing success status, output data, or error
+ * message
  *
- * The function reads the ACIR contract from input_path, transpiles it to AVM bytecode,
- * and writes the result to output_path. The output data in the result contains
- * the same JSON that was written to the file.
+ * The function reads the Brillig contract from input_path, transpiles it to AVM
+ * bytecode, and writes the result to output_path. The output data in the result
+ * contains the same JSON that was written to the file.
  *
  * Call avm_free_result() to free the returned result.
  */
-TranspileResult avm_transpile_file(const char* input_path, const char* output_path);
+TranspileResult avm_transpile_file(const char* input_path,
+                                   const char* output_path);
 
 /**
- * Transpiles raw ACIR contract artifact bytecode to AVM bytecode
+ * Transpiles raw Brillig contract artifact bytecode to AVM bytecode
  *
- * @param input_data Pointer to input ACIR contract artifact JSON data
+ * @param input_data Pointer to input Brillig contract artifact JSON data
  * @param input_length Length of input data in bytes
- * @return TranspileResult containing success status, output data, or error message
+ * @return TranspileResult containing success status, output data, or error
+ * message
  *
- * The function takes raw JSON bytes representing an ACIR contract artifact,
+ * The function takes raw JSON bytes representing a Brillig contract artifact,
  * transpiles it to AVM bytecode, and returns the transpiled contract artifact
  * as JSON bytes in the result.
  *
  * Call avm_free_result() to free the returned result.
  */
-TranspileResult avm_transpile_bytecode(const unsigned char* input_data, size_t input_length);
+TranspileResult avm_transpile_bytecode(const unsigned char* input_data,
+                                       size_t input_length);
 
 /**
  * Frees memory allocated by a TranspileResult
@@ -67,4 +71,4 @@ void avm_free_result(TranspileResult* result);
 }
 #endif
 
-#endif /* AVM_TRANSPILER_H */
+#endif /* AVM_TRANSPILER_H */

barretenberg/cpp/CLAUDE.md

@@ -4,7 +4,7 @@ THE PROJECT ROOT IS AT TWO LEVELS ABOVE THIS FOLDER. Typically, the repository i
 
 Run ./bootstrap.sh at the top-level to be sure the repo fully builds.
 Bootstrap scripts can be called with relative paths e.g. ../barretenberg/bootstrap.sh
-You can use DISABLE_AVM=1 to bootstrap things generally.
+You can use DISABLE_AZTEC_VM=1 to bootstrap things generally.
 
 # Working on modules:
 
@@ -15,7 +15,7 @@ The core proving system library. Focus development is in barretenberg/cpp.
 Bootstrap modes:
 - `./bootstrap.sh` => full build, needed for other components
 - `./bootstrap.sh build` => standard build
-- `DISABLE_AVM=1 ./bootstrap.sh build_native` => quick build without AVM. Good for verifying compilation works. Needed to build ts/
+- `DISABLE_AZTEC_VM=1 ./bootstrap.sh build_native` => quick build without AVM. Good for verifying compilation works. Needed to build ts/
 Development commands:
 - cmake --preset build-no-avm
   cd build-no-avm

barretenberg/cpp/bootstrap.sh

@@ -284,8 +284,8 @@ function test_cmds {
     # Mostly arbitrary set that touches lots of the code.
     declare -A asan_tests=(
       ["commitment_schemes_recursion_tests"]="IPARecursiveTests.AccumulationAndFullRecursiveVerifier"
-      ["client_ivc_tests"]="ClientIVCTests.BasicStructured"
-      ["ultra_honk_tests"]="MegaHonkTests/0.BasicStructured"
+      ["client_ivc_tests"]="ClientIVCTests.Basic"
+      ["ultra_honk_tests"]="MegaHonkTests/0.Basic"
       ["dsl_tests"]="AcirHonkRecursionConstraint/1.TestBasicDoubleHonkRecursionConstraints"
     )
     # If in amd64 CI, iterate asan_tests, creating a gtest invocation for each.

barretenberg/cpp/cmake/backward-cpp.cmake

@@ -13,7 +13,7 @@ if(ENABLE_STACKTRACES)
         PREFIX ${BACKWARD_PREFIX}
         # We need to go through some hoops to do a shallow clone of a fixed commit (as opposed to a tag).
         DOWNLOAD_COMMAND
-            sh -c "mkdir -p ${BACKWARD_PREFIX}/src/backward && cd ${BACKWARD_PREFIX}/src/backward && git init . && (git remote add origin https://github.com/bombela/backward-cpp || true) && git fetch --depth 1 origin 51f0700452cf71c57d43c2d028277b24cde32502 && git checkout FETCH_HEAD"
+            sh -c "mkdir -p ${BACKWARD_PREFIX}/src/backward && cd ${BACKWARD_PREFIX}/src/backward && git init . 2>/dev/null && (git remote add origin https://github.com/bombela/backward-cpp 2>/dev/null || true) && git fetch --depth 1 origin 51f0700452cf71c57d43c2d028277b24cde32502 2>/dev/null && git checkout FETCH_HEAD 2>/dev/null"
         SOURCE_DIR ${BACKWARD_PREFIX}/src/backward
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""

barretenberg/cpp/cmake/lmdb.cmake

@@ -11,7 +11,7 @@ ExternalProject_Add(
     PREFIX ${LMDB_PREFIX}
     # We need to go through some hoops to do a shallow clone of a fixed commit (as opposed to a tag).
     DOWNLOAD_COMMAND
-        sh -c "mkdir -p ${LMDB_PREFIX}/src/lmdb_repo && cd ${LMDB_PREFIX}/src/lmdb_repo && git init . && (git remote add origin https://github.com/LMDB/lmdb.git || true) && git fetch --depth 1 origin ddd0a773e2f44d38e4e31ec9ed81af81f4e4ccbb && git checkout FETCH_HEAD"
+        sh -c "mkdir -p ${LMDB_PREFIX}/src/lmdb_repo && cd ${LMDB_PREFIX}/src/lmdb_repo && git init . 2>/dev/null && (git remote add origin https://github.com/LMDB/lmdb.git 2>/dev/null || true) && git fetch --depth 1 origin ddd0a773e2f44d38e4e31ec9ed81af81f4e4ccbb 2>/dev/null && git checkout FETCH_HEAD 2>/dev/null"
     SOURCE_DIR ${LMDB_PREFIX}/src/lmdb_repo
     BUILD_IN_SOURCE YES
     CONFIGURE_COMMAND "" # No configure step

barretenberg/cpp/cmake/msgpack.cmake

@@ -9,7 +9,7 @@ ExternalProject_Add(
     PREFIX ${MSGPACK_PREFIX}
     # We need to go through some hoops to do a shallow clone of a fixed commit (as opposed to a tag).
     DOWNLOAD_COMMAND
-        sh -c "mkdir -p ${MSGPACK_PREFIX}/src/msgpack-c && cd ${MSGPACK_PREFIX}/src/msgpack-c && git init . && (git remote add origin https://github.com/AztecProtocol/msgpack-c.git || true) && git fetch --depth 1 origin 5ee9a1c8c325658b29867829677c7eb79c433a98 && git checkout FETCH_HEAD"
+        sh -c "mkdir -p ${MSGPACK_PREFIX}/src/msgpack-c && cd ${MSGPACK_PREFIX}/src/msgpack-c && git init . 2>/dev/null && (git remote add origin https://github.com/AztecProtocol/msgpack-c.git 2>/dev/null || true) && git fetch --depth 1 origin 5ee9a1c8c325658b29867829677c7eb79c433a98 2>/dev/null && git checkout FETCH_HEAD 2>/dev/null"
     SOURCE_DIR ${MSGPACK_PREFIX}/src/msgpack-c
     CONFIGURE_COMMAND ""  # No configure step
     BUILD_COMMAND ""      # No build step

barretenberg/cpp/cmake/nlohmann_json.cmake

@@ -3,7 +3,7 @@ set(NLOHMANN_JSON_SOURCE_DIR "${CMAKE_BINARY_DIR}/_deps/nlohmann_json-src")
 set(NLOHMANN_JSON_COMMIT_HASH "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03")
 
 execute_process(
-    COMMAND sh -c "mkdir -p ${NLOHMANN_JSON_SOURCE_DIR} && cd ${NLOHMANN_JSON_SOURCE_DIR} && git init . && (git remote add origin https://github.com/nlohmann/json.git || true) && git fetch --depth 1 origin ${NLOHMANN_JSON_COMMIT_HASH} && git checkout FETCH_HEAD"
+    COMMAND sh -c "mkdir -p ${NLOHMANN_JSON_SOURCE_DIR} && cd ${NLOHMANN_JSON_SOURCE_DIR} && git init . 2>/dev/null && (git remote add origin https://github.com/nlohmann/json.git 2>/dev/null || true) && git fetch --depth 1 origin ${NLOHMANN_JSON_COMMIT_HASH} 2>/dev/null && git checkout FETCH_HEAD 2>/dev/null"
     RESULT_VARIABLE result
 )
 if(result)

barretenberg/cpp/cmake/tracy.cmake

@@ -3,7 +3,7 @@ set(TRACY_SOURCE_DIR "${CMAKE_BINARY_DIR}/_deps/tracy-src")
 set(TRACY_COMMIT_HASH "5d542dc09f3d9378d005092a4ad446bd405f819a")
 
 execute_process(
-    COMMAND sh -c "mkdir -p ${TRACY_SOURCE_DIR} && cd ${TRACY_SOURCE_DIR} && git init . && (git remote add origin https://github.com/wolfpld/tracy.git || true) && git fetch --depth 1 origin ${TRACY_COMMIT_HASH} && git checkout FETCH_HEAD"
+    COMMAND sh -c "mkdir -p ${TRACY_SOURCE_DIR} && cd ${TRACY_SOURCE_DIR} && git init . 2>/dev/null && (git remote add origin https://github.com/wolfpld/tracy.git 2>/dev/null || true) && git fetch --depth 1 origin ${TRACY_COMMIT_HASH} 2>/dev/null && git checkout FETCH_HEAD 2>/dev/null"
     RESULT_VARIABLE result
 )
 if(result)

barretenberg/cpp/scripts/audit/audit_summary.json

@@ -120,17 +120,6 @@
       "not started": 24
     }
   },
-  "protogalaxy": {
-    "internal": {
-      "not started": 9
-    },
-    "external_1": {
-      "not started": 9
-    },
-    "external_2": {
-      "not started": 9
-    }
-  },
   "relations": {
     "internal": {
       "not started": 53