Merge branch 'master' into spy/next-canary-deployment + PR Fixes

AztecProtocol · Oct 11, 2023 · bbae4f7 · bbae4f7
2 parents 8798cf4 + d9c458d
commit bbae4f7
Show file tree

Hide file tree

Showing 305 changed files with 15,401 additions and 2,334 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -955,9 +955,20 @@ jobs:
           name: "Benchmark"
           command: cond_run_script end-to-end ./scripts/run_tests_local benchmarks/bench_publish_rollup.test.ts
           environment:
-            {
-              DEBUG: "aztec:benchmarks:*,aztec:sequencer,aztec:world_state,aztec:merkle_trees",
-            }
+            DEBUG: "aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees"
+
+  bench-process-history:
+    machine:
+      image: ubuntu-2204:2023.07.2
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Benchmark"
+          command: cond_run_script end-to-end ./scripts/run_tests_local benchmarks/bench_process_history.test.ts
+          environment:
+            DEBUG: "aztec:benchmarks:*,aztec:sequencer,aztec:sequencer:*,aztec:world_state,aztec:merkle_trees"
 
   build-docs:
     machine:
@@ -1331,6 +1342,7 @@ workflows:
       - guides-sample-dapp: *e2e_test
       - guides-up-quick-start: *e2e_test
       - bench-publish-rollup: *e2e_test
+      - bench-process-history: *e2e_test
 
       - e2e-end:
           requires:
@@ -1368,12 +1380,13 @@ workflows:
             - guides-dapp-testing
             - guides-sample-dapp
             - guides-up-quick-start
-            - bench-publish-rollup
           <<: *defaults
 
       - bench-summary:
           requires:
             - e2e-end
+            - bench-publish-rollup
+            - bench-process-history
           <<: *defaults
 
         # Deploy under canary tag
@@ -1392,6 +1405,7 @@ workflows:
             - deploy-dockerhub-canary
           <<: *deploy_defaults
 
+      # Run canary tests
       - canary-uniswap-test:
           requires:
             - build-deployment-canary
@@ -1413,7 +1427,7 @@ workflows:
             - canary-browser-test
             - canary-cli-test
 
