Link All to Barretenberg (David's work) (#11)

* link all to barreteneberg * Point to latest bb commit. --------- Co-authored-by: dbanks12 <[email protected]>
AztecProtocol · Feb 17, 2023 · 23e1683 · 23e1683
1 parent 11a8549
commit 23e1683
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 32 deletions.
diff --git a/barretenberg b/barretenberg
diff --git a/src/aztec3/circuits/abis/CMakeLists.txt b/src/aztec3/circuits/abis/CMakeLists.txt
@@ -1,5 +1,4 @@
 barretenberg_module(
     aztec3_circuits_abis
-    stdlib_primitives
-    stdlib_pedersen
+    barretenberg
 )
diff --git a/src/aztec3/circuits/apps/CMakeLists.txt b/src/aztec3/circuits/apps/CMakeLists.txt
@@ -1,8 +1,4 @@
 barretenberg_module(
     aztec3_circuits_apps
-    # ecc
-    crypto_pedersen
-    stdlib_primitives
-    stdlib_pedersen
-    stdlib_blake2s
+    barretenberg
 )
diff --git a/src/aztec3/circuits/kernel/CMakeLists.txt b/src/aztec3/circuits/kernel/CMakeLists.txt
@@ -5,8 +5,5 @@ barretenberg_module(
     # aztec3_circuits_abis
     aztec3_circuits_apps
 
-    # stdlib_recursion
-    stdlib_primitives
-    stdlib_pedersen
-    stdlib_blake3s
+    barretenberg
 )
diff --git a/src/aztec3/circuits/recursion/CMakeLists.txt b/src/aztec3/circuits/recursion/CMakeLists.txt
@@ -1,9 +1,4 @@
 barretenberg_module(
     aztec3_circuits_recursion
-    # Question: why can't I link to these barretenberg modules?
-    # aztec3_circuits_abis
-    # stdlib_recursion
-    stdlib_primitives
-    stdlib_pedersen
-    stdlib_blake3s
+    barretenberg
 )
diff --git a/src/aztec3/circuits/rollup/CMakeLists.txt b/src/aztec3/circuits/rollup/CMakeLists.txt
@@ -1,9 +1,4 @@
 barretenberg_module(
     aztec3_circuits_rollup
-    # Question: why can't I link to these barretenberg modules?
-    # aztec3_circuits_abis
-    # stdlib_recursion
-    stdlib_primitives
-    stdlib_pedersen
-    stdlib_blake3s
+    barretenberg
 )
diff --git a/src/aztec3/dbs/CMakeLists.txt b/src/aztec3/dbs/CMakeLists.txt
@@ -29,8 +29,5 @@ endif()
 
 barretenberg_module(
     aztec3_dbs
-    stdlib_merkle_tree # for the general db logic
-    stdlib_primitives
-    stdlib_pedersen
-    crypto_pedersen
+    barretenberg
 )
diff --git a/src/aztec3/oracle/CMakeLists.txt b/src/aztec3/oracle/CMakeLists.txt
@@ -1,8 +1,5 @@
 barretenberg_module(
     aztec3_oracle
     aztec3_circuits_apps
-    crypto_pedersen
-    stdlib_primitives
-    stdlib_pedersen
-    stdlib_blake2s
+    barretenberg
 )
+1 −1		README.md
+1 −1		cpp/CMakeLists.txt
+18 −8		cpp/cmake/module.cmake
+1 −1		cpp/dockerfiles/Dockerfile.wasm-linux-clang
+15 −0		cpp/src/aztec/CMakeLists.txt
+1 −0		cpp/src/aztec/common/streams.hpp
+32 −15		cpp/src/aztec/stdlib/merkle_tree/CMakeLists.txt
+7 −1		cpp/srs_db/download_ignition_lagrange.sh