Merge remote-tracking branch 'origin/master' into lde/adjust_databus

AztecProtocol · Jul 14, 2024 · e1e08d8 · e1e08d8
2 parents f1cab3a + c6734f9
commit e1e08d8
Show file tree

Hide file tree

Showing 559 changed files with 12,640 additions and 5,302 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -562,6 +562,7 @@ workflows:
           requires:
             - avm-transpiler-ecr-manifest
             - noir-ecr-manifest
+            - barretenberg-x86_64-linux-clang
           <<: *defaults
 
       # Yarn Project

diff --git a/.devcontainer/sandbox_only/devcontainer.json b/.devcontainer/sandbox_only/devcontainer.json
@@ -0,0 +1,18 @@
+{
+  "name": "Sandbox Only",
+  "image": "node:lts-bookworm",
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+  },
+  "onCreateCommand": "cp -R /root/workspace /root/scripts && rm -rf /root/workspace/* && sh /root/scripts/onCreateCommand.sh sandbox_only",
+  "postAttachCommand": "sh /root/scripts/postAttachCommand.sh",
+  "customizations": {
+    "vscode": {
+      "settings": {},
+      "extensions": ["noir-lang.vscode-noir"]
+    }
+  },
+  "workspaceMount": "source=${localWorkspaceFolder}/.devcontainer/scripts,target=/root/workspace,type=bind",
+  "workspaceFolder": "/root/workspace",
+  "forwardPorts": [8080]
+}
diff --git a/.devcontainer/scripts/onCreateCommand.sh b/.devcontainer/scripts/onCreateCommand.sh
@@ -13,14 +13,17 @@ fi
 if ! grep -q "alias sandbox" ~/.bashrc; then
     echo "alias sandbox=\"npx aztec-app sandbox\"" >> ~/.bashrc
 fi
+corepack enable
 
