From 270025d67d02a25fed43ec96045c4b6dbfa4c33c Mon Sep 17 00:00:00 2001
From: federicobarbacovi <171914500+federicobarbacovi@users.noreply.github.com>
Date: Wed, 29 Oct 2025 17:41:14 +0000
Subject: [PATCH 1/4] Update format

---
 barretenberg/cpp/format.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/barretenberg/cpp/format.sh b/barretenberg/cpp/format.sh
index 9083aeef7432..7db3cb62ef0a 100755
--- a/barretenberg/cpp/format.sh
+++ b/barretenberg/cpp/format.sh
@@ -10,7 +10,7 @@ if [ "$1" == "staged" ]; then
   files=$(git diff-index --diff-filter=d --relative --cached --name-only HEAD | grep -e '\.\(cpp\|hpp\|tcc\)$')
   format_files "$files"
   if [ -n "$files" ]; then
-    echo "$files" | xargs -r git add
+    echo "$files" | xargs git add
   fi
 elif [ "$1" == "changed" ]; then
   echo Formatting barretenberg changed files...

From 4b8be11abe4ef553c7e70dec6328c3f1a30e2ac4 Mon Sep 17 00:00:00 2001
From: federicobarbacovi <171914500+federicobarbacovi@users.noreply.github.com>
Date: Wed, 29 Oct 2025 17:51:39 +0000
Subject: [PATCH 2/4] Update vks test to work with either URLs

---
 ...est_chonk_standalone_vks_havent_changed.sh | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh b/barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh
index 2b1b34eb26d9..0858072732bb 100755
--- a/barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh
+++ b/barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh
@@ -14,7 +14,8 @@ cd ..
 # - Upload the compressed results: aws s3 cp bb-chonk-inputs.tar.gz s3://aztec-ci-artifacts/protocol/bb-chonk-inputs-[hash(0:8)].tar.gz
 # Note: In case of the "Test suite failed to run ... Unexpected token 'with' " error, need to run: docker pull aztecprotocol/build:3.0
 pinned_short_hash="abdb6bae"
