Merge branch 'merge-train/fairies' into nico/f-260-warn-on-packable-with-small-types

Author: nventuro

.github/workflows/network-healthcheck.yml

@@ -0,0 +1,25 @@
+name: Network Healthcheck
+
+on:
+  schedule:
+    - cron: '0 8 * * *'
+  workflow_dispatch:
+    inputs:
+      networks:
+        description: 'Comma-separated list of networks to check (default: all)'
+        required: false
+        type: string
+        default: 'v4-devnet-2,testnet,mainnet,staging-public,next-net'
+
+jobs:
+  healthcheck:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Run healthcheck
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          GH_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+        run: ./ci3/network_healthcheck "${{ inputs.networks || 'v4-devnet-2,testnet,mainnet,staging-public,next-net' }}"

Makefile

@@ -86,7 +86,10 @@ avm-transpiler-cross-arm64-macos:
 avm-transpiler-cross-arm64-linux:
 	$(call build,$@,avm-transpiler,build_cross arm64-linux)
 
-avm-transpiler-cross: avm-transpiler-cross-amd64-macos avm-transpiler-cross-arm64-macos avm-transpiler-cross-arm64-linux
+avm-transpiler-cross-amd64-windows:
+	$(call build,$@,avm-transpiler,build_cross amd64-windows)
+
+avm-transpiler-cross: avm-transpiler-cross-amd64-macos avm-transpiler-cross-arm64-macos avm-transpiler-cross-arm64-linux avm-transpiler-cross-amd64-windows
 
 #==============================================================================
 # Barretenberg
@@ -148,7 +151,14 @@ bb-cpp-cross-amd64-macos: bb-cpp-cross-amd64-macos-objects avm-transpiler-cross-
 bb-cpp-cross-arm64-macos: bb-cpp-cross-arm64-macos-objects avm-transpiler-cross-arm64-macos
 	$(call build,$@,barretenberg/cpp,build_cross arm64-macos)
 
-bb-cpp-cross: bb-cpp-cross-arm64-linux bb-cpp-cross-amd64-macos bb-cpp-cross-arm64-macos bb-cpp-cross-arm64-ios bb-cpp-cross-arm64-ios-sim bb-cpp-cross-arm64-android bb-cpp-cross-x86_64-android
+bb-cpp-cross-amd64-windows-objects:
+	$(call build,$@,barretenberg/cpp,build_cross_objects amd64-windows)
+
+# Cross-compile for AMD64 Windows (release only)
+bb-cpp-cross-amd64-windows: bb-cpp-cross-amd64-windows-objects avm-transpiler-cross-amd64-windows
+	$(call build,$@,barretenberg/cpp,build_cross_windows amd64-windows)
+
+bb-cpp-cross: bb-cpp-cross-arm64-linux bb-cpp-cross-amd64-macos bb-cpp-cross-arm64-macos bb-cpp-cross-amd64-windows bb-cpp-cross-arm64-ios bb-cpp-cross-arm64-ios-sim bb-cpp-cross-arm64-android bb-cpp-cross-x86_64-android
 
 # iOS SDK download (shared by all iOS cross-compile targets)
 bb-cpp-ios-sdk:

avm-transpiler/bootstrap.sh

@@ -48,6 +48,9 @@ function build_cross {
       arm64-macos)
         rust_target=aarch64-apple-darwin
         ;;
+      amd64-windows)
+        rust_target=x86_64-pc-windows-gnu
+        ;;
       *)
         echo_stderr "Unknown target: $target"
         exit 1

barretenberg/cpp/CMakeLists.txt

@@ -108,6 +108,11 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "wasm32")
     endif()
 endif()
 
+if(WIN32)
+    message(STATUS "Cross-compiling for Windows (MinGW)")
+    link_libraries(ws2_32 bcrypt psapi)
+endif()
+
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_EXTENSIONS ON)
 set(CMAKE_CXX_STANDARD 20)

barretenberg/cpp/CMakePresets.json

