Merge branch 'master' into palla/kill-entrypoint-collection

AztecProtocol · Sep 11, 2023 · e1af774 · e1af774
2 parents 32b5462 + e6af616
commit e1af774
Show file tree

Hide file tree

Showing 44 changed files with 450 additions and 412 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -227,18 +227,18 @@ jobs:
           command: cond_spot_run_tests barretenberg-x86_64-linux-clang-assert 3 join_split_example_proofs_join_split_tests --gtest_filter=-*full_proof*
       - *save_logs
 
-  barretenberg-benchmark-aggregator:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
-    steps:
-      - attach_workspace:
-          at: /tmp/test-logs
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Test"
-          command: ./scripts/ci/store_test_benchmark_logs $AZTEC_GITHUB_TOKEN
+  # barretenberg-benchmark-aggregator:
+  #   docker:
+  #     - image: aztecprotocol/alpine-build-image
+  #   resource_class: small
+  #   steps:
+  #     - attach_workspace:
+  #         at: /tmp/test-logs
+  #     - *checkout
+  #     - *setup_env
+  #     - run:
+  #         name: "Test"
+  #         command: ./scripts/ci/store_test_benchmark_logs $AZTEC_GITHUB_TOKEN
 
   barretenberg-acir-tests-bb:
     docker:
@@ -1202,7 +1202,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: spot_run_test_script ./scripts/run_tests canary uniswap_trade_on_l1_from_l2.test.ts canary scripts/docker-compose.yml
+          command: spot_run_test_script ./scripts/run_tests canary uniswap_trade_on_l1_from_l2.test.ts canary docker-compose.yml
 
   run-deployment-canary-browser:
     docker:
@@ -1213,7 +1213,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: spot_run_test_script ./scripts/run_tests canary aztec_js_browser.test.ts canary scripts/docker-compose.yml
+          command: spot_run_test_script ./scripts/run_tests canary aztec_js_browser.test.ts canary docker-compose.yml
 
   run-deployment-canary-cli:
     docker:
@@ -1224,7 +1224,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: spot_run_test_script ./scripts/run_tests canary cli.test.ts canary scripts/docker-compose.yml
+          command: spot_run_test_script ./scripts/run_tests canary cli.test.ts canary docker-compose.yml
 
 # Repeatable config for defining the workflow below.
 tag_regex: &tag_regex /^aztec-packages-v.*/
@@ -1292,18 +1292,18 @@ workflows:
       - barretenberg-stdlib-recursion-turbo-tests: *bb_test
       - barretenberg-stdlib-recursion-ultra-tests: *bb_test
       - barretenberg-join-split-tests: *bb_test
-      - barretenberg-benchmark-aggregator:
-          requires:
-            - barretenberg-tests
-            - barretenberg-stdlib-tests
-            - barretenberg-stdlib-recursion-turbo-tests
-            - barretenberg-stdlib-recursion-ultra-tests
-            - barretenberg-join-split-tests
-          filters:
-            branches:
-              only:
-                - master
-          <<: *defaults
+      # - barretenberg-benchmark-aggregator:
+      #     requires:
+      #       - barretenberg-tests
+      #       - barretenberg-stdlib-tests
+      #       - barretenberg-stdlib-recursion-turbo-tests
+      #       - barretenberg-stdlib-recursion-ultra-tests
+      #       - barretenberg-join-split-tests
+      #     filters:
+      #       branches:
+      #         only:
+      #           - master
+      #     <<: *defaults
       - bb-js:
           requires:
             - barretenberg-wasm-linux-clang

diff --git a/.github/workflows/release_please.yml b/.github/workflows/release_please.yml
@@ -19,14 +19,14 @@ jobs:
         id: release
         uses: google-github-actions/release-please-action@v3
         with:
+          token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
           command: manifest
 
       - name: Dispatch to publish workflow
         uses: benc-uk/workflow-dispatch@v1
         if: ${{ steps.release.outputs.tag_name }}
         with:
           workflow: publish-bb.yml
