Merge branch 'next' into ad/chore/ci-release-pr-canary

Author: AztecBot

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