@@ -538,6 +538,24 @@
         "HAVE_STD_REGEX": "ON"
       }
     },
+    {
+      "name": "zig-amd64-windows",
+      "displayName": "Build for Windows amd64 with Zig",
+      "description": "Cross-compile for Windows x86_64 using Zig (MinGW). Excludes ipc/lmdb/world_state/nodejs_module (no Windows support).",
+      "inherits": "zig-base",
+      "environment": {
+        "CC": "zig cc -target x86_64-windows-gnu",
+        "CXX": "zig c++ -target x86_64-windows-gnu",
+        "LDFLAGS": "-s"
+      },
+      "cacheVariables": {
+        "CMAKE_SYSTEM_NAME": "Windows",
+        "CMAKE_SYSTEM_PROCESSOR": "x86_64",
+        "TARGET_ARCH": "skylake",
+        "MOBILE": "ON",
+        "AVM_TRANSPILER_LIB": "${sourceDir}/../../avm-transpiler/target/x86_64-pc-windows-gnu/release/libavm_transpiler.a"
+      }
+    },
     {
       "name": "zig-arm64-ios",
       "displayName": "iOS arm64 static library (Zig)",
@@ -789,6 +807,11 @@
       "configurePreset": "zig-arm64-macos",
       "inheritConfigureEnvironment": true
     },
