Merge branch 'master' into ad/refactor/collapse-bb

AztecProtocol · Feb 1, 2024 · 26ca7e0 · 26ca7e0
2 parents b3eb642 + 1615803
commit 26ca7e0
Show file tree

Hide file tree

Showing 455 changed files with 11,625 additions and 6,617 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -125,6 +125,17 @@ jobs:
           name: "Build"
           command: cond_spot_run_build noir-compile-acir-tests 32
 
+  avm-transpiler:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build avm-transpiler 32
+
   # Barretenberg
   barretenberg-wasm-linux-clang:
     docker:
@@ -610,7 +621,7 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_sandbox_example.test.ts
 
-  e2e-singleton:
+  e2e-state-vars:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
@@ -619,7 +630,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_singleton.test.ts
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_state_vars.test.ts
 
   e2e-block-building:
     docker:
@@ -1137,6 +1148,9 @@ workflows:
             - noir-ecr-manifest
           <<: *defaults
 
+      # Transpiler
+      - avm-transpiler: *defaults
+
       # Barretenberg
       - barretenberg-x86_64-linux-gcc: *defaults
       - barretenberg-x86_64-linux-clang: *defaults
@@ -1185,6 +1199,7 @@ workflows:
       # Yarn Project
       - yarn-project-base:
           requires:
+            - avm-transpiler
             - l1-contracts
             - bb-js
             - noir-ecr-manifest
@@ -1240,7 +1255,7 @@ workflows:
       # TODO(3458): Investigate intermittent failure
       # - e2e-slow-tree: *e2e_test
       - e2e-sandbox-example: *e2e_test
-      - e2e-singleton: *e2e_test
+      - e2e-state-vars: *e2e_test
       - e2e-block-building: *e2e_test
       - e2e-nested-contract: *e2e_test
       - e2e-non-contract-account: *e2e_test
@@ -1278,7 +1293,7 @@ workflows:
             - e2e-token-contract
             - e2e-blacklist-token-contract
             - e2e-sandbox-example
-            - e2e-singleton
+            - e2e-state-vars
             - e2e-block-building
             - e2e-nested-contract
             - e2e-non-contract-account

diff --git a/.github/workflows/publish-bb.yml b/.github/workflows/publish-bb.yml
@@ -139,12 +139,9 @@ jobs:
             ./barretenberg/cpp/build-wasm/bin/barretenberg.wasm.tar.gz
             ./barretenberg/cpp/build-wasm/bin/acvm_backend.wasm.tar.gz
 
-  build-mac:
-    name: Build on Mac (${{ matrix.target }})
+  build-mac-intel:
+    name: Build on Mac x86_64-apple-darwin
     runs-on: macos-13
-    strategy:
-      matrix:
-        target: [x86_64-apple-darwin, aarch64-apple-darwin]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -154,37 +151,61 @@ jobs:
       - name: Create Mac Build Environment
         run: brew install cmake ninja
 
-      - name: Compile Barretenberg (x86_64)
-        if: matrix.target == 'x86_64-apple-darwin'
+      - name: Compile Barretenberg
         working-directory: barretenberg/cpp
         run: |
           cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert
           cmake --build --preset default --target bb
 
-      - name: Compile Barretenberg (ARM)
-        if: matrix.target == 'aarch64-apple-darwin'
+      - name: Package barretenberg artifact
+        working-directory: barretenberg/cpp/build/bin
+        run: |
+          mkdir dist
+          cp ./bb ./dist/bb
+          7z a -ttar -so -an ./dist/* | 7z a -si ./barretenberg-x86_64-apple-darwin.tar.gz
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: barretenberg-x86_64-apple-darwin
+          path: ./barretenberg/cpp/build/bin/barretenberg-x86_64-apple-darwin.tar.gz
+          retention-days: 3
+
+  build-mac-m1:
+    name: Build on Mac aarch64-apple-darwin 
+    runs-on: macos-14
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.tag || env.GITHUB_REF }}
+
+      - name: Create Mac Build Environment
+        run: brew install cmake ninja
+
+      - name: Compile Barretenberg
         working-directory: barretenberg/cpp
         run: |
-          cmake --toolchain ./cmake/toolchains/aarch64-darwin.cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert
+          cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert
           cmake --build --preset default --target bb
 
       - name: Package barretenberg artifact
         working-directory: barretenberg/cpp/build/bin
         run: |
           mkdir dist
           cp ./bb ./dist/bb
-          7z a -ttar -so -an ./dist/* | 7z a -si ./barretenberg-${{ matrix.target }}.tar.gz
+          7z a -ttar -so -an ./dist/* | 7z a -si ./barretenberg-aarch64-apple-darwin.tar.gz
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: barretenberg-${{ matrix.target }}
-          path: ./barretenberg/cpp/build/bin/barretenberg-${{ matrix.target }}.tar.gz
+          name: barretenberg-aarch64-apple-darwin
+          path: ./barretenberg/cpp/build/bin/barretenberg-aarch64-apple-darwin.tar.gz
           retention-days: 3
 
   release:
     name: Publish
-    needs: [build-x86_64-linux-gnu, build-mac, build-wasm-ts]
+    needs: [build-x86_64-linux-gnu, build-mac-intel, build-mac-m1,build-wasm-ts]
     runs-on: ubuntu-latest
     steps:
       - name: Download files from Linux Runner

diff --git a/avm-transpiler/.gitignore b/avm-transpiler/.gitignore
@@ -0,0 +1,2 @@
+/target
+.DS_Store