From 3ab689a2ac6c492b9a3e800cf09c485c0b77de74 Mon Sep 17 00:00:00 2001 From: ludamad Date: Sat, 19 Aug 2023 12:36:02 -0400 Subject: [PATCH 1/2] fix: bb mirror --- circuits/cpp/barretenberg/.gitrepo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circuits/cpp/barretenberg/.gitrepo b/circuits/cpp/barretenberg/.gitrepo index a35ca3b110d..cc5e5b5a8cc 100644 --- a/circuits/cpp/barretenberg/.gitrepo +++ b/circuits/cpp/barretenberg/.gitrepo @@ -7,6 +7,6 @@ remote = https://github.com/AztecProtocol/barretenberg branch = master commit = 3afc2438053f530e49fbebbdbadd8db8a630bb8c - parent = 347a38a54e0ea7f6da1b45a8640b8506c3712bb1 + parent = 5f08fff8355671e883bef0380bf06313429d3e1d method = merge cmdver = 0.4.6 From c54e30975388ca5a39ad2442dfba95b34c6fcad5 Mon Sep 17 00:00:00 2001 From: ludamad Date: Sat, 19 Aug 2023 12:37:16 -0400 Subject: [PATCH 2/2] doc: README --- circuits/cpp/barretenberg/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/circuits/cpp/barretenberg/README.md b/circuits/cpp/barretenberg/README.md index 1ce6d6e8dd1..c551fba0514 100644 --- a/circuits/cpp/barretenberg/README.md +++ b/circuits/cpp/barretenberg/README.md @@ -2,6 +2,7 @@ Barretenberg aims to be a stand-alone and well-specified library, but please see https://github.com/AztecProtocol/aztec-packages/edit/master/circuits/cpp/barretenberg for the authoritative source of this code. The separate repository https://github.com/AztecProtocol/barretenberg is available if working on barretenberg independently of Aztec, however it is encouraged to develop in the context of Aztec to see if it will cause issues for Aztec end-to-end tests. +**Currently, merging only occurs in aztec-packages. This is a mirror-only repository until it matures. Legacy release merges need an admin** As the spec solidifies, this should be less of an issue. Aztec and Barretenberg are currently under heavy development. **This code is highly experimental, use at your own risk!**