-        # Deployment and Canary tests
+        # Production deployment
       - deploy-dockerhub:
           requires:
             - canary-end

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,5 +1,5 @@
 {
-  ".": "0.8.8",
-  "barretenberg": "0.8.8",
-  "barretenberg/ts": "0.8.8"
+  ".": "0.8.9",
+  "barretenberg": "0.8.9",
+  "barretenberg/ts": "0.8.9"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [0.8.9](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.8.8...aztec-packages-v0.8.9) (2023-10-10)
+
+
+### Features
+
+* Auto-recompile the boxes and fix broken frontend CompleteAddress import ([#2727](https://github.com/AztecProtocol/aztec-packages/issues/2727)) ([4ec4ea0](https://github.com/AztecProtocol/aztec-packages/commit/4ec4ea061e2d003da905d6c2026608b41cdca044))
+
+
+### Bug Fixes
+
+* Default export in noir-version ([#2757](https://github.com/AztecProtocol/aztec-packages/issues/2757)) ([6ff7bed](https://github.com/AztecProtocol/aztec-packages/commit/6ff7bed1722f8e7afa4b4c495216ca20ea47f42a))
+
+
+### Documentation
+
+* Add preview image ([#2759](https://github.com/AztecProtocol/aztec-packages/issues/2759)) ([45597af](https://github.com/AztecProtocol/aztec-packages/commit/45597af2a75ffeb8ecd91028f30f159910821673))
+
 ## [0.8.8](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.8.7...aztec-packages-v0.8.8) (2023-10-09)
 
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.8.8 x-release-please-version
+v0.8.9 x-release-please-version
diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 9de42a37415f8a3f1bd7de3ec460b1b299dd15fa
-	parent = 4b3f1aa8957af96389ed0e85aba6a99baa21e9ab
+	commit = 3fc459b3d2748f43a9b432528c7bdd84c8e515c9
+	parent = c1cd7ea7e8faed4ce491cad52777afbbe7bae187
 	method = merge
 	cmdver = 0.4.6
diff --git a/barretenberg/CHANGELOG.md b/barretenberg/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.8.9](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.8.8...barretenberg-v0.8.9) (2023-10-10)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
 ## [0.8.8](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.8.7...barretenberg-v0.8.8) (2023-10-09)
 
 

diff --git a/barretenberg/VERSION b/barretenberg/VERSION
@@ -1 +1 @@
-v0.8.8 x-release-please-version
+v0.8.9 x-release-please-version
diff --git a/barretenberg/cpp/.clangd b/barretenberg/cpp/.clangd
@@ -1,4 +1,4 @@
-CompileFlags:                     # Tweak the parse settings
+CompileFlags: # Tweak the parse settings
   Remove: -fconstexpr-ops-limit=*
 ---
 # Applies all barretenberg source files
@@ -42,7 +42,7 @@ Diagnostics:
       - misc-non-private-member-variables-in-classes
       - cppcoreguidelines-non-private-member-variables-in-classes
       # We have many `for` loops that violate this part of the bounds safety profile
-      - cppcoreguidelines-pro-bounds-constant-array-index 
+      - cppcoreguidelines-pro-bounds-constant-array-index
       # Large diff; we often `use` an entire namespace.
       - google-build-using-namespace
       # Large diff
@@ -59,6 +59,8 @@ Diagnostics:
       - readability-function-cognitive-complexity
       # It is often nicer to not be explicit
       - google-explicit-constructor
+      # Not honouring.
+      - cppcoreguidelines-owning-memory
 
 --- # this divider is necessary
 # Disable some checks for Google Test/Bench
@@ -69,5 +71,4 @@ Diagnostics:
     # these checks get triggered by the Google macros
     Remove:
       - cppcoreguidelines-avoid-non-const-global-variables
-      - cppcoreguidelines-owning-memory
-      - cppcoreguidelines-special-member-functions
+      - cppcoreguidelines-special-member-functions
diff --git a/barretenberg/cpp/CMakeLists.txt b/barretenberg/cpp/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24)
 project(
     Barretenberg
     DESCRIPTION "BN254 elliptic curve library, and PLONK SNARK prover"
-    VERSION 0.8.8 # x-release-please-version
+    VERSION 0.8.9 # x-release-please-version
     LANGUAGES CXX C
 )
 # Insert version into `bb` config file

diff --git a/barretenberg/cpp/CMakePresets.json b/barretenberg/cpp/CMakePresets.json
@@ -182,6 +182,35 @@
       "cacheVariables": {
         "MULTITHREADING": "ON"
       }
+    },
+    {
+      "name": "xray-1thread",
+      "displayName": "Build with single-threaded XRay Profiling",
+      "description": "Build with Clang and enable single-threaded LLVM XRay for profiling",
+      "generator": "Unix Makefiles",
+      "inherits": "clang16",
+      "environment": {
+        "CFLAGS": "-fxray-instrument -fxray-instruction-threshold=10",
+        "CXXFLAGS": "-fxray-instrument -fxray-instruction-threshold=10",
+        "LDFLAGS": "-fxray-instrument -fxray-instruction-threshold=10"
+      },
+      "cacheVariables": {
+        "MULTITHREADING": "OFF"
+      },
+      "binaryDir": "build-xray-1thread"
+    },
+    {
+      "name": "xray",
+      "displayName": "Build with multi-threaded XRay Profiling",
+      "description": "Build with Clang and enable multi-threaded LLVM XRay for profiling",
+      "generator": "Unix Makefiles",
+      "inherits": "clang16",
+      "environment": {
+        "CFLAGS": "-fxray-instrument -fxray-instruction-threshold=10",
+        "CXXFLAGS": "-fxray-instrument -fxray-instruction-threshold=10",
+        "LDFLAGS": "-fxray-instrument -fxray-instruction-threshold=10"
+      },
+      "binaryDir": "build-xray"
     }
   ],
   "buildPresets": [
@@ -273,6 +302,16 @@
       "inheritConfigureEnvironment": true,
       "jobs": 0,
       "targets": ["barretenberg.wasm"]
+    },
+    {
+      "name": "xray-1thread",
+      "configurePreset": "xray-1thread",
+      "inherits": "default"
+    },
+    {
+      "name": "xray",
+      "configurePreset": "xray",
+      "inherits": "default"
     }
   ],
   "testPresets": [

diff --git a/barretenberg/cpp/scripts/collect_profile_information.sh b/barretenberg/cpp/scripts/collect_profile_information.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+set -eu
+
+PRESET=${1:-xray-1thread} # can also be 'xray'
+ONLY_PROCESS=${2:-}
+
+# Move above script dir.
+cd $(dirname $0)/..
+
+# Configure and build with xray preset.
+cmake --preset $PRESET
+cmake --build --preset $PRESET
+
+cd build-$PRESET
+
+if [ -z "$ONLY_PROCESS" ]; then
+  # Clear old profile data.
+  rm -f xray-log.honk_bench_main_simple.*
+
+  # Run benchmark with profiling.
+  XRAY_OPTIONS="patch_premain=true xray_mode=xray-basic verbosity=1" ./bin/honk_bench_main_simple
+fi
+
+function shorten_cpp_names() {
+  NO_TEMP='s/<[^<>;]+>//g;'
+  sed -E '# Multiple rounds of template removal (crude but simple).
+          '"$NO_TEMP $NO_TEMP $NO_TEMP $NO_TEMP $NO_TEMP $NO_TEMP"'
+          # Remove problematic trailing const.
+          s/ const;/;/g;
+          # Parameter removal.
+          s/\([^();]*\)/()/g;
+          # Return value removal.
+          s/;[^; ]+ /;/g;
+          # Remove namespaces.
+          s/[a-zA-Z_][a-zA-Z0-9_]*:://g;
+         '
+}
+
+# Process benchmark file.
+llvm-xray-16 stack xray-log.honk_bench_main_simple.* \
+  --instr_map=./bin/honk_bench_main_simple --stack-format=flame --aggregate-threads --aggregation-type=time --all-stacks \
+  | node ../scripts/llvm_xray_stack_flame_corrector.js \
+  | shorten_cpp_names \
+  | ../scripts/flamegraph.pl > xray.svg
+echo "Profiling complete, now you can do e.g. 'scp mainframe:`readlink -f xray.svg` .' on a local terminal and open the SVG in a browser."
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		v0.8.8 x-release-please-version
		v0.8.9 x-release-please-version