bb.js is standalone prover that handles noir constraint/witness output.

.vscode/settings.json

@@ -110,7 +110,8 @@
   "solidity.compileUsingRemoteVersion": "v0.6.10+commit.00c0fcaf",
   "search.exclude": {
     "**/.yarn": true,
-    "**/.pnp.*": true
+    "**/.pnp.*": true,
+    "**/msgpack-c/**": true
   },
   "typescript.tsdk": "ts/.yarn/sdks/typescript/lib",
   "typescript.enablePromptUseWorkspaceTsdk": true,

cpp/CMakePresets.json

@@ -140,6 +140,7 @@
       "displayName": "Build for pthread enabled WASM",
       "description": "Build for pthread enabled WASM",
       "inherits": "wasm",
+      "binaryDir": "build-wasm-threads",
       "environment": {
         "WASI_SDK_PREFIX": "${sourceDir}/src/wasi-sdk-20.0+threads",
         "CMAKE_BUILD_TYPE": "Release"

cpp/bootstrap.sh

@@ -66,5 +66,9 @@ cmake --build --preset $PRESET ${@/#/--target }
 ./scripts/install-wasi-sdk.sh
 
 # Build WASM.
+cmake --preset wasm
+cmake --build --preset wasm
+
+# Build WASM with new threading.
 cmake --preset wasm-threads
 cmake --build --preset wasm-threads

cpp/scripts/build_libacvm_backend.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+set -eu
+
+BB_TARGETS=(
+  libenv.a
+  libcommon.a
+  libcrypto_blake2s.a
+  libcrypto_pedersen_hash.a
+  libcrypto_pedersen_commitment.a
+  libcrypto_keccak.a
+  libcrypto_schnorr.a
+  libcrypto_generators.a
+  libnumeric.a
+)
+
+CMD="cmake --preset wasm && cmake --build --preset wasm"
+for target in "${BB_TARGETS[@]}"; do CMD="$CMD --target $target"; done
+eval $CMD
+
+cd ./build-wasm/lib
+
+LIBS=(
+  $PWD/libenv.a
+  $PWD/libcommon.a
+  $PWD/libcrypto_blake2s.a
+  $PWD/libcrypto_pedersen_hash.a
+  $PWD/libcrypto_pedersen_commitment.a
+  $PWD/libcrypto_keccak.a
+  $PWD/libcrypto_schnorr.a
+  $PWD/libcrypto_generators.a
+  $PWD/libnumeric.a
+  $PWD/../../src/wasi-sdk-20.0/share/wasi-sysroot/lib/wasm32-wasi/libc++.a
+  $PWD/../../src/wasi-sdk-20.0/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a
+)
+
+rm -rf scratch
+mkdir -p scratch
+cd scratch
+
+for LIB_FILE_PATH in "${LIBS[@]}"; do
+  LIB=$(basename $LIB_FILE_PATH)
+  echo Extracting lib: $LIB
+  mkdir $LIB
+  cd $LIB
+  ar x $LIB_FILE_PATH
+  cd ..
+done
+
+rm -f ../libacvm_backend.a
+#../../../src/wasi-sdk-12.0/bin/ar rcs ../libxyz.a libcrypto_blake2s.a/* libc++.a/* libc++abi.a/* libcrypto_pedersen_commitment.a/*
+find . -type f -print0 | xargs -0 ../../../src/wasi-sdk-20.0/bin/ar rcs ../libacvm_backend.a

cpp/scripts/install-wasi-sdk.sh

@@ -27,6 +27,5 @@ else
   # Replace wasi-sysroot in wasi-sdk-20.0+threads with our custom build.
   # It contains libc++ and a patch by yamt to improve thread join stability.
   # Can remove once future releases are more stable.
-  # UPDATE: Commenting out as we switched to "parallel_for_mutex_pool" as this we actually not very stable.
-  # curl -s -L https://wasi-sdk.s3.eu-west-2.amazonaws.com/yamt-wasi-sysroot-20.0.threads.tgz | tar zxfv -
+  curl -s -L https://wasi-sdk.s3.eu-west-2.amazonaws.com/yamt-wasi-sysroot-20.0.threads.tgz | tar zxfv -
 fi

cpp/src/CMakeLists.txt

@@ -28,9 +28,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 endif()
 
 # We enable -O1 level optimsations, even when compiling debug wasm, otherwise we get "local count too large" at runtime.
+# We prioritise reducing size of final artefacts in release with -Oz.
 if(WASM)
     set(CMAKE_CXX_FLAGS_DEBUG "-O1 -g")
     set(CMAKE_C_FLAGS_DEBUG "-O1 -g")
+    set(CMAKE_CXX_FLAGS_RELEASE "-Oz -DNDEBUG")
+    set(CMAKE_C_FLAGS_RELEASE "-Oz -DNDEBUG")
     add_link_options(-Wl,--export-memory,--import-memory,--stack-first,-z,stack-size=1048576,--max-memory=4294967296)
 endif()
 
@@ -70,6 +73,10 @@ endif()
 
 include(GNUInstallDirs)
 
+# For this library we include everything but the env and wasi modules, as it is the responsibility of the
+# consumer of this library to define how and in what environment its artefact will run.
+# libbarretenberg + libwasi = a wasi "reactor" that implements it's own env (e.g. logstr), e.g. barretenberg.wasm.
+# libbarretenberg + env = a wasi "command" that expects a full wasi runtime (e.g. wasmtime), e.g. test binaries.
 message(STATUS "Compiling all-in-one barretenberg archive")
 add_library(
     barretenberg
@@ -108,24 +115,73 @@ add_library(
     $<TARGET_OBJECTS:transcript_objects>
 )
 
-if(WASM)
-    add_executable(
-        barretenberg.wasm
-        $<TARGET_OBJECTS:wasi_objects>
-    )
-
-    target_link_libraries(barretenberg.wasm barretenberg)
+# Small library to provide necessary primitives for rust crate.
+add_library(
+    acvm_backend
+    $<TARGET_OBJECTS:env_objects>
+    $<TARGET_OBJECTS:common_objects>
+    $<TARGET_OBJECTS:numeric_objects>
+    $<TARGET_OBJECTS:ecc_objects>
+    $<TARGET_OBJECTS:crypto_blake2s_objects>
+    $<TARGET_OBJECTS:crypto_keccak_objects>
+    $<TARGET_OBJECTS:crypto_generators_objects>
+    $<TARGET_OBJECTS:crypto_schnorr_objects>
+    $<TARGET_OBJECTS:crypto_pedersen_hash_objects>
+    $<TARGET_OBJECTS:crypto_pedersen_commitment_objects>
+)
 
+if(WASM)
     # 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.
     # TODO: Time has passed, check if this is still needed.
+    # UPDATE: Uninstall binaryen and any need downstream.
     set(CMAKE_CXX_FLAGS_RELEASE "-O2")
 
+    # When building this wasm "executable", we include the wasi module but exclude the env module.
+    # That's because we expect this wasm to be run as a wasi "reactor" and for the host environment
+    # to implement the functions in env.
+    add_executable(
+        barretenberg.wasm
+        $<TARGET_OBJECTS:wasi_objects>
+        $<TARGET_OBJECTS:acir_format_objects>
+        $<TARGET_OBJECTS:acir_proofs_objects>
+        $<TARGET_OBJECTS:common_objects>
+        $<TARGET_OBJECTS:crypto_aes128_objects>
+        $<TARGET_OBJECTS:crypto_blake2s_objects>
+        $<TARGET_OBJECTS:crypto_blake3s_objects>
+        $<TARGET_OBJECTS:crypto_ecdsa_objects>
+        $<TARGET_OBJECTS:crypto_generators_objects>
+        $<TARGET_OBJECTS:crypto_keccak_objects>
+        $<TARGET_OBJECTS:crypto_pedersen_commitment_objects>
+        $<TARGET_OBJECTS:crypto_pedersen_hash_objects>
+        $<TARGET_OBJECTS:crypto_schnorr_objects>
+        $<TARGET_OBJECTS:crypto_sha256_objects>
+        $<TARGET_OBJECTS:ecc_objects>
+        $<TARGET_OBJECTS:examples_objects>
+        $<TARGET_OBJECTS:honk_objects>
+        $<TARGET_OBJECTS:numeric_objects>
+        $<TARGET_OBJECTS:plonk_objects>
+        $<TARGET_OBJECTS:polynomials_objects>
+        $<TARGET_OBJECTS:proof_system_objects>
+        $<TARGET_OBJECTS:srs_objects>
+        $<TARGET_OBJECTS:stdlib_aes128_objects>
+        $<TARGET_OBJECTS:stdlib_blake2s_objects>
+        $<TARGET_OBJECTS:stdlib_blake3s_objects>
+        $<TARGET_OBJECTS:stdlib_keccak_objects>
+        $<TARGET_OBJECTS:stdlib_merkle_tree_objects>
+        $<TARGET_OBJECTS:stdlib_pedersen_commitment_objects>
+        $<TARGET_OBJECTS:stdlib_pedersen_hash_objects>
+        $<TARGET_OBJECTS:stdlib_primitives_objects>
+        $<TARGET_OBJECTS:stdlib_schnorr_objects>
+        $<TARGET_OBJECTS:stdlib_sha256_objects>
+        $<TARGET_OBJECTS:transcript_objects>
+    )
+
     target_link_options(
         barretenberg.wasm
         PRIVATE
-        -nostartfiles -Wl,--whole-archive,--no-entry,--export-dynamic,--allow-undefined
+        -nostartfiles -Wl,--no-entry,--export-dynamic,--allow-undefined
     )
 
     if(INSTALL_BARRETENBERG)

cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp

@@ -2,7 +2,7 @@
 #include "barretenberg/common/assert.hpp"
 #include <cstdlib>
 #include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp"
-#include "barretenberg/srs/reference_string/file_reference_string.hpp"
+#include "barretenberg/srs/factories/file_crs_factory.hpp"
 #include "barretenberg/polynomials/polynomial_arithmetic.hpp"
 
 // #include <valgrind/callgrind.h>
@@ -41,7 +41,7 @@ constexpr size_t NUM_POINTS = 1 << 16;
 std::vector<fr> scalars;
 static barretenberg::evaluation_domain small_domain;
 static barretenberg::evaluation_domain large_domain;
-auto reference_string = std::make_shared<proof_system::FileReferenceString>(NUM_POINTS, "../srs_db/ignition");
+auto reference_string = std::make_shared<barretenberg::srs::factories::FileProverCrs>(NUM_POINTS, "../srs_db/ignition");
 
 const auto init = []() {
     small_domain = barretenberg::evaluation_domain(NUM_POINTS);

cpp/src/barretenberg/common/c_bind.cpp

@@ -1,7 +1,9 @@
+#ifndef NO_MULTITHREADING
 #include "./c_bind.hpp"
 #include "./mem.hpp"
 #include "./timer.hpp"
 #include "./serialize.hpp"
+#include "./slab_allocator.hpp"
 #include <algorithm>
 #include <thread>
 
@@ -31,8 +33,6 @@ void thread_test_abort_entry_point(void*)
     std::abort();
 }
 
-extern "C" {
-
 WASM_EXPORT void test_threads(uint32_t const* thread_num, uint32_t const* iterations, uint32_t* out)
 {
     info("test starting...");
@@ -66,4 +66,9 @@ WASM_EXPORT void test_abort()
     info("test_abort aborting");
     std::abort();
 }
+
+WASM_EXPORT void common_init_slab_allocator(uint32_t const* circuit_size)
+{
+    barretenberg::init_slab_allocator(ntohl(*circuit_size));
 }
+#endif

cpp/src/barretenberg/common/c_bind.hpp

@@ -2,11 +2,10 @@
 #include "./wasm_export.hpp"
 #include "./serialize.hpp"
 
-extern "C" {
-
 WASM_EXPORT void test_threads(uint32_t const* threads, uint32_t const* iterations, uint32_t* out);
 
 WASM_EXPORT void test_thread_abort();
 
 WASM_EXPORT void test_abort();
-}
+
+WASM_EXPORT void common_init_slab_allocator(uint32_t const* circuit_size);