Merge b11da25 into a1a4d76

AztecProtocol · Jan 2, 2025 · 428a5d4 · 428a5d4
2 parents a1a4d76 + b11da25
commit 428a5d4
Show file tree

Hide file tree

Showing 159 changed files with 13,960 additions and 90 deletions.
diff --git a/.noir-sync-commit b/.noir-sync-commit
@@ -1 +1 @@
-913be5b013323449963d31ab00f521f572cfcd67
+c8a25b52a484115663cccf614bbebe3ca11778f3
diff --git a/avm-transpiler/Cargo.lock b/avm-transpiler/Cargo.lock
diff --git a/barretenberg/cpp/src/barretenberg/world_state_napi/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/world_state_napi/CMakeLists.txt
@@ -5,7 +5,7 @@ file(GLOB_RECURSE SOURCE_FILES *.cpp)
 file(GLOB_RECURSE HEADER_FILES *.hpp *.tcc)
 
 execute_process(
-  COMMAND yarn --frozen-lockfile --prefer-offline
+  COMMAND yarn --immutable
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 

diff --git a/noir/noir-repo/.github/workflows/reports.yml b/noir/noir-repo/.github/workflows/reports.yml
@@ -290,6 +290,9 @@ jobs:
           - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-inner, take_average: true }
           - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-tail, take_average: true  }
           - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-reset, take_average: true }
+          - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-root }
+          #- project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-block-root }
+          - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-block-merge }
           - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-private }
           - project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-public }
 
@@ -389,6 +392,28 @@ jobs:
           mv /home/runner/work/noir/noir/scripts/test_programs/execution_report.sh ./execution_report.sh
           ./execution_report.sh 1 1
 
+      - name: Generate compilation report with averages
+        working-directory: ./test-repo/${{ matrix.project.path }}
+        if: ${{ matrix.project.take_average }}
+        run: |
+          mv /home/runner/work/noir/noir/scripts/test_programs/compilation_report.sh ./compilation_report.sh
+          chmod +x ./compilation_report.sh
+          ./compilation_report.sh 1 1
+      
+      - name: Generate execution report without averages
+        working-directory: ./test-repo/${{ matrix.project.path }}
+        if: ${{ !matrix.project.is_library && !matrix.project.take_average }}
+        run: |
+          mv /home/runner/work/noir/noir/scripts/test_programs/execution_report.sh ./execution_report.sh
+          ./execution_report.sh 1
+
+      - name: Generate execution report with averages
+        working-directory: ./test-repo/${{ matrix.project.path }}
+        if: ${{ !matrix.project.is_library && matrix.project.take_average }}
+        run: |
+          mv /home/runner/work/noir/noir/scripts/test_programs/execution_report.sh ./execution_report.sh
+          ./execution_report.sh 1 1
+
       - name: Move compilation report
         id: compilation_report
         shell: bash

diff --git a/noir/noir-repo/.release-please-manifest.json b/noir/noir-repo/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "1.0.0-beta.0"
+  ".": "1.0.0-beta.1"
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		913be5b013323449963d31ab00f521f572cfcd67
		c8a25b52a484115663cccf614bbebe3ca11778f3