Merge branch 'next' into nikita/block-txs-request

Author: deffrian

.github/workflows/ci3.yml

@@ -136,6 +136,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Run Network Scenarios
+        timeout-minutes: 350
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/nightly-docs-release.yml

@@ -139,6 +139,15 @@ jobs:
           chmod +x /tmp/bb-bin/bb
           echo "BB_PATH=/tmp/bb-bin" >> $GITHUB_ENV
 
+      - name: Build noir packages
+        run: |
+          # Initialize noir submodule (required for yarn-project portal dependencies)
+          git submodule update --init --recursive noir/noir-repo
+          # Build noir JS packages (creates noir/packages/ directory needed by yarn-project)
+          cd noir
+          ./bootstrap.sh install_deps
+          ./bootstrap.sh build_packages
+
       - name: Build aztec CLI
         working-directory: ./yarn-project
         run: |

.github/workflows/release-please.yml

@@ -187,6 +187,15 @@ jobs:
           ./bootstrap.sh build_native
           echo "BB_PATH=$(pwd)/build/bin" >> $GITHUB_ENV
 
+      - name: Build noir packages
+        run: |
+          # Initialize noir submodule (required for yarn-project portal dependencies)
+          git submodule update --init --recursive noir/noir-repo
+          # Build noir JS packages (creates noir/packages/ directory needed by yarn-project)
+          cd noir
+          ./bootstrap.sh install_deps
+          ./bootstrap.sh build_packages
+
       - name: Build aztec CLI
         working-directory: ./yarn-project
         run: |

.github/workflows/test-network-scenarios.yml

@@ -32,12 +32,12 @@ concurrency:
 jobs:
   deploy-and-test:
     runs-on: ubuntu-latest
-    timeout-minutes: 360
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
       - name: Run Network Scenarios
+        timeout-minutes: 350
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.vscode/launch.json

@@ -36,7 +36,7 @@
       "name": "Debug chonk transaction",
       "type": "lldb",
       "request": "launch",
