feat: bump to wasi-sdk 20 compatible barretenberg

.circleci/config.yml

@@ -209,17 +209,6 @@ jobs:
           name: "Build and test"
           command: build aztec.js
 
-  barretenberg-js:
-    machine:
-      image: ubuntu-2004:202010-01
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Build and test"
-          command: build barretenberg.js
-
   types:
     machine:
       image: ubuntu-2004:202010-01
@@ -584,7 +573,6 @@ workflows:
       - acir-simulator: *yarn_project
       - archiver: *yarn_project
       - aztec-rpc: *yarn_project
-      - barretenberg-js: *yarn_project
       - merkle-tree: *yarn_project
       - p2p: *yarn_project
       - p2p-bootstrap: *yarn_project
@@ -605,7 +593,6 @@ workflows:
             - acir-simulator
             - archiver
             - aztec-rpc
-            - barretenberg-js
             - merkle-tree
             - p2p
             - p2p-bootstrap

build_manifest.json

@@ -88,7 +88,6 @@
       "^yarn-project/acir-simulator/"
     ],
     "dependencies": [
-      "barretenberg.js",
       "circuits.js",
       "foundation",
       "merkle-tree",
@@ -136,7 +135,6 @@
     "dependencies": [
       "acir-simulator",
       "aztec-node",
-      "barretenberg.js",
       "circuits.js",
       "foundation",
       "key-store",
@@ -158,18 +156,6 @@
       "noir-contracts"
     ]
   },
-  "barretenberg.js": {
-    "buildDir": "yarn-project",
-    "projectDir": "yarn-project/barretenberg.js",
-    "dockerfile": "barretenberg.js/Dockerfile",
-    "rebuildPatterns": [
-      "^yarn-project/barretenberg.js/"
-    ],
-    "dependencies": [
-      "foundation",
-      "yarn-project-base"
-    ]
-  },
   "circuits.js": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/circuits.js",
@@ -178,9 +164,7 @@
       "^yarn-project/circuits.js/"
     ],
     "dependencies": [
-      "barretenberg.js",
       "foundation",
-      "merkle-tree",
       "yarn-project-base"
     ]
   },
@@ -233,7 +217,6 @@
       "^yarn-project/key-store/"
     ],
     "dependencies": [
-      "barretenberg.js",
       "circuits.js",
       "foundation",
       "types"
@@ -247,7 +230,7 @@
       "^yarn-project/merkle-tree/"
     ],
     "dependencies": [
-      "barretenberg.js",
+      "circuits.js",
       "foundation"
     ]
   },
