Merge branch 'master' into nv/aztecnr-get_note

AztecProtocol · Mar 5, 2024 · 77b0146 · 77b0146
2 parents 0e3ac74 + 31d470b
commit 77b0146
Show file tree

Hide file tree

Showing 196 changed files with 4,171 additions and 2,468 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -75,7 +75,7 @@ jobs:
   generate-config:
     docker:
       - image: aztecprotocol/alpine-build-image
-    resource_class: xlarge
+    resource_class: large
     steps:
       - *checkout
       - *setup_env
@@ -435,77 +435,62 @@ jobs:
           command: build noir-projects
           aztec_manifest_key: noir-projects
 
-  boxes-files:
-    machine:
-      image: default
-    resource_class: medium
+  yarn-project-pre-join:
+    docker:
+      - image: cimg/base:2023.09
+    resource_class: small
     steps:
-      - *checkout
-      - *setup_env
       - run:
-          name: "Build"
-          command: build boxes-files
-          aztec_manifest_key: boxes-files
+          name: "Noop"
+          command: echo Noop
 
-  yarn-project-base:
-    machine:
-      image: default
-    resource_class: large
+  yarn-project-x86_64:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
     steps:
       - *checkout
       - *setup_env
       - run:
           name: "Build"
-          command: build yarn-project-base | add_timestamps
-          aztec_manifest_key: yarn-project-base
+          command: cond_spot_run_build yarn-project 64
+          aztec_manifest_key: yarn-project
 
-  yarn-project:
-    machine:
-      image: default
-    resource_class: large
+  yarn-project-arm64:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
     steps:
       - *checkout
       - *setup_env
       - run:
-          name: Build
-          command: build yarn-project | add_timestamps
+          name: "Build"
+          command: cond_spot_run_build yarn-project 64 arm64
           aztec_manifest_key: yarn-project
 
-  yarn-project-prod:
+  yarn-project-ecr-manifest:
     machine:
       image: default
-    resource_class: large
-    steps:
-      - *checkout
-      - *setup_env
-      - run:
-          name: Build
-          command: build yarn-project-prod | add_timestamps
-          aztec_manifest_key: yarn-project-prod
-
-  yarn-project-formatting:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+    resource_class: medium
     steps:
       - *checkout
       - *setup_env
       - run:
-          name: Check Formatting
-          command: cond_spot_run_container yarn-project 8 formatting | add_timestamps
+          name: "Create ECR manifest"
+          command: create_ecr_manifest yarn-project x86_64,arm64
           aztec_manifest_key: yarn-project
 
-  yarn-project-tests:
+  yarn-project-test:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
     steps:
       - *checkout
       - *setup_env
       - run:
-          name: Test
-          command: cond_spot_run_container yarn-project 64 test | add_timestamps
-          aztec_manifest_key: yarn-project
+          name: "Build and test"
+          command: cond_spot_run_build yarn-project-test 64
+          aztec_manifest_key: yarn-project-test
 
   aztec-package:
     machine:
@@ -985,7 +970,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-browser.yml TEST=e2e_aztec_js_browser.test.ts
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_aztec_js_browser.test.ts
           aztec_manifest_key: end-to-end
 
   e2e-card-game:
@@ -1151,9 +1136,6 @@ jobs:
     steps:
       - *checkout
       - *setup_env
-      - run:
-          name: "Copy docs dockerignore"
-          command: cp docs/.dockerignore .
       - run:
           name: "Build docs"
           command: |
@@ -1317,14 +1299,14 @@ defaults: &defaults
         event: fail
         branch_pattern: "master"
 
-defaults_yarn_project: &defaults_yarn_project
+defaults_yarn_project_pre_join: &defaults_yarn_project_pre_join
   requires:
-    - yarn-project
+    - yarn-project-pre-join
   <<: *defaults
 
-defaults_yarn_project_prod: &defaults_yarn_project_prod
+defaults_yarn_project: &defaults_yarn_project
   requires:
-    - yarn-project-prod
+    - yarn-project-ecr-manifest
   <<: *defaults
 
 defaults_deploy: &defaults_deploy
@@ -1418,37 +1400,35 @@ workflows:
 
       - yellow-paper: *defaults
 
-      - boxes-files: *defaults
-
       - noir-projects:
           requires:
             - avm-transpiler
             - noir-ecr-manifest
           <<: *defaults
 
       # Yarn Project
-      - yarn-project-base:
+      - yarn-project-pre-join:
           requires:
             - bb-js
             - noir-packages
-          <<: *defaults
-      - yarn-project:
-          requires:
-            - yarn-project-base
             - l1-contracts
             - noir-projects
-            - boxes-files
           <<: *defaults
-      - yarn-project-prod: *defaults_yarn_project
-      - yarn-project-formatting: *defaults_yarn_project
-      - yarn-project-tests: *defaults_yarn_project
-      - end-to-end: *defaults_yarn_project
-      - build-docs: *defaults_yarn_project
+      - end-to-end: *defaults_yarn_project_pre_join
+      - aztec-faucet: *defaults_yarn_project_pre_join
+      - build-docs: *defaults_yarn_project_pre_join
+      - yarn-project-test: *defaults_yarn_project_pre_join
+      - yarn-project-x86_64: *defaults_yarn_project_pre_join
+      - yarn-project-arm64: *defaults_yarn_project_pre_join
+      - yarn-project-ecr-manifest:
+          requires:
+            - yarn-project-x86_64
+            - yarn-project-arm64
+          <<: *defaults
 
       # Artifacts
-      - aztec-package: *defaults_yarn_project_prod
-      - cli: *defaults_yarn_project_prod
-      - aztec-faucet: *defaults_yarn_project_prod
+      - aztec-package: *defaults_yarn_project
+      - cli: *defaults_yarn_project
 
       # Boxes.
       - boxes:
@@ -1519,6 +1499,21 @@ workflows:
       # Everything that must complete before deployment.
       - end:
           requires:
+            - barretenberg-x86_64-linux-gcc
+            - barretenberg-x86_64-linux-clang
+            - barretenberg-x86_64-linux-clang-assert
+            - barretenberg-x86_64-linux-clang-fuzzing
+            - barretenberg-wasm-linux-clang
+            - barretenberg-x86_64-linux-clang-sol
+            - barretenberg-bench
+            - barretenberg-proof-system-tests
+            - barretenberg-dsl-tests
+            - barretenberg-tests
+            - barretenberg-stdlib-tests
+            - barretenberg-stdlib-recursion-ultra-tests
+            - barretenberg-join-split-tests
+            - barretenberg-acir-tests-bb
+            - barretenberg-docs
             - mainnet-fork
             - e2e-2-pxes
             - e2e-note-getter

diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,5 @@ cmake-build-debug
 
 .graphite*
 .DS_Store
+
+**/*.dockerignore
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,5 +1,7 @@
 {
-  ".": "0.24.0",
-  "barretenberg": "0.24.0",
-  "barretenberg/ts": "0.24.0"
+  ".": "0.25.0",
+  "yarn-project/cli": "0.25.0",
+  "yarn-project/aztec": "0.25.0",
+  "barretenberg": "0.25.0",
+  "barretenberg/ts": "0.25.0"
 }