merge next into merge-train/avm

Author: dbanks12

avm-transpiler/Cargo.lock

@@ -8,3 +8,8 @@ ts/dest
 cmake-build-debug
 *_opt.pil
 bench-out
+
+# Generated code from msgpack schema (run `yarn generate` in ts/)
+rust/barretenberg-rs/src/generated_types.rs
+rust/barretenberg-rs/src/api.rs
+ts/src/cbind/generated/

barretenberg/.gitignore

@@ -8,6 +8,7 @@ function bootstrap_all {
   ./bbup/bootstrap.sh $@
   ./cpp/bootstrap.sh $@
   ./ts/bootstrap.sh $@
+  ./rust/bootstrap.sh $@
   ./acir_tests/bootstrap.sh $@
   ./docs/bootstrap.sh $@
   ./sol/bootstrap.sh $@

barretenberg/bootstrap.sh

@@ -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 . 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"
+            sh -c "mkdir -p ${BACKWARD_PREFIX}/src/backward && cd ${BACKWARD_PREFIX}/src/backward && git init --quiet && (git remote add origin https://github.com/bombela/backward-cpp 2>/dev/null || true) && git fetch --depth 1 origin --quiet 51f0700452cf71c57d43c2d028277b24cde32502 && git reset --quiet --hard FETCH_HEAD"
         SOURCE_DIR ${BACKWARD_PREFIX}/src/backward
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""

barretenberg/cpp/cmake/backward-cpp.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 . 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"
+        sh -c "mkdir -p ${LMDB_PREFIX}/src/lmdb_repo && cd ${LMDB_PREFIX}/src/lmdb_repo && git init --quiet && (git remote add origin https://github.com/LMDB/lmdb.git 2>/dev/null || true) && git fetch --depth 1 origin --quiet ddd0a773e2f44d38e4e31ec9ed81af81f4e4ccbb && git reset --quiet --hard FETCH_HEAD"
     SOURCE_DIR ${LMDB_PREFIX}/src/lmdb_repo
     BUILD_IN_SOURCE YES
     CONFIGURE_COMMAND "" # No configure step

barretenberg/cpp/cmake/lmdb.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 . 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"
+        sh -c "mkdir -p ${MSGPACK_PREFIX}/src/msgpack-c && cd ${MSGPACK_PREFIX}/src/msgpack-c && git init --quiet && (git remote add origin https://github.com/AztecProtocol/msgpack-c.git 2>/dev/null || true) && git fetch --depth 1 origin --quiet 5ee9a1c8c325658b29867829677c7eb79c433a98 && git reset --quiet --hard FETCH_HEAD"
     SOURCE_DIR ${MSGPACK_PREFIX}/src/msgpack-c
     CONFIGURE_COMMAND ""  # No configure step
     BUILD_COMMAND ""      # No build step

barretenberg/cpp/cmake/msgpack.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 . 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"
+    COMMAND sh -c "mkdir -p ${NLOHMANN_JSON_SOURCE_DIR} && cd ${NLOHMANN_JSON_SOURCE_DIR} && git init --quiet && (git remote add origin https://github.com/nlohmann/json.git 2>/dev/null || true) && git fetch --depth 1 origin --quiet ${NLOHMANN_JSON_COMMIT_HASH} && git reset --quiet --hard FETCH_HEAD"
     RESULT_VARIABLE result
 )
 if(result)

barretenberg/cpp/cmake/nlohmann_json.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 . 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"
+    COMMAND sh -c "mkdir -p ${TRACY_SOURCE_DIR} && cd ${TRACY_SOURCE_DIR} && git init --quiet && (git remote add origin https://github.com/wolfpld/tracy.git 2>/dev/null || true) && git fetch --depth 1 origin --quiet ${TRACY_COMMIT_HASH} && git reset --quiet --hard FETCH_HEAD"
     RESULT_VARIABLE result
 )
 if(result)

barretenberg/cpp/cmake/tracy.cmake

@@ -214,7 +214,8 @@ if(WASM)
         barretenberg-debug.wasm
         ${BARRETENBERG_TARGET_OBJECTS}
         $<TARGET_OBJECTS:wasi_objects>
-        $<TARGET_OBJECTS:vm2_stub_objects>
+        # This is an object library, so doesn't need _objects.
+        $<TARGET_OBJECTS:vm2_stub>
     )
 
     target_link_options(

barretenberg/cpp/src/CMakeLists.txt

@@ -21,12 +21,13 @@ namespace bb {
 namespace { // anonymous namespace
 
 /**
- * @brief Compute and write to file a MegaHonk VK for a circuit to be accumulated in the IVC
+ * @brief Compute and write to file a MegaHonk VK for a circuit to be accumulated by Chonk.
  * @note This method differes from write_vk_honk<MegaFlavor> in that it handles kernel circuits which require special
  * treatment (i.e. construction of mock IVC state to correctly complete the kernel logic).
+
  *
- * @param bytecode_path
- * @param witness_path
+ * @param bytecode ACIR bytecode of the circuit
+ * @param output_path Directory to write the VK (or "-" for stdout)
  */
 void write_standalone_vk(std::vector<uint8_t> bytecode, const std::filesystem::path& output_path)
 {
@@ -41,9 +42,19 @@ void write_standalone_vk(std::vector<uint8_t> bytecode, const std::filesystem::p
         write_file(output_path / "vk", response.bytes);
     }
 }
+
+/**
+ * @brief Compute and write the Chonk verification key.
+ *
+ * @details Computes the VK for the hiding kernel circuit. The bytecode parameter should be
+ * the last circuit in the IVC chain (e.g., private-tail in Aztec), as this determines
+ * the public inputs structure of the hiding kernel.
+ *
+ * @param bytecode ACIR bytecode of the final circuit in the IVC chain
+ * @param output_dir Directory to write the VK (or "-" for stdout)
+ */
 void write_chonk_vk(std::vector<uint8_t> bytecode, const std::filesystem::path& output_dir)
 {
-    // compute the hiding kernel's vk
     info("Chonk: computing IVC vk for hiding kernel circuit");
     auto response = bbapi::ChonkComputeIvcVk{ .circuit{ .bytecode = std::move(bytecode) } }.execute();
     const bool output_to_stdout = output_dir == "-";