From 23e1683f0c1a4f6fcf66c381b4934cd2971bf4e7 Mon Sep 17 00:00:00 2001 From: Suyash Bagad Date: Fri, 17 Feb 2023 07:51:48 +0530 Subject: [PATCH] Link All to Barretenberg (David's work) (#11) * link all to barreteneberg * Point to latest bb commit. --------- Co-authored-by: dbanks12 --- barretenberg | 2 +- src/aztec3/circuits/abis/CMakeLists.txt | 3 +-- src/aztec3/circuits/apps/CMakeLists.txt | 6 +----- src/aztec3/circuits/kernel/CMakeLists.txt | 5 +---- src/aztec3/circuits/recursion/CMakeLists.txt | 7 +------ src/aztec3/circuits/rollup/CMakeLists.txt | 7 +------ src/aztec3/dbs/CMakeLists.txt | 5 +---- src/aztec3/oracle/CMakeLists.txt | 5 +---- 8 files changed, 8 insertions(+), 32 deletions(-) diff --git a/barretenberg b/barretenberg index e98e16cf9cf..3f7dda65b58 160000 --- a/barretenberg +++ b/barretenberg @@ -1 +1 @@ -Subproject commit e98e16cf9cfdc8e5d7a8dc1fa64befdea746517d +Subproject commit 3f7dda65b587afe34496bbe9abc29c6523125e64 diff --git a/src/aztec3/circuits/abis/CMakeLists.txt b/src/aztec3/circuits/abis/CMakeLists.txt index 45ff2652ca1..d261be7372c 100644 --- 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 ) \ No newline at end of file diff --git a/src/aztec3/circuits/apps/CMakeLists.txt b/src/aztec3/circuits/apps/CMakeLists.txt index b2167c79207..91afc83b650 100644 --- 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 ) \ No newline at end of file diff --git a/src/aztec3/circuits/kernel/CMakeLists.txt b/src/aztec3/circuits/kernel/CMakeLists.txt index 8eacdf51540..960adcf4854 100644 --- 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 ) \ No newline at end of file diff --git a/src/aztec3/circuits/recursion/CMakeLists.txt b/src/aztec3/circuits/recursion/CMakeLists.txt index 36d5fa3a10e..f9586745db8 100644 --- 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 ) \ No newline at end of file diff --git a/src/aztec3/circuits/rollup/CMakeLists.txt b/src/aztec3/circuits/rollup/CMakeLists.txt index 94089cca0e0..fb099fb3e10 100644 --- 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 ) \ No newline at end of file diff --git a/src/aztec3/dbs/CMakeLists.txt b/src/aztec3/dbs/CMakeLists.txt index 3138d0baa38..b51bfec1c3a 100644 --- 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 ) \ No newline at end of file diff --git a/src/aztec3/oracle/CMakeLists.txt b/src/aztec3/oracle/CMakeLists.txt index 9619b0f5475..6acd78ed5e6 100644 --- 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 ) \ No newline at end of file