-source ~/.bashrc
-yes | npx aztec-app -t $TYPE -n $NAME -s
-mv $NAME/* $NAME/.* .
-rm -rf $NAME
+if [ "$TYPE" != "sandbox_only" ]; then
+    source ~/.bashrc
+    yes | npx create-aztec-app -t $TYPE -n $NAME -s
+    mv $NAME/* $NAME/.* .
+    rm -rf $NAME
+
+    yarn
 
-yarn
-
-npx -y playwright install --with-deps
-yarn add @aztec/builder
-yarn prep
+    npx -y playwright install --with-deps
+    yarn add @aztec/builder
+    yarn prep
+fi
diff --git a/.devcontainer/scripts/postAttachCommand.sh b/.devcontainer/scripts/postAttachCommand.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
-TYPE=$1
-NAME=$2
 
+apt update
 apt install gh
 gh codespace ports visibility 8080:public -c $CODESPACE_NAME
 

diff --git a/.github/earthly-ci-config.yml b/.github/earthly-ci-config.yml
@@ -1,5 +1,5 @@
 global:
     cache_size_pct: 50
-    buildkit_max_parallelism: 10
+    buildkit_max_parallelism: 5
     container_frontend: docker-shell
 buildkit_additional_args: ["-e", "BUILDKIT_STEP_LOG_MAX_SIZE=-1"]
diff --git a/.github/workflows/ci-arm.yml b/.github/workflows/ci-arm.yml
@@ -36,7 +36,10 @@ jobs:
             set -eux
             git submodule update --init --recursive --recommend-shallow
             echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
-            scripts/earthly-ci ./yarn-project+export-e2e-test-images
+            scripts/earthly-ci \
+              --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \
+              --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
+              ./yarn-project+export-e2e-test-images
 
   # all the end-to-end integration tests for aztec
   e2e:
@@ -54,7 +57,10 @@ jobs:
             sudo shutdown -P 25 # hack until core part of the scripts
             set -eux
             echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u aztecprotocolci --password-stdin
-            scripts/earthly-ci -P --no-output ./yarn-project/end-to-end/+uniswap-trade-on-l1-from-l2
+            scripts/earthly-ci \
+              --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \
+              --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
+              --no-output ./yarn-project/end-to-end/+uniswap-trade-on-l1-from-l2
 
   # not notifying failures right now
   # notify:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -157,7 +157,7 @@ jobs:
       - uses: ./.github/ci-setup-action
       - name: Setup and Test
         uses: ./.github/ensure-tester-with-images
-        timeout-minutes: 40
+        timeout-minutes: 45
         with:
           runner_type: ${{ contains(matrix.test, 'prover') && '64core-tester-x86' || '16core-tester-x86' }}
           builder_type: builder-x86
@@ -166,6 +166,7 @@ jobs:
           builder_images_to_copy: aztecprotocol/aztec:${{ env.GIT_COMMIT }} aztecprotocol/end-to-end:${{ env.GIT_COMMIT }}
           # command to produce the images in case they don't exist
           builder_command: cd yarn-project/end-to-end/ && ../../scripts/earthly-ci +${{ matrix.test }}
+          tester_ttl: 40
           run: |
             set -eux
             cd ./yarn-project/end-to-end/
@@ -381,7 +382,7 @@ jobs:
       - name: "Format noir-projects"
         working-directory: ./noir-projects/
         timeout-minutes: 40
-        run: | 
+        run: |
           earthly-ci --no-output \
           --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \
           --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
@@ -465,7 +466,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ env.GIT_COMMIT }}" }
-      # Only allow one memory-hunger prover test to use this runner
       - uses: ./.github/ci-setup-action
         with:
           concurrency_key: yarn-project-formatting-x86
@@ -474,13 +474,11 @@ jobs:
         run: earthly-ci --no-output ./yarn-project/+format-check
 
   yarn-project-test:
-    # quiet machine
     needs: build
     runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ env.GIT_COMMIT }}" }
-      # Only allow one memory-hunger prover test to use this runner
       - uses: ./.github/ci-setup-action
         with:
           concurrency_key: yarn-project-test-x86
@@ -527,7 +525,7 @@ jobs:
       - name: "Docs Preview"
         if: github.event.number
         timeout-minutes: 40
-        run: | 
+        run: |
           earthly-ci --no-output \
           --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \
           --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
@@ -639,7 +637,7 @@ jobs:
           earthly-ci \
           --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \
           --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
-          --artifact +gates-report/gates_report.json 
+          --artifact +gates-report/gates_report.json
           mv gates_report.json ../protocol_circuits_report.json
 
       - name: Compare gates reports

diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
@@ -28,7 +28,13 @@ jobs:
           concurrency_key: docs-preview-${{ inputs.username || github.actor }}-x86
 
       - timeout-minutes: 25
-        run: earthly-ci --no-output ./docs/+deploy-prod --NETLIFY_AUTH_TOKEN=${{ secrets.NETLIFY_AUTH_TOKEN }} --NETLIFY_SITE_ID=${{ secrets.NETLIFY_SITE_ID }} --COMMIT_TAG=${{ inputs.tag }}
+        run: |
+          earthly-ci --no-output ./docs/+deploy-prod \
+          --NETLIFY_AUTH_TOKEN=${{ secrets.NETLIFY_AUTH_TOKEN }} \
+          --NETLIFY_SITE_ID=${{ secrets.NETLIFY_SITE_ID }} \
+          --COMMIT_TAG=${{ inputs.tag }} \
+          --secret AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \
+          --secret AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
 
   pdf:
     needs: setup

diff --git a/.github/workflows/vm_full_tests.yml b/.github/workflows/vm_full_tests.yml
@@ -55,7 +55,7 @@ jobs:
           concurrency_key: avm-full-tests-x86
       - name: "AVM Full Tests"
         working-directory: ./barretenberg/cpp/
-        timeout-minutes: 70
+        timeout-minutes: 35
         run: |
-          sudo shutdown -P 70 # hack until core part of the scripts
+          sudo shutdown -P 35 # hack until core part of the scripts
           earthly-ci --no-output +vm-full-test --hardware_concurrency=64  # limit our parallelism to half our cores
diff --git a/.noir-sync-commit b/.noir-sync-commit
@@ -1 +1 @@
-30c50f52a6d58163e39006b73f4eb5003afc239b
+90b636e71333cfe46c5e3062ded34b583fcb64d5
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,7 +1,7 @@
 {
-  ".": "0.45.1",
+  ".": "0.46.4",
   "yarn-project/cli": "0.35.1",
-  "yarn-project/aztec": "0.45.1",
-  "barretenberg": "0.45.1",
-  "barretenberg/ts": "0.45.1"
+  "yarn-project/aztec": "0.46.4",
+  "barretenberg": "0.46.4",
+  "barretenberg/ts": "0.46.4"
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -14,5 +14,11 @@
       "localRoot": "${workspaceFolder}",
       "sourceMaps": true
     },
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Attach",
+      "port": 9229
+    }
   ]
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		30c50f52a6d58163e39006b73f4eb5003afc239b
		90b636e71333cfe46c5e3062ded34b583fcb64d5