-      "program": "${workspaceFolder}/barretenberg/cpp/build-debug-fast-no-avm/bin/bb",
+      "program": "${workspaceFolder}/barretenberg/cpp/build-debug/bin/bb",
       "args": ["prove", "--scheme", "chonk", "--output_path", ".", "--ivc_inputs_path", "ivc-inputs.msgpack", "--print_bench"],
       "cwd": "${workspaceFolder}/yarn-project/end-to-end/example-app-ivc-inputs-out/ecdsar1+transfer_0_recursions+sponsored_fpc",
       "initCommands": [
@@ -48,7 +48,7 @@
       "name": "Debug acir test",
       "type": "lldb",
       "request": "launch",
-      "program": "${workspaceFolder}/barretenberg/cpp/build-debug-fast-no-avm/bin/bb",
+      "program": "${workspaceFolder}/barretenberg/cpp/build-debug-fast/bin/bb",
       "args": ["prove", "--scheme", "ultra_honk", "--output_path", ".", "-b", "./target/program.json", "--write_vk"],
       // Can replace with any directory containing target/program.json and target/witness.gz
       "cwd": "${workspaceFolder}/barretenberg/acir_tests/acir_tests/embedded_curve_ops",
@@ -60,7 +60,7 @@
       "name": "Debug test_graph_for_arithmetic_gates",
       "type": "lldb",
       "request": "launch",
-      "program": "${workspaceFolder}/barretenberg/cpp/build-debug-no-avm/bin/boomerang_value_detection_tests",
+      "program": "${workspaceFolder}/barretenberg/cpp/build-debug/bin/boomerang_value_detection_tests",
       "args": ["--gtest_filter=BoomerangGoblinRecursiveVerifierTests.graph_description_basic"],
       "initCommands": [
         "command script import ${workspaceFolder}/barretenberg/cpp/scripts/lldb_format.py"
@@ -70,9 +70,9 @@
       "name": "Debug BB API Test",
       "type": "lldb",
       "request": "launch",
-      "program": "${workspaceFolder}/barretenberg/cpp/build-debug-no-avm/bin/api_tests",
+      "program": "${workspaceFolder}/barretenberg/cpp/build-debug/bin/api_tests",
       "args": ["--gtest_filter=ChonkAPITests.ProveAndVerifyFileBasedFlow"],
-      "cwd": "${workspaceFolder}/barretenberg/cpp/build-debug-no-avm",
+      "cwd": "${workspaceFolder}/barretenberg/cpp/build-debug",
       "initCommands": [
         "command script import ${workspaceFolder}/barretenberg/cpp/scripts/lldb_format.py"
       ],

barretenberg/acir_tests/.rebuild_patterns

@@ -1,2 +1,3 @@
+^barretenberg/acir_tests/bootstrap.sh
 ^barretenberg/acir_tests/scripts/run_test.sh
 ^barretenberg/acir_tests/internal_test_programs/.*/.*\.(nr|toml)$

barretenberg/acir_tests/bootstrap.sh

@@ -113,6 +113,12 @@ function build {
     rm -rf acir_tests/{regression_5045,regression_7744}
     # The following test fails because it uses CallData/ReturnData with UltraBuilder, which is not supported
     rm -rf acir_tests/{regression_7612,regression_7143,databus_composite_calldata,databus_two_calldata_simple,databus_two_calldata,databus}
+    # Mark tests that are expected to fail with a failing_ prefix.
+    # bb_prove.sh will expect these to fail and error if they suddenly pass.
+    for t in ecdsa_secp256k1_invalid_inputs; do
+      mv acir_tests/$t acir_tests/failing_$t
+      sed -i "s/^name = \"$t\"/name = \"failing_$t\"/" acir_tests/failing_$t/Nargo.toml
+    done
     # Merge the internal test programs with the acir tests.
     cp -R ./internal_test_programs/* acir_tests
 

barretenberg/acir_tests/scripts/bb_prove.sh

@@ -3,7 +3,8 @@ source $(git rev-parse --show-toplevel)/ci3/source
 
 export HARDWARE_CONCURRENCY=8
 
-cd ../acir_tests/$1
+test_name=$1
+cd ../acir_tests/$test_name
 
 bb=$(../../../cpp/scripts/find-bb)
 
@@ -14,14 +15,28 @@ flags="-v --scheme ultra_honk $*"
 mkdir -p output-$$
 trap "rm -rf output-$$" EXIT
 
-# Generate VK
-$bb write_vk $flags -b target/program.json -o output-$$
+# Tests prefixed with failing_ are expected to fail.
+if [[ $test_name == failing_* ]]; then
+  if $bb write_vk $flags -b target/program.json -o output-$$ && \
+     $bb prove $flags -b target/program.json -k output-$$/vk -o output-$$ && \
+     $bb verify $flags \
+       -k output-$$/vk \
+       -p output-$$/proof \
+       -i output-$$/public_inputs; then
+    echo "ERROR: Expected test '$test_name' to fail, but it passed!"
+    exit 1
+  fi
+else
+    # Generate VK
+    $bb write_vk $flags -b target/program.json -o output-$$
+
+    # Prove
+    $bb prove $flags -b target/program.json -k output-$$/vk -o output-$$
+
+    # Verify
+    $bb verify $flags \
+        -k output-$$/vk \
+        -p output-$$/proof \
+        -i output-$$/public_inputs
+fi
 
-# Prove
-$bb prove $flags -b target/program.json -k output-$$/vk -o output-$$
-
-# Verify
-$bb verify $flags \
-    -k output-$$/vk \
-    -p output-$$/proof \
-    -i output-$$/public_inputs

barretenberg/cpp/CLAUDE.md

@@ -130,3 +130,58 @@ The remote benchmark script:
 - Automatically builds the target if needed
 - Returns performance metrics and timing data
 - Should be used instead of local benchmarks for performance validation
+
+## Verification Keys
+
+**IMPORTANT**: When making barretenberg changes that could affect verification keys, you must verify that VKs haven't changed unexpectedly, or
+update them if the changes are intentional.
+
+### Checking if VKs have changed
+
+Prerequisites: Build barretenberg native code first.
+
+```bash
+cd barretenberg/cpp
+./bootstrap.sh build_native
+```
+
+Run the VK check script from barretenberg/cpp/scripts:
+
+```bash
+cd barretenberg/cpp/scripts
+./test_chonk_standalone_vks_havent_changed.sh
+```
+
+Expected result: Script exits successfully if VKs are unchanged, or shows that VKs have changed.
+
+### Updating VKs (when changes are intentional)
+
+**IMPORTANT**: Never update the VKs without asking permission first. When asking for permission, explain why you think the VK update is to be expected.
+
+If VKs have changed and this is expected due to your modifications, update the stored VKs:
+
+```bash
+cd barretenberg/cpp/scripts
+./test_chonk_standalone_vks_havent_changed.sh --update_inputs
+```
+
+### Verifying VK validity (proving the updated inputs)
+
+**IMPORTANT**: There is no need to verify the validity of the inputs after having updated them. The flag `update_inputs` verifies the new inputs.
+
+To verify the validity of the inputs pinned by the script `./test_chonk_standalone_vks_havent_changed.sh`, run:
+
+```bash
+cd barretenberg/cpp/scripts
+./test_chonk_standalone_vks_havent_changed.sh --prove_and_verify
+```
+
+Note: If a proof test fails for a specific flow, the inputs are saved to:
+`yarn-project/end-to-end/example-app-ivc-inputs-out/<flow_name>`
+
+Typical workflow
+
+1. Make barretenberg changes
+2. Build native code: `cd barretenberg/cpp && ./bootstrap.sh build_native`
+3. Check VKs: `cd scripts && ./test_chonk_standalone_vks_havent_changed.sh`
+4. If VKs changed intentionally: `./test_chonk_standalone_vks_havent_changed.sh --update_inputs`