+    {
+      "name": "zig-amd64-windows",
+      "configurePreset": "zig-amd64-windows",
+      "inheritConfigureEnvironment": true
+    },
     {
       "name": "zig-arm64-ios",
       "configurePreset": "zig-arm64-ios",

barretenberg/cpp/bootstrap.sh

@@ -95,8 +95,13 @@ function build_cross_objects {
   set -eu
   target=$1
   if ! cache_exists barretenberg-$target-$hash.zst; then
-    (flock -x 200 && cd src/barretenberg/nodejs_module && yarn --immutable) 200>/tmp/bb-yarn.lock
-    build_preset zig-$target --target barretenberg nodejs_module vm2_stub circuit_checker honk
+    if [[ "$target" == *-windows ]]; then
+      # Windows builds exclude nodejs_module (N-API requires MSVC, not MinGW)
+      AVM_TRANSPILER=0 build_preset zig-$target --target barretenberg vm2_stub circuit_checker honk
+    else
+      (flock -x 200 && cd src/barretenberg/nodejs_module && yarn --immutable) 200>/tmp/bb-yarn.lock
+      build_preset zig-$target --target barretenberg nodejs_module vm2_stub circuit_checker honk
+    fi
   fi
 }
 
@@ -114,6 +119,19 @@ function build_cross {
   inject_version build-zig-$target/bin/bb
 }
 
+# Cross compile Windows binary (bb.exe only, no nodejs_module).
+# Arg is target arch-os e.g. amd64-windows.
+function build_cross_windows {
+  set -eu
+  target=$1
+  if ! cache_download barretenberg-$target-$hash.zst; then
+    AVM_TRANSPILER=0 build_preset zig-$target --target bb --target bb-external
+    cache_upload barretenberg-$target-$hash.zst build-zig-$target/{bin,lib}
+  fi
+  # Always inject version (even for cached binaries) to ensure correct version on release
+  inject_version build-zig-$target/bin/bb.exe
+}
+
 # Build static library (.a) for iOS using Zig cross-compilation from Linux.
 # Only produces static libraries (bb-external) — Zig cannot link iOS executables
 # due to lack of TBD/dylib support. Requires iOS SDK headers (downloaded automatically).
@@ -258,6 +276,11 @@ function build_release_dir {
   # Package amd64-macos
   tar -czf build-release/barretenberg-amd64-darwin.tar.gz -C build-zig-amd64-macos/bin bb
 
+  # Package amd64-windows
+  if [ -f build-zig-amd64-windows/bin/bb.exe ]; then
+    tar -czf build-release/barretenberg-amd64-windows.tar.gz -C build-zig-amd64-windows/bin bb.exe
+  fi
+
   # Package static libraries for FFI bindings
   if [ -f $native_build_dir/lib/libbb-external.a ]; then
     tar -czf build-release/barretenberg-static-amd64-linux.tar.gz -C $native_build_dir/lib libbb-external.a
@@ -271,6 +294,9 @@ function build_release_dir {
   if [ -f build-zig-arm64-macos/lib/libbb-external.a ]; then
     tar -czf build-release/barretenberg-static-arm64-darwin.tar.gz -C build-zig-arm64-macos/lib libbb-external.a
   fi
+  if [ -f build-zig-amd64-windows/lib/libbb-external.a ]; then
+    tar -czf build-release/barretenberg-static-amd64-windows.tar.gz -C build-zig-amd64-windows/lib libbb-external.a
+  fi
 
   # Package iOS static libraries (cross-compiled with Zig from Linux)
   if [ -f build-zig-arm64-ios/lib/libbb-external.a ]; then
@@ -289,7 +315,7 @@ function build_release_dir {
   fi
 }
 
-export -f build_preset build_native_objects build_cross_objects build_native build_cross build_ios build_android build_asan_fast build_wasm build_wasm_threads build_gcc_syntax_check_only build_fuzzing_syntax_check_only build_smt_verification inject_version
+export -f build_preset build_native_objects build_cross_objects build_native build_cross build_cross_windows build_ios build_android build_asan_fast build_wasm build_wasm_threads build_gcc_syntax_check_only build_fuzzing_syntax_check_only build_smt_verification inject_version
 
 function build {
   echo_header "bb cpp build"
@@ -311,6 +337,7 @@ function build {
       "build_cross arm64-linux" \
       "build_cross amd64-macos" \
       "build_cross arm64-macos" \
+      "build_cross_windows amd64-windows" \
       "build_ios zig-arm64-ios" \
       "build_ios zig-arm64-ios-sim" \
       "build_android zig-arm64-android" \

barretenberg/cpp/pil/vm2/bitwise.pil

@@ -142,17 +142,16 @@ start_sha256 * (1 - start_sha256) = 0;
 // Crucial constraint to prevent the vulnerability described in PR #19875 consisting
 // of maliciously setting start_keccak/start_sha256=1 on error rows (sel=1, err=1)
 // and forging arbitrary bitwise operation results.
-// keccak and sh256 only enforce that tag_a = U64/U32 respectively. An attacker is free to
+// keccak and sha256 only enforce that tag_a = U64/U32 respectively. An attacker is free to
 // set tag_b to any tag value and use the resulting tag mismatch error to return an invalid result
-// Since error rows have sel=1, we gate by err instead of (1 - sel).
 #[BITW_NO_EXTERNAL_START_ON_ERROR]
 (start_keccak + start_sha256) * err = 0;
 
 // To support dynamically sized memory operands we use a counter against a lookup
 // This decrementing counter goes from [TAG_LEN, 0] where TAG_LEN is the number of bytes in the
 // corresponding integer. i.e. TAG_LEN is between 1 (U1/U8) and 16 (U128).
 // Consistency can be achieved with a lookup table between the tag and precomputed.tag_byte_length
-pol commit ctr; // when err=1, last=1 forces ctr in {0,1} via BITW_LAST_FOR_CTR_ONE; 0 is optimal
+pol commit ctr;
 
 // The error flags for this subtrace
 pol commit sel_tag_ff_err; // @boolean
@@ -163,7 +162,7 @@ sel_tag_mismatch_err * (1 - sel_tag_mismatch_err) = 0;
 // Consolidated error flag
 pol commit err; // @boolean (by definition)
 err = 1 - (1 - sel_tag_mismatch_err) * (1 - sel_tag_ff_err);
-#[LAST_ON_ERROR] // end = 1 if err = 1
+#[END_ON_ERROR] // end = 1 if err = 1
 err * (end - 1) = 0;
 
 // Error can only manifest on start rows (where tag checks are evaluated).