Merge remote-tracking branch 'origin/master' into ad/try-fix-acir

alias docker-compose=/mnt/user-data/adam/aztec-packages/myenv/bin/podman-compose
AztecProtocol · Mar 14, 2024 · 9421821 · 9421821
2 parents 858c27d + 8bdb921
commit 9421821
Show file tree

Hide file tree

Showing 1,056 changed files with 30,265 additions and 173,443 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -353,22 +353,22 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_recursion_tests --gtest_filter=-*turbo*
+          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_plonk_recursion_tests --gtest_filter=-*turbo*
           aztec_manifest_key: barretenberg-x86_64-linux-clang-assert
 
-  barretenberg-join-split-tests:
+  barretenberg-acir-tests-bb:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
     steps:
       - *checkout
       - *setup_env
       - run:
-          name: "Test"
-          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 join_split_example_proofs_join_split_tests --gtest_filter=-*full_proof*
-          aztec_manifest_key: barretenberg-x86_64-linux-clang-assert
+          name: "Build and test"
+          command: cond_spot_run_build barretenberg-acir-tests-bb 32
+          aztec_manifest_key: barretenberg-acir-tests-bb
 
-  barretenberg-acir-tests-bb:
+  barretenberg-acir-tests-bb-sol:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
@@ -377,8 +377,8 @@ jobs:
       - *setup_env
       - run:
           name: "Build and test"
-          command: cond_spot_run_build barretenberg-acir-tests-bb 32
-          aztec_manifest_key: barretenberg-acir-tests-bb
+          command: cond_spot_run_build barretenberg-acir-tests-bb-sol 32
+          aztec_manifest_key: barretenberg-acir-tests-bb-sol
 
   bb-js:
     machine:
@@ -868,6 +868,20 @@ jobs:
           aztec_manifest_key: end-to-end
     <<: *defaults_e2e_test
 
+
+  e2e-outbox:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_outbox.test.ts
+          aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
+
   uniswap-trade-on-l1-from-l2:
     steps:
       - *checkout
@@ -1217,6 +1231,12 @@ defaults: &defaults
     - slack/notify:
         event: fail
         branch_pattern: "master"
+
+bb_acir_tests: &bb_acir_tests
+  requires:
+    - barretenberg-x86_64-linux-clang-assert
+    - noir-compile-acir-tests
+  <<: *defaults
 
 defaults_yarn_project_pre_join: &defaults_yarn_project_pre_join
   requires:
@@ -1292,12 +1312,8 @@ workflows:
       - barretenberg-tests: *bb_test
       - barretenberg-stdlib-tests: *bb_test
       - barretenberg-stdlib-recursion-ultra-tests: *bb_test
-      - barretenberg-join-split-tests: *bb_test
-      - barretenberg-acir-tests-bb:
-          requires:
-            - barretenberg-x86_64-linux-clang-assert
-            - noir-compile-acir-tests
-          <<: *defaults
+      - barretenberg-acir-tests-bb: *bb_acir_tests
+      - barretenberg-acir-tests-bb-sol: *bb_acir_tests
       - barretenberg-docs: *defaults
       - bb-js:
           requires:
@@ -1397,6 +1413,7 @@ workflows:
       - e2e-inclusion-proofs-contract: *e2e_test
       - e2e-pending-note-hashes-contract: *e2e_test
       - e2e-ordering: *e2e_test
+      - e2e-outbox: *e2e_test
       - e2e-counter: *e2e_test
       - e2e-private-voting: *e2e_test
       - uniswap-trade-on-l1-from-l2: *e2e_test
@@ -1431,8 +1448,8 @@ workflows:
             - barretenberg-tests
             - barretenberg-stdlib-tests
             - barretenberg-stdlib-recursion-ultra-tests
-            - barretenberg-join-split-tests
             - barretenberg-acir-tests-bb
+            - barretenberg-acir-tests-bb-sol
             - barretenberg-docs
             - build-docs
             - mainnet-fork
@@ -1461,6 +1478,7 @@ workflows:
             - e2e-inclusion-proofs-contract
             - e2e-pending-note-hashes-contract
             - e2e-ordering
+            - e2e-outbox
             - e2e-counter
             - e2e-private-voting
             - uniswap-trade-on-l1-from-l2

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 ..
           }
@@ -131,8 +131,9 @@ jobs:
         run: |
           set -xue # print commands
           # Formatted for updating the PR, overrides for release-please commit message parsing