-pinned_chonk_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-civc-inputs-${pinned_short_hash}.tar.gz"
+pinned_civc_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-civc-inputs-${pinned_short_hash}.tar.gz"
+pinned_chonk_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-chonk-inputs-${pinned_short_hash}.tar.gz"
 
 function compress_and_upload {
     # 1) Compress the results
@@ -55,19 +56,31 @@ if [[ "${1:-}" == "--update_inputs" ]]; then
 fi
 
 export inputs_tmp_dir=$(mktemp -d)
-trap 'rm -rf "$inputs_tmp_dir" bb-chonk-inputs.tar.gz' EXIT SIGINT
+trap 'rm -rf "$inputs_tmp_dir" bb-chonk-inputs.tar.gz bb-civc-inputs.tar.gz' EXIT SIGINT
 
 echo "Downloading pinned IVC inputs from: $pinned_chonk_inputs_url"
 if ! curl -s -f "$pinned_chonk_inputs_url" -o bb-chonk-inputs.tar.gz; then
-    echo_stderr "Error: Failed to download pinned IVC inputs from $pinned_chonk_inputs_url"
-    echo_stderr "The pinned short hash '$pinned_short_hash' may be invalid or the file may not exist in S3."
-    exit 1
+    echo_stderr "Warning: Failed to download from $pinned_chonk_inputs_url"
+    echo "Trying alternative URL: $pinned_civc_inputs_url"
+    if ! curl -s -f "$pinned_civc_inputs_url" -o bb-civc-inputs.tar.gz; then
+        echo_stderr "Error: Failed to download pinned IVC inputs from both URLs:"
+        echo_stderr "  - $pinned_chonk_inputs_url"
+        echo_stderr "  - $pinned_civc_inputs_url"
+        echo_stderr "The pinned short hash '$pinned_short_hash' may be invalid or the files may not exist in S3."
+        exit 1
+    fi
+    echo "Successfully downloaded from alternative URL"
 fi
 
 echo "Extracting IVC inputs..."
-if ! tar -xzf bb-chonk-inputs.tar.gz -C "$inputs_tmp_dir"; then
-    echo_stderr "Error: Failed to extract IVC inputs archive"
-    exit 1
+if ! tar -xzf bb-chonk-inputs.tar.gz -C "$inputs_tmp_dir" 2>/dev/null; then
+    echo "Trying alternative archive: bb-civc-inputs.tar.gz"
+    if ! tar -xzf bb-civc-inputs.tar.gz -C "$inputs_tmp_dir"; then
+        echo_stderr "Error: Failed to extract IVC inputs archive from both files:"
+        echo_stderr "  - bb-chonk-inputs.tar.gz"
+        echo_stderr "  - bb-civc-inputs.tar.gz"
+        exit 1
+    fi
 fi
 
 function check_circuit_vks {

From d69ad9d08a36963c01ae7e81e4225c5d94f046b3 Mon Sep 17 00:00:00 2001
From: federicobarbacovi <171914500+federicobarbacovi@users.noreply.github.com>
Date: Thu, 30 Oct 2025 09:26:42 +0000
Subject: [PATCH 3/4] Update test vks script and force upload to bb-chonk

---
 ...est_chonk_standalone_vks_havent_changed.sh | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh b/barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh
index 0858072732bb..62dd1a18b400 100755
--- a/barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh
+++ b/barretenberg/cpp/scripts/test_chonk_standalone_vks_havent_changed.sh
@@ -13,8 +13,7 @@ cd ..
 # - Generate a hash for versioning: sha256sum bb-chonk-inputs.tar.gz
 # - Upload the compressed results: aws s3 cp bb-chonk-inputs.tar.gz s3://aztec-ci-artifacts/protocol/bb-chonk-inputs-[hash(0:8)].tar.gz
 # Note: In case of the "Test suite failed to run ... Unexpected token 'with' " error, need to run: docker pull aztecprotocol/build:3.0
-pinned_short_hash="abdb6bae"
-pinned_civc_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-civc-inputs-${pinned_short_hash}.tar.gz"
+pinned_short_hash="16dc4478"
 pinned_chonk_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-chonk-inputs-${pinned_short_hash}.tar.gz"
 
 function compress_and_upload {
@@ -56,31 +55,19 @@ if [[ "${1:-}" == "--update_inputs" ]]; then
 fi
 
 export inputs_tmp_dir=$(mktemp -d)
-trap 'rm -rf "$inputs_tmp_dir" bb-chonk-inputs.tar.gz bb-civc-inputs.tar.gz' EXIT SIGINT
+trap 'rm -rf "$inputs_tmp_dir" bb-chonk-inputs.tar.gz' EXIT SIGINT
 
 echo "Downloading pinned IVC inputs from: $pinned_chonk_inputs_url"
 if ! curl -s -f "$pinned_chonk_inputs_url" -o bb-chonk-inputs.tar.gz; then
-    echo_stderr "Warning: Failed to download from $pinned_chonk_inputs_url"
-    echo "Trying alternative URL: $pinned_civc_inputs_url"
-    if ! curl -s -f "$pinned_civc_inputs_url" -o bb-civc-inputs.tar.gz; then
-        echo_stderr "Error: Failed to download pinned IVC inputs from both URLs:"
-        echo_stderr "  - $pinned_chonk_inputs_url"
-        echo_stderr "  - $pinned_civc_inputs_url"
-        echo_stderr "The pinned short hash '$pinned_short_hash' may be invalid or the files may not exist in S3."
-        exit 1
-    fi
-    echo "Successfully downloaded from alternative URL"
+    echo_stderr "Error: Failed to download pinned IVC inputs from $pinned_chonk_inputs_url"
+    echo_stderr "The pinned short hash '$pinned_short_hash' may be invalid or the file may not exist in S3."
+    exit 1
 fi
 
 echo "Extracting IVC inputs..."
-if ! tar -xzf bb-chonk-inputs.tar.gz -C "$inputs_tmp_dir" 2>/dev/null; then
-    echo "Trying alternative archive: bb-civc-inputs.tar.gz"
-    if ! tar -xzf bb-civc-inputs.tar.gz -C "$inputs_tmp_dir"; then
-        echo_stderr "Error: Failed to extract IVC inputs archive from both files:"
-        echo_stderr "  - bb-chonk-inputs.tar.gz"
-        echo_stderr "  - bb-civc-inputs.tar.gz"
-        exit 1
-    fi
+if ! tar -xzf bb-chonk-inputs.tar.gz -C "$inputs_tmp_dir"; then
+    echo_stderr "Error: Failed to extract IVC inputs archive"
+    exit 1
 fi
 
 function check_circuit_vks {

From e5d7d2e59c8840b889714daf2d6f38485a02b652 Mon Sep 17 00:00:00 2001
From: federicobarbacovi <171914500+federicobarbacovi@users.noreply.github.com>
Date: Thu, 30 Oct 2025 09:28:13 +0000
Subject: [PATCH 4/4] Update format

---
 barretenberg/cpp/format.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/barretenberg/cpp/format.sh b/barretenberg/cpp/format.sh
index 7db3cb62ef0a..9083aeef7432 100755
--- a/barretenberg/cpp/format.sh
+++ b/barretenberg/cpp/format.sh
@@ -10,7 +10,7 @@ if [ "$1" == "staged" ]; then
   files=$(git diff-index --diff-filter=d --relative --cached --name-only HEAD | grep -e '\.\(cpp\|hpp\|tcc\)$')
   format_files "$files"
   if [ -n "$files" ]; then
-    echo "$files" | xargs git add
+    echo "$files" | xargs -r git add
   fi
 elif [ "$1" == "changed" ]; then
   echo Formatting barretenberg changed files...