-          repo: AztecProtocol/aztec-packages
           ref: master
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
           inputs: '{ "tag": "${{ steps.release.outputs.tag_name }}", "publish": true }'
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,5 +1,5 @@
 {
-  ".": "0.6.1",
-  "circuits/cpp/barretenberg": "0.6.1",
-  "circuits/cpp/barretenberg/ts": "0.6.1"
+  ".": "0.6.6",
+  "circuits/cpp/barretenberg": "0.6.6",
+  "circuits/cpp/barretenberg/ts": "0.6.6"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,45 @@
 # Changelog
 
+## [0.6.6](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.6.5...aztec-packages-v0.6.6) (2023-09-11)
+
+
+### Features
+
+* **noir:** Introduce context union to simplify storage declarations ([#2143](https://github.com/AztecProtocol/aztec-packages/issues/2143)) ([2288e44](https://github.com/AztecProtocol/aztec-packages/commit/2288e44a5b817076c9d51db5f99905deeeffc418)), closes [#2012](https://github.com/AztecProtocol/aztec-packages/issues/2012)
+
+
+### Bug Fixes
+
+* **test:** Fix regex in canary test ([#2165](https://github.com/AztecProtocol/aztec-packages/issues/2165)) ([e5f50df](https://github.com/AztecProtocol/aztec-packages/commit/e5f50df55e68f6c94b602fc16b33abbcea15674e))
+
+## [0.6.5](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.6.4...aztec-packages-v0.6.5) (2023-09-08)
+
+
+### Bug Fixes
+
+* Revert "fix: commit tags and rebuilds" ([#2159](https://github.com/AztecProtocol/aztec-packages/issues/2159)) ([50396a0](https://github.com/AztecProtocol/aztec-packages/commit/50396a068f11216947eac0137baa198424da9b81))
+
+## [0.6.4](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.6.3...aztec-packages-v0.6.4) (2023-09-08)
+
+
+### Bug Fixes
+
+* Commit tags and rebuilds ([#2156](https://github.com/AztecProtocol/aztec-packages/issues/2156)) ([7669b43](https://github.com/AztecProtocol/aztec-packages/commit/7669b43253f8c2633e96f483ec12c75478dcf539))
+
+## [0.6.3](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.6.2...aztec-packages-v0.6.3) (2023-09-08)
+
+
+### Bug Fixes
+
+* Revert bad spot-ification ([#2153](https://github.com/AztecProtocol/aztec-packages/issues/2153)) ([d993d47](https://github.com/AztecProtocol/aztec-packages/commit/d993d47b4df93544c9d0128460eefea286212d77))
+
+## [0.6.2](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.6.1...aztec-packages-v0.6.2) (2023-09-08)
+
+
+### Bug Fixes
+
+* Setup_env commit check ([#2149](https://github.com/AztecProtocol/aztec-packages/issues/2149)) ([08ade47](https://github.com/AztecProtocol/aztec-packages/commit/08ade4706e250945be3764587b6863b824092fdd))
+
 ## [0.6.1](https://github.com/AztecProtocol/aztec-packages/compare/aztec-packages-v0.5.2...aztec-packages-v0.6.1) (2023-09-08)
 
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.6.1 x-release-please-version
+v0.6.6 x-release-please-version
diff --git a/build-system/.gitrepo b/build-system/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/build-system
 	branch = master
-	commit = 575595e15655a88934181bbb0faef4b89da52d9a
-	parent = 4ed5f0548cf7e8a9c65f176f469103363a42bc5f
+	commit = 58bf3a36a8ace401b934eaab53b05f26b22cc5c3
+	parent = 50396a068f11216947eac0137baa198424da9b81
 	method = merge
 	cmdver = 0.4.6
diff --git a/build-system/scripts/build b/build-system/scripts/build
@@ -134,14 +134,14 @@ if [[ -n "$COMMIT_TAG" ]]; then
   else
     COMMIT_TAG_VERSION=$COMMIT_TAG
   fi
-  
-  # We are building a tagged commit. Check it's a valid semver.
-  VERSION=$(npx semver $COMMIT_TAG_VERSION)
-  if [ -z "$VERSION" ]; then
-    COMMIT_TAG_VERSION=""
-  else
-    COMMIT_TAG_VERSION=$VERSION
-  fi
+
+  ## We are building a tagged commit. Check it's a valid semver.
+  #VERSION=$(npx semver $COMMIT_TAG_VERSION)
+  #if [ -z "$VERSION" ]; then
+  #  COMMIT_TAG_VERSION=""
+  #else
+  #  COMMIT_TAG_VERSION=$VERSION
+  #fi
 else
   COMMIT_TAG_VERSION=""
 fi

diff --git a/build-system/scripts/setup_env b/build-system/scripts/setup_env
@@ -37,7 +37,7 @@ if [ -n "${COMMIT_TAG:-}" ]; then
   echo "WITHOUT_VERSION_TAG=$WITHOUT_VERSION_TAG"
   echo "COMMIT_TAG_VERSION=$COMMIT_TAG_VERSION"
   # COMMIT_TAG_VERSION=$(echo "$COMMIT_TAG" | grep -oE "v\d+.\d+")
-  if [ "$COMMIT_TAG_VERSION" != "$VERSION" ]; then
+  if [ "$COMMIT_TAG" != "$VERSION" ]; then
     echo "Commit tag $COMMIT_TAG does not match repo version $VERSION."
     exit 1
   fi

diff --git a/circuits/cpp/barretenberg/.gitrepo b/circuits/cpp/barretenberg/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 041864425097d9a30f7069ca4f16392ef0cf7881
-	parent = 1c3946328f7b8eebae5b7264d70caf1e4788c546
+	commit = 4a9f5cc359b5416861c495a5245e089fcf17b3c4
+	parent = 4318b62128b59e867d488a35613b81e5f4e9172c
 	method = merge
 	cmdver = 0.4.6
diff --git a/circuits/cpp/barretenberg/CHANGELOG.md b/circuits/cpp/barretenberg/CHANGELOG.md
@@ -1,5 +1,40 @@
 # Changelog
 
+## [0.6.6](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.5...barretenberg-v0.6.6) (2023-09-11)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
+## [0.6.5](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.4...barretenberg-v0.6.5) (2023-09-08)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
+## [0.6.4](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.3...barretenberg-v0.6.4) (2023-09-08)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
+## [0.6.3](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.2...barretenberg-v0.6.3) (2023-09-08)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
+## [0.6.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.6.1...barretenberg-v0.6.2) (2023-09-08)
+
+
+### Miscellaneous
+
+* **barretenberg:** Synchronize aztec-packages versions
+
 ## [0.6.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.5.2...barretenberg-v0.6.1) (2023-09-08)
 
 

diff --git a/circuits/cpp/barretenberg/VERSION b/circuits/cpp/barretenberg/VERSION
@@ -1 +1 @@
-v0.6.1 x-release-please-version
+v0.6.6 x-release-please-version
diff --git a/circuits/cpp/barretenberg/barretenberg-wasm.nix b/circuits/cpp/barretenberg/barretenberg-wasm.nix
@@ -6,7 +6,7 @@ in
 stdenv.mkDerivation
 {
   pname = "barretenberg.wasm";
-  version = "0.6.1"; # x-release-please-version
+  version = "0.6.6"; # x-release-please-version
 
   src = ./cpp;
 

diff --git a/circuits/cpp/barretenberg/barretenberg.nix b/circuits/cpp/barretenberg/barretenberg.nix
@@ -14,7 +14,7 @@ in
 buildEnv.mkDerivation
 {
   pname = "libbarretenberg";
-  version = "0.6.1"; # x-release-please-version
+  version = "0.6.6"; # x-release-please-version
 
   src = ./cpp;
 

diff --git a/circuits/cpp/barretenberg/cpp/CMakeLists.txt b/circuits/cpp/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.6.1 # x-release-please-version
+    VERSION 0.6.6 # x-release-please-version
     LANGUAGES CXX C
 )
 

diff --git a/circuits/cpp/barretenberg/ts/CHANGELOG.md b/circuits/cpp/barretenberg/ts/CHANGELOG.md
@@ -1,5 +1,40 @@
 # Changelog
 
+## [0.6.6](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.5...barretenberg.js-v0.6.6) (2023-09-11)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.6.5](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.4...barretenberg.js-v0.6.5) (2023-09-08)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.6.4](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.3...barretenberg.js-v0.6.4) (2023-09-08)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.6.3](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.2...barretenberg.js-v0.6.3) (2023-09-08)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
+## [0.6.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.6.1...barretenberg.js-v0.6.2) (2023-09-08)
+
+
+### Miscellaneous
+
+* **barretenberg.js:** Synchronize aztec-packages versions
+
 ## [0.6.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.5.2...barretenberg.js-v0.6.1) (2023-09-08)
 
 

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

diff --git a/yarn-project/aztec.js/src/abis/ecdsa_account_contract.json b/yarn-project/aztec.js/src/abis/ecdsa_account_contract.json
diff --git a/yarn-project/aztec.js/src/abis/schnorr_account_contract.json b/yarn-project/aztec.js/src/abis/schnorr_account_contract.json
diff --git a/yarn-project/canary/src/cli.test.ts b/yarn-project/canary/src/cli.test.ts
@@ -115,7 +115,7 @@ describe('CLI canary', () => {
     // generate a private key
     debug('Create an account using a private key');
     await run('generate-private-key', false);
-    const privKey = findInLogs(/Private\sKey:\s+(?<privKey>[a-fA-F0-9]+)/)?.groups?.privKey;
+    const privKey = findInLogs(/Private\sKey:\s+0x(?<privKey>[a-fA-F0-9]+)/)?.groups?.privKey;
     expect(privKey).toHaveLength(64);
     await run(`create-account --private-key ${privKey}`);
     const foundAddress = findInLogs(/Address:\s+(?<address>0x[a-fA-F0-9]+)/)?.groups?.address;

diff --git a/yarn-project/noir-contracts/src/contracts/card_game_contract/src/cards.nr b/yarn-project/noir-contracts/src/contracts/card_game_contract/src/cards.nr
@@ -1,5 +1,5 @@
 use dep::aztec::{
-    context::{PrivateContext, PublicContext},
+    context::{PrivateContext, PublicContext, Context},
     constants_gen::{MAX_NOTES_PER_PAGE, MAX_READ_REQUESTS_PER_CALL},
     log::emit_encrypted_log,
     note::{
@@ -119,13 +119,11 @@ fn filter_cards<N>(notes: [Option<ValueNote>; MAX_READ_REQUESTS_PER_CALL], desir
 
 impl Deck {
     fn new(
-        private_context: Option<&mut PrivateContext>,
-        public_context: Option<&mut PublicContext>,
+        context: Context,
         storage_slot: Field,
     ) -> Self {
         let set = Set {
-            private_context,
-            public_context,
+            context,
             storage_slot,
             note_interface: ValueNoteMethods,
         };
@@ -136,7 +134,7 @@ impl Deck {
 
     fn add_cards<N>(&mut self, cards: [Card; N], owner: Field) -> [CardNote]{
         let owner_key = get_public_key(owner);
-        let context = self.set.private_context.unwrap();
+        let context = self.set.context.private.unwrap();
 
         let mut inserted_cards = [];
         for card in cards {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		v0.6.1 x-release-please-version
		v0.6.6 x-release-please-version