-          PR_BODY="""BEGIN_COMMIT_OVERRIDE
-          Development from [aztec-packages](https://github.com/AztecProtocol/aztec-packages)
+          PR_BODY="""
+          Automated pull of Noir development from [aztec-packages](https://github.com/AztecProtocol/aztec-packages).
+          BEGIN_COMMIT_OVERRIDE
           $(cat .PR_BODY_MESSAGE)
           END_COMMIT_OVERRIDE"""
           # for cross-opening PR in noir repo, we use aztecbot's token

diff --git a/.github/workflows/pull_noir.yml b/.github/workflows/pull_noir.yml
@@ -29,11 +29,11 @@ jobs:
           PR_URL=$(gh pr list --repo AztecProtocol/aztec-packages --head sync-noir --json url --jq ".[0].url")
           echo "PR_URL=$PR_URL" >> $GITHUB_ENV
           # What was our last merge on noir side?
-          BASE_NOIR_COMMIT=`gh pr list --repo=noir-lang/noir --state merged --head aztec-packages --json headRefOid --jq=.[0].headRefOid`
+          BASE_NOIR_COMMIT=`gh pr list --repo=noir-lang/noir --state merged --head aztec-packages --json mergeCommit --jq=.[0].mergeCommit.oid`
           echo "BASE_NOIR_COMMIT=$BASE_NOIR_COMMIT" >> $GITHUB_ENV
-          # What was our last merge on aztec side?
-          LAST_PR_MERGE=`gh pr list --repo=noir-lang/noir --state merged --head aztec-packages --json mergeCommit --jq=.[0].mergeCommit.oid`
-          echo "LAST_PR_MERGE=$LAST_PR_MERGE" >> $GITHUB_ENV
+          # What was our last sync on aztec side?
+          BASE_AZTEC_COMMIT=`curl https://raw.githubusercontent.com/noir-lang/noir/master/.aztec-sync-commit`
+          echo "BASE_AZTEC_COMMIT=$BASE_AZTEC_COMMIT" >> $GITHUB_ENV
 
       - name: Generate PR body
         run: |
@@ -45,9 +45,10 @@ jobs:
           function compute_commit_message() {
             cd noir-repo
             # Create a filtered git log for release-please changelog / metadata
-            RAW_MESSAGE=$(git log --pretty=format:"%s" $BASE_NOIR_COMMIT..HEAD -- noir/noir-repo/  ':!noir/noir-repo/.gitrepo' | grep -v 'git subrepo' || true)
+            RAW_MESSAGE=$(git log --pretty=format:"%s" $BASE_NOIR_COMMIT..HEAD || true)
             # Fix Noir PR links and output message
             echo "$RAW_MESSAGE" | sed -E 's/\(#([0-9]+)\)/(https:\/\/github.com\/noir-lang\/noir\/pull\/\1)/g'
+            cd ..
           }
           echo "$(compute_commit_message)" >> .PR_BODY_MESSAGE
 
@@ -74,21 +75,23 @@ jobs:
 
           # Get the last sync PR's last commit state
           COMMIT_MESSAGE=$(cat .PR_BODY_MESSAGE)
-
-          # clone noir repo for manipulations, we use aztec bot token for writeability
-          git clone https://x-access-token:${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}@github.com/noir-lang/noir.git noir-repo
+          LINES=$(echo $COMMIT_MESSAGE | wc -l)
 
           function force_sync_staging() {
             # reset to last noir merge
             git checkout $STAGING_BRANCH || git checkout -b $STAGING_BRANCH
-            git reset --hard "$LAST_PR_MERGE"
+            git reset --hard "$BASE_AZTEC_COMMIT"
             # Reset our branch to our expected target
             git push origin $STAGING_BRANCH --force
             # force gitrepo to point to the right HEAD (we ignore .gitrepo contents otherwise)
             git config --file="$SUBREPO_PATH/.gitrepo" subrepo.commit "$BASE_NOIR_COMMIT"
-            # make a new commit with our previous message
-            git commit -am "$COMMIT_MESSAGE"
+            # we need to commit for git-subrepo
+            git commit -am "[$LINES changes] $COMMIT_MESSAGE"
             if ./scripts/git-subrepo/lib/git-subrepo pull --force $SUBREPO_PATH --branch=master; then
+              git reset --soft "$BASE_AZTEC_COMMIT"
+              # We don't really need the sync commit on our side, and don't need .gitrepo at all except just in time for the command.
+              git checkout origin/master -- noir/noir-repo/.aztec-sync-commit noir/noir-repo/.gitrepo
+              git commit -am "[$LINES changes] $COMMIT_MESSAGE"
               git push origin $STAGING_BRANCH --force
             else
               echo "Problems syncing noir. Needs manual attention, might be a merge conflict."
@@ -100,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
@@ -112,8 +115,9 @@ jobs:
         run: |
           set -xue # print commands
           # Formatted for updating the PR, overrides for release-please commit message parsing 
-          PR_BODY="""BEGIN_COMMIT_OVERRIDE
-          Development from [noir](https://github.com/noir-lang/noir)
+          PR_BODY="""
+          Automated pull of development from the [noir](https://github.com/noir-lang/noir) programming language, a dependency of Aztec.
+          BEGIN_COMMIT_OVERRIDE
           $(cat .PR_BODY_MESSAGE)
           END_COMMIT_OVERRIDE"""
           # for cross-opening PR in noir repo, we use aztecbot's token

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,7 +1,7 @@
 {
-  ".": "0.26.5",
-  "yarn-project/cli": "0.26.5",
-  "yarn-project/aztec": "0.26.5",
-  "barretenberg": "0.26.5",
-  "barretenberg/ts": "0.26.5"
+  ".": "0.27.2",
+  "yarn-project/cli": "0.27.2",
+  "yarn-project/aztec": "0.27.2",
+  "barretenberg": "0.27.2",
+  "barretenberg/ts": "0.27.2"
 }