Merge remote-tracking branch 'origin/master' into cl/granular_top_lev…

…el_init

.release-please-manifest.json

@@ -1,5 +1,5 @@
 {
-  ".": "0.16.3",
-  "barretenberg": "0.16.3",
-  "barretenberg/ts": "0.16.3"
+  ".": "0.16.7",
+  "barretenberg": "0.16.7",
+  "barretenberg/ts": "0.16.7"
 }

CHANGELOG.md

@@ -1,5 +1,70 @@
 # Changelog
 
+## [0.16.7](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.16.6...aztec-packages-v0.16.7) (2023-12-06)
+
+
+### Features
+
+* Encapsulated Goblin ([#3524](https://github.com/AztecProtocol/aztec-packages/issues/3524)) ([2f08423](https://github.com/AztecProtocol/aztec-packages/commit/2f08423e37942f991634fe6c45de52feb1f159cf))
+
+
+### Bug Fixes
+
+* Extract whole archive instead of subset ([#3604](https://github.com/AztecProtocol/aztec-packages/issues/3604)) ([cb000d8](https://github.com/AztecProtocol/aztec-packages/commit/cb000d828dcea0ec5025bceadd322b1d260c0111))
+
+
+### Documentation
+
+* **yellow-paper:** Note hash, nullifier, and public data trees ([#3518](https://github.com/AztecProtocol/aztec-packages/issues/3518)) ([0e2db8b](https://github.com/AztecProtocol/aztec-packages/commit/0e2db8b0a819dfe44dd5c76ff89aaa1f403d2071))
+
+## [0.16.6](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.16.5...aztec-packages-v0.16.6) (2023-12-06)
+
+
+### Bug Fixes
+
+* **pxe:** Initialise aztecjs on pxe startup ([#3601](https://github.com/AztecProtocol/aztec-packages/issues/3601)) ([ceb2ed2](https://github.com/AztecProtocol/aztec-packages/commit/ceb2ed2618398c6af56e69ec0a9f58b808547f30))
+* Remove api_prefix local ([#3599](https://github.com/AztecProtocol/aztec-packages/issues/3599)) ([0d8dd8d](https://github.com/AztecProtocol/aztec-packages/commit/0d8dd8d14fa002b4dadcd7ea70e01c5b263edaee))
+
+
+### Miscellaneous
+
+* **yellow_paper:** Fixes to my work on public private messages ([#3507](https://github.com/AztecProtocol/aztec-packages/issues/3507)) ([33a4f63](https://github.com/AztecProtocol/aztec-packages/commit/33a4f63dc8004d144d891fb8016d85471c64e880))
+
+## [0.16.5](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.16.4...aztec-packages-v0.16.5) (2023-12-06)
+
+
+### Features
+
+* Add EFS file storage to devnet nodes ([#3584](https://github.com/AztecProtocol/aztec-packages/issues/3584)) ([5b590eb](https://github.com/AztecProtocol/aztec-packages/commit/5b590eb06fab7ecfcd62aa78a04e035dc8db6b41))
+
+
+### Bug Fixes
+
+* **ci:** Aztec node devnet healthchecks ([#3598](https://github.com/AztecProtocol/aztec-packages/issues/3598)) ([1a9d742](https://github.com/AztecProtocol/aztec-packages/commit/1a9d742cb21ea71df33eb8931b0faecc96e84508))
+* **ci:** Count for EFS AZ2 ([#3597](https://github.com/AztecProtocol/aztec-packages/issues/3597)) ([d427bca](https://github.com/AztecProtocol/aztec-packages/commit/d427bca1c53aacc499f0895bb172f88d96e9347e))
+* **ci:** L1-contracts npm release ([#3596](https://github.com/AztecProtocol/aztec-packages/issues/3596)) ([008df50](https://github.com/AztecProtocol/aztec-packages/commit/008df5018e8f924ac93ad5d9d712727c51952c54))
+* **ci:** Node health-check + contract address env vars ([#3578](https://github.com/AztecProtocol/aztec-packages/issues/3578)) ([fffc700](https://github.com/AztecProtocol/aztec-packages/commit/fffc7007cf5a5fb5e721c63d4abff5184d40c9c0))
+
+
+### Miscellaneous
+
+* Make noir-circuit independent of aztec-nr ([#3591](https://github.com/AztecProtocol/aztec-packages/issues/3591)) ([3013354](https://github.com/AztecProtocol/aztec-packages/commit/301335479f45837e61e1b434566dff98a0867a37))
+* Remove foundation and types deps from boxes ([#3389](https://github.com/AztecProtocol/aztec-packages/issues/3389)) ([eade352](https://github.com/AztecProtocol/aztec-packages/commit/eade352a56b2365b5213962733735e45a6d46fb0))
+* Renaming blockstree to archive ([#3569](https://github.com/AztecProtocol/aztec-packages/issues/3569)) ([6c200e9](https://github.com/AztecProtocol/aztec-packages/commit/6c200e932b6a4bb218059e7b9f92f97c70aa8195))
+* Trivial change roundup ([#3556](https://github.com/AztecProtocol/aztec-packages/issues/3556)) ([ff893b2](https://github.com/AztecProtocol/aztec-packages/commit/ff893b236091b480b6de18ebaab57c62dcdfe1d4))
+
+
+### Documentation
+
+* Add libstdc++-12-dev to setup instructions ([#3585](https://github.com/AztecProtocol/aztec-packages/issues/3585)) ([9773e8c](https://github.com/AztecProtocol/aztec-packages/commit/9773e8c3b4789f0dd6b5fdaf0f283b9bd7c9812f))
+
+## [0.16.4](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.16.3...aztec-packages-v0.16.4) (2023-12-05)
+
+
+### Bug Fixes
+
+* **ci:** Separate step for l1-contracts npm release ([#3581](https://github.com/AztecProtocol/aztec-packages/issues/3581)) ([7745975](https://github.com/AztecProtocol/aztec-packages/commit/7745975731a009c9010291b9174d321941754760))
+
 ## [0.16.3](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.16.2...aztec-packages-v0.16.3) (2023-12-05)
 
 

aztec-up/README.md

@@ -1,7 +1,7 @@
 # The Aztec Installation Script
 
 ```
-bash -c "$(curl https://up.aztec.network)"
+bash -i <(curl -s install.aztec.network)
 ```
 
 That is all.
@@ -12,19 +12,19 @@ a users `PATH` variable in their shell startup script so they can be found.
 - `aztec` - The infrastructure container.
 - `aztec-cli` - A command line tool for interacting with infrastructure.
 - `aztec-nargo` - A build of `nargo` from `noir` that is guaranteed to be version aligned. Provides compiler, lsp and more.
+  <<<<<<< HEAD
 
 Run any of these commands to get more help.
 
-To upgrade, re-run the install script as above. To install a specific version you can e.g.
-
 ```
-VERSION=master bash -c "$(curl https://up.aztec.network)"
+VERSION=master aztec-up
+>>>>>>> origin/master
 ```
 
 This will install the container built from master branch.
 
 ```
-VERSION=v1.2.3 bash -c "$(curl https://up.aztec.network)"
+VERSION=v1.2.3 aztec-up
 ```
 
 This will install tagged release version 1.2.3.

barretenberg/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 7afca0e7caf5440862b1ea12874418a319608121
-	parent = 9f682cb8cf37eb392c4979f62fdec7126fb4d102
+	commit = 4e4634542814f15d3703fe560874e08eda57e1fa
+	parent = 379b5adc259ac69b01e61b852172cdfc87cf9350
 	method = merge
 	cmdver = 0.4.6

barretenberg/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [0.16.7](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.16.6...barretenberg-v0.16.7) (2023-12-06)
+
+
+### Features
+
+* Encapsulated Goblin ([#3524](https://github.com/AztecProtocol/aztec-packages/issues/3524)) ([2f08423](https://github.com/AztecProtocol/aztec-packages/commit/2f08423e37942f991634fe6c45de52feb1f159cf))
+
+## [0.16.6](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.16.5...barretenberg-v0.16.6) (2023-12-06)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
+## [0.16.5](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.16.4...barretenberg-v0.16.5) (2023-12-06)
+
+
+### Miscellaneous
+
+* Trivial change roundup ([#3556](https://github.com/AztecProtocol/aztec-packages/issues/3556)) ([ff893b2](https://github.com/AztecProtocol/aztec-packages/commit/ff893b236091b480b6de18ebaab57c62dcdfe1d4))
+
+
+### Documentation
+
+* Add libstdc++-12-dev to setup instructions ([#3585](https://github.com/AztecProtocol/aztec-packages/issues/3585)) ([9773e8c](https://github.com/AztecProtocol/aztec-packages/commit/9773e8c3b4789f0dd6b5fdaf0f283b9bd7c9812f))
+
+## [0.16.4](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.16.3...barretenberg-v0.16.4) (2023-12-05)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
 ## [0.16.3](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.16.2...barretenberg-v0.16.3) (2023-12-05)
 
 

barretenberg/README.md

@@ -46,12 +46,13 @@ Ignores proving key construction.
 - Ninja (used by the presets as the default generator)
 - clang >= 16 or gcc >= 10
 - clang-format
+- libstdc++ >= 12
 - libomp (if multithreading is required. Multithreading can be disabled using the compiler flag `-DMULTITHREADING 0`)
 
 To install on Ubuntu, run:
 
 ```
-sudo apt-get install cmake clang clang-format ninja-build
+sudo apt-get install cmake clang clang-format ninja-build libstdc++-12-dev
 ```
 
 ### Installing openMP (Linux)

barretenberg/cpp/CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24)
 project(
     Barretenberg
     DESCRIPTION "BN254 elliptic curve library, and PLONK SNARK prover"
-    VERSION 0.16.3 # x-release-please-version
+    VERSION 0.16.7 # x-release-please-version
     LANGUAGES CXX C
 )
 # Insert version into `bb` config file

barretenberg/cpp/src/CMakeLists.txt

@@ -58,8 +58,8 @@ add_subdirectory(barretenberg/eccvm)
 add_subdirectory(barretenberg/env)
 add_subdirectory(barretenberg/examples)
 add_subdirectory(barretenberg/flavor)
-add_subdirectory(barretenberg/grumpkin_srs_gen)
 add_subdirectory(barretenberg/goblin)
+add_subdirectory(barretenberg/grumpkin_srs_gen)
 add_subdirectory(barretenberg/honk)
 add_subdirectory(barretenberg/join_split_example)
 add_subdirectory(barretenberg/numeric)

barretenberg/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp

@@ -218,7 +218,7 @@ void construct_proof_with_specified_num_iterations(
     Composer composer;
 
     for (auto _ : state) {
-        // Constuct circuit and prover; don't include this part in measurement
+        // Construct circuit and prover; don't include this part in measurement
         state.PauseTiming();
         auto prover = get_prover(composer, test_circuit_function, num_iterations);
         state.ResumeTiming();

barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.hpp

@@ -81,16 +81,15 @@ template <typename Curve> class KZG {
         auto quotient_commitment = verifier_transcript->template receive_from_prover<Commitment>("KZG:W");
 
         GroupElement P_0;
-        // Note: In the recursive setting, we only add the contribution if it is not the point at infinity (i.e. if the
-        // evaluation is not equal to zero).
         if constexpr (Curve::is_stdlib_type) {
             auto builder = verifier_transcript->builder;
             auto one = Fr(builder, 1);
-            std::vector<GroupElement> commitments = { claim.commitment, quotient_commitment };
-            std::vector<Fr> scalars = { one, claim.opening_pair.challenge };
+            std::vector<GroupElement> commitments = { claim.commitment,
+                                                      quotient_commitment,
+                                                      GroupElement::one(builder) };
+            std::vector<Fr> scalars = { one, claim.opening_pair.challenge, -claim.opening_pair.evaluation };
             P_0 = GroupElement::batch_mul(commitments, scalars);
-            // Note: This implementation assumes the evaluation is zero (as is the case for shplonk).
-            ASSERT(claim.opening_pair.evaluation.get_value() == 0);
+
         } else {
             P_0 = claim.commitment;
             P_0 += quotient_commitment * claim.opening_pair.challenge;

barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.cpp

@@ -2,7 +2,7 @@
 #include "barretenberg/commitment_schemes/claim.hpp"
 #include "barretenberg/commitment_schemes/commitment_key.hpp"
 #include "barretenberg/common/ref_array.hpp"
-#include "barretenberg/honk/proof_system/lookup_library.hpp"
+#include "barretenberg/honk/proof_system/logderivative_library.hpp"
 #include "barretenberg/honk/proof_system/permutation_library.hpp"
 #include "barretenberg/honk/proof_system/power_polynomial.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
@@ -183,7 +183,7 @@ template <ECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_log_derivative_
         gamma * (gamma + beta_sqr) * (gamma + beta_sqr + beta_sqr) * (gamma + beta_sqr + beta_sqr + beta_sqr);
     relation_parameters.eccvm_set_permutation_delta = relation_parameters.eccvm_set_permutation_delta.invert();
     // Compute inverse polynomial for our logarithmic-derivative lookup method
-    lookup_library::compute_logderivative_inverse<Flavor, typename Flavor::LookupRelation>(
+    logderivative_library::compute_logderivative_inverse<Flavor, typename Flavor::LookupRelation>(
         prover_polynomials, relation_parameters, key->circuit_size);
     transcript->send_to_verifier(commitment_labels.lookup_inverses, commitment_key->commit(key->lookup_inverses));
     prover_polynomials.lookup_inverses = key->lookup_inverses;
@@ -345,31 +345,34 @@ template <ECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_transcript_cons
     transcript->send_to_verifier("Translation:hack_evaluation", hack.evaluate(evaluation_challenge_x));
 
     // Get another challenge for batching the univariate claims
-    FF batching_challenge = transcript->get_challenge("Translation:batching_challenge");
+    FF ipa_batching_challenge = transcript->get_challenge("Translation:ipa_batching_challenge");
 
     // Collect the polynomials and evaluations to be batched
     RefArray univariate_polynomials{ key->transcript_op, key->transcript_Px, key->transcript_Py,
                                      key->transcript_z1, key->transcript_z2, hack };
     std::array<FF, univariate_polynomials.size()> univariate_evaluations;
 
-    // Constuct the batched polynomial and batched evaluation
+    // Construct the batched polynomial and batched evaluation
     Polynomial batched_univariate{ key->circuit_size };
     FF batched_evaluation{ 0 };
     auto batching_scalar = FF(1);
     for (auto [polynomial, eval] : zip_view(univariate_polynomials, univariate_evaluations)) {
         batched_univariate.add_scaled(polynomial, batching_scalar);
         batched_evaluation += eval * batching_scalar;
-        batching_scalar *= batching_challenge;
+        batching_scalar *= ipa_batching_challenge;
     }
 
     // Compute a proof for the batched univariate opening
     PCS::compute_opening_proof(
         commitment_key, { evaluation_challenge_x, batched_evaluation }, batched_univariate, transcript);
+
+    // Get another challenge for batching the univariate claims
+    translation_batching_challenge_v = transcript->get_challenge("Translation:batching_challenge");
 }
 
 template <ECCVMFlavor Flavor> plonk::proof& ECCVMProver_<Flavor>::export_proof()
 {
-    proof.proof_data = transcript->proof_data;
+    proof.proof_data = transcript->export_proof();
     return proof;
 }
 

barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp

@@ -69,6 +69,7 @@ template <ECCVMFlavor Flavor> class ECCVMProver_ {
     Polynomial quotient_W;
 
     FF evaluation_challenge_x;
+    FF translation_batching_challenge_v; // to be rederived by the translator verifier
 
     sumcheck::SumcheckOutput<Flavor> sumcheck_output;
     pcs::gemini::ProverOutput<Curve> gemini_output;

barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp

@@ -253,16 +253,17 @@ template <typename Flavor> bool ECCVMVerifier_<Flavor>::verify_proof(const plonk
             transcript->template receive_from_prover<FF>("Translation:hack_evaluation")
         };
 
-        FF batching_challenge = transcript->get_challenge("Translation:batching_challenge");
+        // Get another challenge for batching the univariate claims
+        FF ipa_batching_challenge = transcript->get_challenge("Translation:ipa_batching_challenge");
 
-        // Constuct batched commitment and batched evaluation
+        // Construct batched commitment and batched evaluation
         auto batched_commitment = transcript_commitments[0];
         auto batched_transcript_eval = transcript_evaluations[0];
-        auto batching_scalar = batching_challenge;
+        auto batching_scalar = ipa_batching_challenge;
         for (size_t idx = 1; idx < transcript_commitments.size(); ++idx) {
             batched_commitment = batched_commitment + transcript_commitments[idx] * batching_scalar;
             batched_transcript_eval += batching_scalar * transcript_evaluations[idx];
-            batching_scalar *= batching_challenge;
+            batching_scalar *= ipa_batching_challenge;
         }
 
         // Construct and verify batched opening claim

barretenberg/cpp/src/barretenberg/flavor/CMakeLists.txt

@@ -1 +1 @@
-barretenberg_module(flavor commitment_schemes ecc polynomials proof_system)
+barretenberg_module(flavor commitment_schemes ecc polynomials proof_system)