@@ -328,7 +311,7 @@
     ],
     "dependencies": [
       "archiver",
-      "barretenberg.js",
+      "circuits.js",
       "foundation",
       "l1-artifacts",
       "merkle-tree",
@@ -378,7 +361,6 @@
       "^yarn-project/world-state/"
     ],
     "dependencies": [
-      "barretenberg.js",
       "circuits.js",
       "foundation",
       "merkle-tree",

build_manifest.sh

@@ -15,6 +15,5 @@
 PROJECTS=(
   circuits:circuits/cpp:./dockerfiles/Dockerfile.wasm-linux-clang:circuits-wasm-linux-clang
   yarn-project-base:yarn-project
-  # barretenberg.js:yarn-project
   end-to-end:yarn-project
 )

circuits/cpp/.dockerignore

@@ -14,4 +14,5 @@ barretenberg/cpp/src/aztec/rollup/proofs/root_*/fixtures/account
 barretenberg/cpp/src/aztec/rollup/proofs/root_*/fixtures/join_split
 barretenberg/cpp/src/aztec/rollup/proofs/root_*/fixtures/**/proving_key
 barretenberg/cpp/srs_db/*
-!barretenberg/cpp/srs_db/download_ignition.sh
+!barretenberg/cpp/srs_db/download_ignition.sh
+!barretenberg/cpp/scripts/install-wasi-sdk.sh

circuits/cpp/CMakeLists.txt

@@ -155,4 +155,4 @@ include(cmake/threading.cmake)
 include(cmake/gtest.cmake)
 include(cmake/benchmark.cmake)
 include(cmake/module.cmake)
-add_subdirectory(src)
+add_subdirectory(src)

circuits/cpp/CMakePresets.json

@@ -68,6 +68,37 @@
         "CMAKE_BUILD_TYPE": "Debug"
       }
     },
+    {
+      "name": "clang16",
+      "displayName": "Build with Clang-16",
+      "description": "Build with globally installed Clang-16",
+      "inherits": "default",
+      "environment": {
+        "CC": "clang-16",
+        "CXX": "clang++-16"
+      },
+      "cacheVariables": {
+        "CMAKE_BBERG_PRESET": "clang16"
+      }
+    },
+    {
+      "name": "clang16-assert",
+      "displayName": "Build with Clang-16 and assertions enabled",
+      "description": "Build with globally installed Clang-16 and assertions",
+      "inherits": "clang16",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "RelWithAssert"
+      }
+    },
+    {
+      "name": "clang16-dbg",
+      "displayName": "Debugging build with Clang-16",
+      "description": "Build with globally installed Clang-16 in debug mode",
+      "inherits": "clang16",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
     {
       "name": "gcc",
       "displayName": "Build with GCC",
@@ -131,7 +162,7 @@
       "binaryDir": "build-wasm",
       "toolchainFile": "cmake/toolchains/wasm32-wasi.cmake",
       "environment": {
-        "WASI_SDK_PREFIX": "${sourceDir}/barretenberg/cpp/src/wasi-sdk-12.0",
+        "WASI_SDK_PREFIX": "${sourceDir}/barretenberg/cpp/src/wasi-sdk-20.0",
         "CC": "$env{WASI_SDK_PREFIX}/bin/clang",
         "CXX": "$env{WASI_SDK_PREFIX}/bin/clang++",
         "AR": "$env{WASI_SDK_PREFIX}/bin/llvm-ar",
@@ -146,6 +177,7 @@
         "CMAKE_FIND_ROOT_PATH_MODE_PACKAGE": "ONLY",
         "CMAKE_C_COMPILER_WORKS": "ON",
         "CMAKE_CXX_COMPILER_WORKS": "ON",
+        "CMAKE_EXE_LINKER_FLAGS": "-O3",
         "CMAKE_BBERG_PRESET": "wasm",
         "CMAKE_BUILD_TYPE": "Release"
       }
@@ -156,7 +188,8 @@
       "description": "Build in debug mode with a specific wasm-sdk to create wasm",
       "inherits": "wasm",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_EXE_LINKER_FLAGS": ""
       }
     }
   ],
@@ -182,6 +215,16 @@
       "inherits": "default",
       "configurePreset": "clang15-dbg"
     },
+    {
+      "name": "clang16",
+      "inherits": "default",
+      "configurePreset": "clang16"
+    },
+    {
+      "name": "clang16-dbg",
+      "inherits": "default",
+      "configurePreset": "clang16-dbg"
+    },
     {
       "name": "gcc",
       "inherits": "default",
@@ -239,6 +282,16 @@
       "inherits": "default",
       "configurePreset": "clang15-dbg"
     },
+    {
+      "name": "clang16",
+      "inherits": "default",
+      "configurePreset": "clang16"
+    },
+    {
+      "name": "clang16-dbg",
+      "inherits": "default",
+      "configurePreset": "clang16-dbg"
+    },
     {
       "name": "gcc",
       "inherits": "default",
@@ -274,4 +327,4 @@
       "inherits": "wasm"
     }
   ]
-}
+}

circuits/cpp/bootstrap.sh

@@ -3,7 +3,7 @@
 # Takes CLEAN as an environment variable. If passed, cleans build artifacts
 set -eu
 
-export WASI_VERSION=12
+export WASI_VERSION=20
 
 cd "$(dirname "$0")"
 
@@ -74,9 +74,7 @@ cmake --preset $PRESET -DCMAKE_BUILD_TYPE=RelWithAssert
 cmake --build --preset $PRESET ${@/#/--target }
 
 # Install the webassembly toolchain.
-if ! [ -d "./barretenberg/cpp/src/wasi-sdk-$WASI_VERSION.0" ] ; then
-  (cd ./barretenberg/cpp/src && curl -s -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-$WASI_VERSION/wasi-sdk-$WASI_VERSION.0-$OS.tar.gz | tar zxfv -)
-fi
+(cd ./barretenberg/cpp && ./scripts/install-wasi-sdk.sh)
 
 # Build WASM.
 cmake --preset wasm

circuits/cpp/cmake/barretenberg.cmake

@@ -12,10 +12,10 @@ include(ExternalProject)
 # Reference barretenberg artifacts (like library archives) via this dir:
 if (WASM)
     set(BBERG_BUILD_DIR ${BBERG_DIR}/build-wasm)
-    set(BBERG_TARGETS --target barretenberg --target env --target primitives.wasm)
+    set(BBERG_TARGETS --target barretenberg --target env --target wasi --target barretenberg.wasm)
 else()
     set(BBERG_BUILD_DIR ${BBERG_DIR}/build)
-    set(BBERG_TARGETS --target barretenberg --target env)
+    set(BBERG_TARGETS --target barretenberg --target env --target wasi)
 endif()
 
 if(NOT CMAKE_BBERG_PRESET)
@@ -34,15 +34,15 @@ ExternalProject_Add(Barretenberg
     BUILD_ALWAYS TRUE
     UPDATE_COMMAND ""
     INSTALL_COMMAND ""
-    CONFIGURE_COMMAND 
-        ${CMAKE_COMMAND} 
+    CONFIGURE_COMMAND
+        ${CMAKE_COMMAND}
         --preset ${CMAKE_BBERG_PRESET}
         -DCMAKE_CXX_FLAGS=${CMAKE_BBERG_CXX_FLAGS}
         -DSERIALIZE_CANARY=${SERIALIZE_CANARY}
         -DMULTITHREADING=${MULTITHREADING}
         -DENABLE_ASAN=${ENABLE_ASAN}
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    BUILD_COMMAND 
+    BUILD_COMMAND
         ${CMAKE_COMMAND}
         --build
         --preset ${CMAKE_BBERG_PRESET}
@@ -66,3 +66,8 @@ add_dependencies(barretenberg Barretenberg)
 add_library(env STATIC IMPORTED)
 set_target_properties(env PROPERTIES IMPORTED_LOCATION ${BBERG_BUILD_DIR}/lib/libenv.a)
 add_dependencies(env Barretenberg)
+
+# wasi is needed to initialize global statics and ensure we're following the reactor wasi pattern.
+add_library(wasi STATIC IMPORTED)
+set_target_properties(wasi PROPERTIES IMPORTED_LOCATION ${BBERG_BUILD_DIR}/lib/libwasi.a)
+add_dependencies(wasi Barretenberg)

circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang

@@ -1,12 +1,15 @@
 FROM ubuntu:kinetic AS builder
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential wget git libssl-dev cmake ninja-build curl binaryen
-WORKDIR /usr/src/circuits/cpp/barretenberg/cpp/src
-RUN curl -s -L https://github.com/CraneStation/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz | tar zxfv -
+
+WORKDIR /usr/src/circuits/cpp/barretenberg/cpp
+COPY ./barretenberg/cpp/scripts/install-wasi-sdk.sh ./scripts/install-wasi-sdk.sh
+RUN ./scripts/install-wasi-sdk.sh
 WORKDIR /usr/src/circuits/cpp
 COPY . .
+
 RUN cmake --preset wasm && cmake --build --preset wasm --target aztec3-circuits.wasm
 
 FROM alpine:3.17
 COPY --from=builder /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm
-COPY --from=builder /usr/src/circuits/cpp/barretenberg/cpp/build-wasm/bin/primitives.wasm /usr/src/circuits/cpp/barretenberg/cpp/build-wasm/bin/primitives.wasm
+COPY --from=builder /usr/src/circuits/cpp/barretenberg/cpp/build-wasm/bin/barretenberg.wasm /usr/src/circuits/cpp/barretenberg/cpp/build-wasm/bin/primitives.wasm
 COPY --from=builder /usr/src/circuits/cpp/barretenberg/cpp/srs_db /usr/src/circuits/cpp/barretenberg/cpp/srs_db

circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert

@@ -1,8 +1,9 @@
 FROM ubuntu:kinetic AS builder
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git libssl-dev cmake ninja-build curl binaryen
 
-WORKDIR /usr/src/circuits/cpp/barretenberg/cpp/src
-RUN curl -s -L https://github.com/CraneStation/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz | tar zxfv -
+WORKDIR /usr/src/circuits/cpp/barretenberg/cpp
+COPY ./barretenberg/cpp/scripts/install-wasi-sdk.sh ./scripts/install-wasi-sdk.sh
+RUN ./scripts/install-wasi-sdk.sh
 WORKDIR /usr/src/circuits/cpp
 COPY . .
 

circuits/cpp/src/aztec3/CMakeLists.txt

@@ -13,33 +13,16 @@ if (WASM)
         aztec3-circuits.wasm
         $<TARGET_OBJECTS:aztec3_circuits_apps_objects>
         $<TARGET_OBJECTS:aztec3_circuits_abis_objects>
-        $<TARGET_OBJECTS:aztec3_circuits_kernel_objects>        
+        $<TARGET_OBJECTS:aztec3_circuits_kernel_objects>
         $<TARGET_OBJECTS:aztec3_circuits_rollup_objects>
     )
-    target_link_libraries(aztec3-circuits.wasm barretenberg)
+    target_link_libraries(aztec3-circuits.wasm barretenberg wasi)
 
-    # With binaryen installed, it seems its wasm backend optimiser gets invoked automatically.
-    # Due to either a bug in the optimiser, or non-standards compliant c++ in crypto/aes, tests start failing with
-    # -O3 level optimisations. We force down to -O2 for current workaround.
-    # Presumably the -O3 when compiling the object files is fine as it's llvms IR optimiser.
-    # The backend optimiser is presumably triggered after linking.
     target_link_options(
         aztec3-circuits.wasm
         PRIVATE
         # TODO revisit implications of whole-archive
-        -nostartfiles -O2 -Wl,--whole-archive -Wl,--no-entry -Wl,--export-dynamic -Wl,--import-memory -Wl,--allow-undefined -Wl,--stack-first -Wl,-z,stack-size=1048576
+        -nostartfiles -Wl,--whole-archive -Wl,--no-entry -Wl,--export-dynamic -Wl,--import-memory -Wl,--allow-undefined -Wl,--stack-first -Wl,-z,stack-size=1048576
     )
 
-    find_program(WASM_OPT wasm-opt)
-
-    if(NOT WASM_OPT)
-        message(FATAL_ERROR "wasm-opt executable not found. Please install binaryen.")
-    endif()
-
-    add_custom_command(
-        TARGET aztec3-circuits.wasm
-        POST_BUILD
-        COMMAND wasm-opt "$<TARGET_FILE:aztec3-circuits.wasm>" -O2 --asyncify -o "$<TARGET_FILE:aztec3-circuits.wasm>"
-        VERBATIM
-    )
 endif()

circuits/cpp/src/aztec3/circuits/abis/c_bind.cpp

@@ -481,4 +481,4 @@ WASM_EXPORT const char* abis__test_roundtrip_serialize_function_leaf_preimage(ui
                                                                               uint32_t* size)
 {
     return as_string_output<aztec3::circuits::abis::FunctionLeafPreimage<NT>>(function_leaf_preimage_buf, size);
-}
+}

circuits/cpp/src/aztec3/circuits/abis/c_bind.test.cpp

@@ -1,5 +1,4 @@
 #include "c_bind.h"
-
 #include "function_leaf_preimage.hpp"
 #include "tx_request.hpp"