Merge remote-tracking branch 'origin/master' into fc/fix-constant-gen

AztecProtocol · Mar 12, 2024 · b05f07c · b05f07c
2 parents 57113eb + 8d73f8a
commit b05f07c
Show file tree

Hide file tree

Showing 212 changed files with 11,291 additions and 1,760 deletions.
diff --git a/.github/workflows/mirror_noir_subrepo.yml b/.github/workflows/mirror_noir_subrepo.yml
@@ -117,7 +117,7 @@ jobs:
             cd noir-repo
             git fetch # see recent change
             git checkout $BRANCH || git checkout -b $BRANCH
-            git merge -Xtheirs origin/$STAGING_BRANCH -m "$COMMIT_MESSAGE"
+            git merge -Xours origin/$STAGING_BRANCH -m "$COMMIT_MESSAGE"
             git push origin $BRANCH
             cd ..
           }

diff --git a/.github/workflows/pull_noir.yml b/.github/workflows/pull_noir.yml
@@ -103,7 +103,7 @@ jobs:
             # Fix PR branch
             git fetch # see recent change
             git checkout $BRANCH || git checkout -b $BRANCH
-            git merge -Xtheirs origin/$STAGING_BRANCH -m "$COMMIT_MESSAGE"
+            git merge -Xours origin/$STAGING_BRANCH -m "$COMMIT_MESSAGE"
             git push origin $BRANCH
           }
           force_sync_staging

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,7 +1,7 @@
 {
-  ".": "0.27.0",
-  "yarn-project/cli": "0.27.0",
-  "yarn-project/aztec": "0.27.0",
-  "barretenberg": "0.27.0",
-  "barretenberg/ts": "0.27.0"
+  ".": "0.27.1",
+  "yarn-project/cli": "0.27.1",
+  "yarn-project/aztec": "0.27.1",
+  "barretenberg": "0.27.1",
+  "barretenberg/ts": "0.27.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## [0.27.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.27.0...aztec-packages-v0.27.1) (2024-03-12)
+
+
+### Features
+
+* Further ClientIVC breakdown ([#5146](https://github.com/AztecProtocol/aztec-packages/issues/5146)) ([c8e1cb8](https://github.com/AztecProtocol/aztec-packages/commit/c8e1cb8c6bc07bda2cf4aec3b5d2b2120bfafd01))
+* Nullifier non membership ([#5152](https://github.com/AztecProtocol/aztec-packages/issues/5152)) ([426bd6d](https://github.com/AztecProtocol/aztec-packages/commit/426bd6d2490d59126a31de91cd783a76b0dfdc84))
+
+
+### Bug Fixes
+
+* Increase the json limit for RPC requests ([#5161](https://github.com/AztecProtocol/aztec-packages/issues/5161)) ([419958c](https://github.com/AztecProtocol/aztec-packages/commit/419958c7c9abc40a5d83739a74e1ea0797b4f474))
+* Move timers for ClientIVC breakdown ([#5145](https://github.com/AztecProtocol/aztec-packages/issues/5145)) ([5457edb](https://github.com/AztecProtocol/aztec-packages/commit/5457edb3ddd29df96906f98fb05469a26a644654))
+
+
+### Miscellaneous
+
+* **boxes:** Adding clone contract option ([#4980](https://github.com/AztecProtocol/aztec-packages/issues/4980)) ([a427aa5](https://github.com/AztecProtocol/aztec-packages/commit/a427aa533216187a23b0697a2d91a9d89fb1e0eb))
+* Share code between provers ([#4655](https://github.com/AztecProtocol/aztec-packages/issues/4655)) ([ef10d65](https://github.com/AztecProtocol/aztec-packages/commit/ef10d6576aa9e89eece5a40669c425ae7987ee8a))
+
 ## [0.27.0](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.26.6...aztec-packages-v0.27.0) (2024-03-12)
 
 

diff --git a/avm-transpiler/Cargo.lock b/avm-transpiler/Cargo.lock
diff --git a/barretenberg/CHANGELOG.md b/barretenberg/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [0.27.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.27.0...barretenberg-v0.27.1) (2024-03-12)
+
+
+### Features
+
+* Further ClientIVC breakdown ([#5146](https://github.com/AztecProtocol/aztec-packages/issues/5146)) ([c8e1cb8](https://github.com/AztecProtocol/aztec-packages/commit/c8e1cb8c6bc07bda2cf4aec3b5d2b2120bfafd01))
+
+
+### Bug Fixes
+
+* Move timers for ClientIVC breakdown ([#5145](https://github.com/AztecProtocol/aztec-packages/issues/5145)) ([5457edb](https://github.com/AztecProtocol/aztec-packages/commit/5457edb3ddd29df96906f98fb05469a26a644654))
+
+
+### Miscellaneous
+
+* Share code between provers ([#4655](https://github.com/AztecProtocol/aztec-packages/issues/4655)) ([ef10d65](https://github.com/AztecProtocol/aztec-packages/commit/ef10d6576aa9e89eece5a40669c425ae7987ee8a))
+
 ## [0.27.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.26.6...barretenberg-v0.27.0) (2024-03-12)
 
 

diff --git a/barretenberg/cpp/CMakeLists.txt b/barretenberg/cpp/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
 project(
     Barretenberg
     DESCRIPTION "BN254 elliptic curve library, and PLONK SNARK prover"
-    VERSION 0.27.0 # x-release-please-version
+    VERSION 0.27.1 # x-release-please-version
     LANGUAGES CXX C
 )
 # Insert version into `bb` config file

diff --git a/barretenberg/cpp/scripts/analyze_client_ivc_bench.py b/barretenberg/cpp/scripts/analyze_client_ivc_bench.py
@@ -27,13 +27,13 @@
 # For each kept time, get the proportion over all kept times.
 sum_of_kept_times_ms = sum(float(time)
                            for _, time in bench_components.items())/1e6
-MAX_LABEL_LENGTH = max(len(label) for label in to_keep)
+max_label_length = max(len(label) for label in to_keep)
 column = {"function": "function", "ms": "ms", "%": "% sum"}
 print(
-    f"{column['function']:<{MAX_LABEL_LENGTH}}{column['ms']:>8}  {column['%']:>8}")
+    f"{column['function']:<{max_label_length}}{column['ms']:>8}  {column['%']:>8}")
 for key in to_keep:
     time_ms = bench[key]/1e6
-    print(f"{key:<{MAX_LABEL_LENGTH}}{time_ms:>8.0f}  {time_ms/sum_of_kept_times_ms:>8.2%}")
+    print(f"{key:<{max_label_length}}{time_ms:>8.0f}  {time_ms/sum_of_kept_times_ms:>8.2%}")
 
 # Validate that kept times account for most of the total measured time.
 total_time_ms = bench["real_time"]
@@ -42,8 +42,31 @@
     sum_of_kept_times_ms, total_time_ms, sum_of_kept_times_ms/total_time_ms)
 print(totals)
 
+print("\nMajor contributors:")
+print(
+    f"{column['function']:<{max_label_length}}{column['ms']:>8}  {column['%']:>7}")
+for key in ['commit(t)', 'compute_combiner(t)', 'compute_perturbator(t)', 'compute_univariate(t)']:
+    time_ms = bench[key]/1e6
+    print(f"{key:<{max_label_length}}{time_ms:>8.0f} {time_ms/sum_of_kept_times_ms:>8.2%}")
+
+
 print('\nBreakdown of ECCVMProver::create_prover:')
 for key in ["ECCVMComposer::compute_witness(t)", "ECCVMComposer::create_proving_key(t)"]:
     time_ms = bench[key]/1e6
     total_time_ms = bench["ECCVMComposer::create_prover(t)"]/1e6
-    print(f"{key:<{MAX_LABEL_LENGTH}}{time_ms:>8.0f}  {time_ms/total_time_ms:>8.2%}")
+    print(f"{key:<{max_label_length}}{time_ms:>8.0f}  {time_ms/total_time_ms:>8.2%}")
+
+print('\nBreakdown of ProtogalaxyProver::fold_instances:')
+protogalaxy_round_labels = [
+    "ProtoGalaxyProver_::preparation_round(t)", 
+    "ProtoGalaxyProver_::perturbator_round(t)", 
+    "ProtoGalaxyProver_::combiner_quotient_round(t)", 
+    "ProtoGalaxyProver_::accumulator_update_round(t)"
+]
+max_label_length = max(len(label) for label in protogalaxy_round_labels)
+for key in protogalaxy_round_labels:
+    time_ms = bench[key]/1e6
+    total_time_ms = bench["ProtogalaxyProver::fold_instances(t)"]/1e6
+    print(f"{key:<{max_label_length}}{time_ms:>8.0f}  {time_ms/total_time_ms:>8.2%}")
+
+
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.cpp
@@ -135,11 +135,13 @@ std::shared_ptr<typename ProverInstances::Instance> ProtoGalaxyProver_<ProverIns
 
 template <class ProverInstances> void ProtoGalaxyProver_<ProverInstances>::preparation_round()
 {
+    BB_OP_COUNT_TIME_NAME("ProtoGalaxyProver_::preparation_round");
     prepare_for_folding();
 };
 
 template <class ProverInstances> void ProtoGalaxyProver_<ProverInstances>::perturbator_round()
 {
+    BB_OP_COUNT_TIME_NAME("ProtoGalaxyProver_::perturbator_round");
     state.accumulator = get_accumulator();
     FF delta = transcript->template get_challenge<FF>("delta");
     state.deltas = compute_round_challenge_pows(state.accumulator->proving_key->log_circuit_size, delta);
@@ -157,6 +159,7 @@ template <class ProverInstances> void ProtoGalaxyProver_<ProverInstances>::pertu
 
 template <class ProverInstances> void ProtoGalaxyProver_<ProverInstances>::combiner_quotient_round()
 {
+    BB_OP_COUNT_TIME_NAME("ProtoGalaxyProver_::combiner_quotient_round");
     auto perturbator_challenge = transcript->template get_challenge<FF>("perturbator_challenge");
     instances.next_gate_challenges =
         update_gate_challenges(perturbator_challenge, state.accumulator->gate_challenges, state.deltas);
@@ -175,6 +178,7 @@ template <class ProverInstances> void ProtoGalaxyProver_<ProverInstances>::combi
 
 template <class ProverInstances> void ProtoGalaxyProver_<ProverInstances>::accumulator_update_round()
 {
+    BB_OP_COUNT_TIME_NAME("ProtoGalaxyProver_::accumulator_update_round");
     FF combiner_challenge = transcript->template get_challenge<FF>("combiner_quotient_challenge");
     std::shared_ptr<Instance> next_accumulator =
         compute_next_accumulator(instances, state.combiner_quotient, combiner_challenge, state.compressed_perturbator);

diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp
@@ -106,6 +106,8 @@ template <typename Flavor> class SumcheckProverRound {
         const bb::PowPolynomial<FF>& pow_polynomial,
         const RelationSeparator alpha)
     {
+        BB_OP_COUNT_TIME();
+
         // Compute the constant contribution of pow polynomials for each edge. This is  the product of the partial
         // evaluation result c_l (i.e. pow(u_0,...,u_{l-1})) where u_0,...,u_{l-1} are the verifier challenges from
         // previous rounds) and the elements of pow(\vec{β}) not containing β_0,..., β_l.

diff --git a/barretenberg/ts/CHANGELOG.md b/barretenberg/ts/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.27.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.27.0...barretenberg.js-v0.27.1) (2024-03-12)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
 ## [0.27.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.26.6...barretenberg.js-v0.27.0) (2024-03-12)
 
 

diff --git a/barretenberg/ts/package.json b/barretenberg/ts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aztec/bb.js",
-  "version": "0.27.0",
+  "version": "0.27.1",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/barretenberg/ts",
   "license": "MIT",
   "type": "module",

diff --git a/docs/docs/developers/getting_started/quickstart.md b/docs/docs/developers/getting_started/quickstart.md
@@ -98,3 +98,5 @@ Congratulations! You are all set up with the Aztec sandbox!
 To deploy and interact with a contract using Aztec.js, go to the [next page](aztecnr-getting-started.md).
 
 You can also dig more into the sandbox and CLI [here](../sandbox/main.md).
+
+To learn more about writing contracts, consider jumping to the [tutorials section](../tutorials/main.md).
diff --git a/l1-contracts/scripts/ci_deploy_contracts.sh b/l1-contracts/scripts/ci_deploy_contracts.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -euo pipefail
+
 export ETHEREUM_HOST=https://$DEPLOY_TAG-mainnet-fork.aztec.network:8545/$FORK_API_KEY
 
 REPOSITORY="l1-contracts"
@@ -29,7 +31,7 @@ retry docker pull $CLI_IMAGE
 PRIVATE_KEY=${CONTRACT_PUBLISHER_PRIVATE_KEY#0x}
 docker run \
   $CLI_IMAGE \
-  deploy-l1-contracts -u $ETHEREUM_HOST -p $PRIVATE_KEY >./serve/contract_addresses.json
+  deploy-l1-contracts -u $ETHEREUM_HOST -p $PRIVATE_KEY | tee ./serve/contract_addresses.json
 
 ## Result format is:
 # Rollup Address: 0xe33d37702bb94e83ca09e7dc804c9f4c4ab8ee4a

diff --git a/noir/noir-repo/.github/JS_PUBLISH_FAILED.md b/noir/noir-repo/.github/JS_PUBLISH_FAILED.md
@@ -1,6 +1,6 @@
 ---
 title: "JS packages failed to publish"
-assignees: TomAFrench kevaundray savio-sou
+assignees: TomAFrench kevaundray Savio-Sou
 labels: js
 ---