Merge remote-tracking branch 'origin/next' into lw/checkpoint_circuit

Author: LeilaWang

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.87.6"
+  ".": "1.2.1"
 }

.test_patterns.yml

@@ -137,6 +137,10 @@ tests:
   - regex: "src/e2e_p2p/preferred_gossip_network.test.ts"
     owners:
       - *palla
+  - regex: "src/e2e_p2p/gossip_network.test.ts"
+    error_regex: "Block 5 not yet synced"
+    owners:
+      - *palla
   - regex: "src/e2e_fees/private_payments"
     owners:
       - *phil

avm-transpiler/Cargo.lock

@@ -83,7 +83,7 @@ done
 arg_volume_mounts="-v $HOME:$HOME -v cache:/cache"
 
 # If we have an ssh agent running, mount it into container, or if on mac, forward it with socat.
-if [ -n "${SSH_AUTH_SOCK:-}" ]; then
+if [[ "${FORWARD_SSH_AGENT:-0}" == 1 && -n "${SSH_AUTH_SOCK:-}" ]]; then
   # warn "SSH_AUTH_SOCK is set to ${SSH_AUTH_SOCK:-}. Attempting to enable SSH agent forwarding..."
 
   if [ "$uname" == "Darwin" ]; then

aztec-up/bin/.aztec-run

@@ -163,7 +163,9 @@ case ${1:-} in
 
       RESTART_CODES="1 78 79"  # ERROR, ROLLUP_UPGRADE, VERSION_UPGRADE
 
-      echo "Starting supervised Aztec application..."
+      if [ "$SUPERVISED" == "1" ]; then
+        echo "Starting supervised Aztec application..."
+      fi
       set +e
       while true; do
         $(dirname $0)/.aztec-run aztec-start \

aztec-up/bin/aztec

@@ -6,4 +6,6 @@ export ENV_VARS_TO_INJECT="SSH_AUTH_SOCK PXE_PROVER LOG_LEVEL"
 # Appends 8 char hex to avoid container name clashes
 export CONTAINER_NAME=aztec-wallet-$(printf "%08x" $((RANDOM * RANDOM)))
 
+export FORWARD_SSH_AGENT=1
+
 exec $(dirname $0)/.aztec-run aztec-wallet /usr/src/yarn-project/cli-wallet/wallet-entrypoint.sh "$@"

aztec-up/bin/aztec-wallet

@@ -344,6 +344,21 @@
         "CMAKE_BUILD_TYPE": "RelWithAssert"
       }
     },
+    {
+      "name": "fuzzing-noasm",
+      "displayName": "Build with fuzzing and ASM disabled",
+      "description": "Build default preset but with fuzzing enabled and ASM disabled",
+      "inherits": "clang16",
+      "binaryDir": "build-fuzzing-noasm",
+      "cacheVariables": {
+        "FUZZING": "ON",
+        "DISABLE_AZTEC_VM": "ON",
+        "DISABLE_ASM": "ON"
+      },
+      "environment": {
+        "CMAKE_BUILD_TYPE": "RelWithAssert"
+      }
+    },
     {
       "name": "fuzzing-asan",
       "displayName": "Build with fuzzing",

barretenberg/cpp/CMakePresets.json

@@ -33,6 +33,7 @@ The `run.sh` script supports several configuration options:
 - `-t, --timeout <seconds>`: Set maximum fuzzing time (default: 2592000 = 1 month)
 - `-v, --verbose`: Enable verbose output from the fuzzer
 - `-m, --mode <mode>`: Set operation mode - either `fuzzing` or `coverage` (default: fuzzing)
+- `-a, --asm  <mode>`: Enable/disable asm - either `on` or `off` (default: on)
 - `-c, --cpus <count>`: Set number of CPUs for the container (default: 8)
 - `--mem <size>`: Set memory limit for the container (default: 16G)
 - `--show-fuzzers`: List all available fuzzers