Skip to content

Build barretenberg's primitives.wasm #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spalladino merged 1 commit into from
Apr 6, 2023
+5 −2
Merged

Build barretenberg's primitives.wasm #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpp/barretenberg
Open in desktop
Submodule barretenberg updated 4 files
+3 −2 cpp/dockerfiles/Dockerfile.wasm-linux-clang
+31 −0 cpp/src/CMakeLists.txt
+20 −1 cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp
+97 −3 cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp
4 changes: 3 additions & 1 deletion cpp/cmake/barretenberg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +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)
else()
set(BBERG_BUILD_DIR ${BBERG_DIR}/build)
set(BBERG_TARGETS --target barretenberg --target env)
endif()

if(NOT CMAKE_BBERG_PRESET)
Expand All @@ -32,7 +34,7 @@ ExternalProject_Add(Barretenberg
UPDATE_COMMAND ""
INSTALL_COMMAND ""
CONFIGURE_COMMAND ${CMAKE_COMMAND} --preset ${CMAKE_BBERG_PRESET} -DSERIALIZE_CANARY=${SERIALIZE_CANARY} -DENABLE_ASAN=${ENABLE_ASAN} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
BUILD_COMMAND ${CMAKE_COMMAND} --build --preset ${CMAKE_BBERG_PRESET} --target barretenberg --target env
BUILD_COMMAND ${CMAKE_COMMAND} --build --preset ${CMAKE_BBERG_PRESET} ${BBERG_TARGETS}
# byproducts needed by ninja generator (not needed by make)
BUILD_BYPRODUCTS ${BBERG_BUILD_DIR}/lib/libbarretenberg.a ${BBERG_BUILD_DIR}/lib/libenv.a)

Expand Down
1 change: 1 addition & 0 deletions cpp/dockerfiles/Dockerfile.wasm-linux-clang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ RUN cmake --preset wasm && cmake --build --preset wasm

FROM alpine:3.17
COPY --from=builder /usr/src/aztec3-circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/aztec3-circuits/cpp/build-wasm/bin/aztec3-circuits.wasm
COPY --from=builder /usr/src/aztec3-circuits/cpp/barretenberg/cpp/build-wasm/bin/primitives.wasm /usr/src/aztec3-circuits/cpp/barretenberg/cpp/build-wasm/bin/primitives.wasm
COPY --from=builder /usr/src/aztec3-circuits/cpp/barretenberg/cpp/srs_db /usr/src/aztec3-circuits/cpp/barretenberg/cpp/srs_db