Merge 9742c6e into e3ea298

AztecProtocol · Sep 17, 2024 · cb461b2 · cb461b2
2 parents e3ea298 + 9742c6e
commit cb461b2
Show file tree

Hide file tree

Showing 35 changed files with 784 additions and 1,372 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -86,7 +86,7 @@ jobs:
               - barretenberg/cpp/pil/**
               - barretenberg/cpp/src/barretenberg/vm/**
               - barretenberg/cpp/src/barretenberg/**/generated/*
-              - barretenberg/cpp/src/barretenberg/client_ivc.{hpp,cpp}
+              - barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.{hpp,cpp}
             non-docs:
               - '!(docs/**)'
             non-misc-ci:

diff --git a/barretenberg/cpp/bootstrap.sh b/barretenberg/cpp/bootstrap.sh
@@ -118,5 +118,5 @@ if [ ! -d ./srs_db/grumpkin ]; then
   # The Grumpkin SRS is generated manually at the moment, only up to a large enough size for tests
   # If tests require more points, the parameter can be increased here. Note: IPA requires
   # dyadic_circuit_size + 1 points so in general this number will be a power of two plus 1
-  cd ./build && cmake --build . --parallel --target grumpkin_srs_gen && ./bin/grumpkin_srs_gen 8193
+  cd ./build && cmake --build . --parallel --target grumpkin_srs_gen && ./bin/grumpkin_srs_gen 32769
 fi
diff --git a/barretenberg/cpp/scripts/benchmark_client_ivc.sh b/barretenberg/cpp/scripts/benchmark_client_ivc.sh
@@ -2,16 +2,7 @@
 set -eu
 
 TARGET=${1:-"client_ivc_bench"}
-
-if [ "$TARGET" = "client_ivc_bench" ]; then
-    BENCHMARK="ClientIVCBench/Full/6"
-elif [ "$TARGET" = "aztec_ivc_bench" ]; then
-    BENCHMARK="AztecIVCBench/FullStructured/6"
-else
-    echo "Error: Unrecognized TARGET '$TARGET'."
-    exit 1
-fi
-
+BENCHMARK="ClientIVCBench/Full/6"
 BUILD_DIR="build-op-count-time"
 FILTER="${BENCHMARK}$" # '$' to ensure only specified bench is run
 

diff --git a/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt
@@ -61,10 +61,9 @@ if (ENABLE_PIC AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   add_subdirectory(barretenberg/world_state_napi)
 endif()
 
-add_subdirectory(barretenberg/aztec_ivc)
+add_subdirectory(barretenberg/client_ivc)
 add_subdirectory(barretenberg/bb)
 add_subdirectory(barretenberg/circuit_checker)
-add_subdirectory(barretenberg/client_ivc)
 add_subdirectory(barretenberg/commitment_schemes)
 add_subdirectory(barretenberg/commitment_schemes_recursion)
 add_subdirectory(barretenberg/common)
@@ -112,10 +111,9 @@ include(GNUInstallDirs)
 message(STATUS "Compiling all-in-one barretenberg archive")
 
 set(BARRETENBERG_TARGET_OBJECTS
-    $<TARGET_OBJECTS:aztec_ivc_objects>
+    $<TARGET_OBJECTS:client_ivc_objects>
     $<TARGET_OBJECTS:commitment_schemes_objects>
     $<TARGET_OBJECTS:common_objects>
-    $<TARGET_OBJECTS:client_ivc_objects>
     $<TARGET_OBJECTS:crypto_aes128_objects>
     $<TARGET_OBJECTS:crypto_blake2s_objects>
     $<TARGET_OBJECTS:crypto_blake3s_objects>

diff --git a/barretenberg/cpp/src/barretenberg/aztec_ivc/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/aztec_ivc/CMakeLists.txt
diff --git a/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp b/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp