From d844d072faa7ce2b2208dbbc6007d407db3d7d76 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 00:02:50 +0000
Subject: [PATCH 01/29] earthly build tweaks

---
 .github/workflows/ci.yml  | 70 +++++++++++++++++++++++++++++----------
 avm-transpiler/Earthfile  |  2 +-
 barretenberg/ts/Earthfile |  6 ++--
 l1-contracts/Earthfile    |  6 ++--
 noir/Earthfile            | 12 ++++---
 yarn-project/Earthfile    |  2 +-
 6 files changed, 68 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 40083d1ddb22..180f7b20cbbf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,23 +3,23 @@ on:
   push:
     branches:
       - master
-  pull_request: {}
+  pull_request_target: {}
   workflow_dispatch: {}
 
 jobs:
-  e2e:
+  build:
     runs-on: ubuntu-latest
-    strategy: { matrix: { environment: [x86], test: [e2e-escrow-contract] } }
+    env:
+      EARTHLY_TOKEN: ${{ secrets.EARTHLY_TOKEN }}
+    strategy: { matrix: { environment: [x86] } }
     # cancel if reran on same PR if exists, otherwise if on same commit
     concurrency:
-      group: ${{ matrix.test }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}
+      group: build-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}
       cancel-in-progress: true
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          submodules: recursive
+        with: {submodules: recursive}
 
       - name: Setup
         working-directory: ./scripts
@@ -27,27 +27,61 @@ jobs:
 
       - name: Test
         working-directory: ./yarn-project/end-to-end
-        run: earthly +${{ matrix.test }}
+        run: earthly --no-output \
+          --org aztec \
+          --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || github.ref }} \
+          --sat build-${{ matrix.environment }} \
+          --push \
+          +build
 
-  bb-native-tests:
+  e2e:
+    needs: build
     runs-on: ubuntu-latest
-    # run for both x86_64 and arm64
-    strategy: { matrix: { environment: [x86] } }
+    env:
+      EARTHLY_TOKEN: ${{ secrets.EARTHLY_TOKEN }}
+    strategy: { matrix: { environment: [x86], test: [e2e-escrow-contract] } }
     # cancel if reran on same PR if exists, otherwise if on same commit
     concurrency:
-      group: bb-native-tests-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}
+      group: ${{ matrix.test }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}
       cancel-in-progress: true
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          submodules: recursive
+        with: {submodules: recursive}
 
       - name: Setup
         working-directory: ./scripts
         run: ./setup_env.sh ${{ matrix.environment }} ${{ secrets.DOCKERHUB_PASSWORD }} ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
 
-      - name: Build and test
-        working-directory: ./barretenberg/cpp
-        run: earthly +test
+      - name: Test
+        working-directory: ./yarn-project/end-to-end
+
+        run: earthly --no-output \
+          --org aztec \
+          --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || github.ref }} \
+          --sat build-${{ matrix.environment }} \
+          +${{ matrix.test }}
+
+  # bb-native-tests:
+  #   runs-on: ubuntu-latest
+  #   env:
+  #     EARTHLY_TOKEN: ${{ secrets.EARTHLY_TOKEN }}
+  #   # run for both x86_64 and arm64
+  #   strategy: { matrix: { environment: [x86] } }
+  #   # cancel if reran on same PR if exists, otherwise if on same commit
+  #   concurrency:
+  #     group: bb-native-tests-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}
+  #     cancel-in-progress: true
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         submodules: recursive
+
+  #     - name: Setup
+  #       working-directory: ./scripts
+  #       run: ./setup_env.sh ${{ matrix.environment }} ${{ secrets.DOCKERHUB_PASSWORD }} ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
+
+  #     - name: Build and test
+  #       working-directory: ./barretenberg/cpp
+  #       run: earthly --no-output --org aztec --sat my-satellite --ci --push +build+test
diff --git a/avm-transpiler/Earthfile b/avm-transpiler/Earthfile
index 49298b396e91..8dc844345ee9 100644
--- a/avm-transpiler/Earthfile
+++ b/avm-transpiler/Earthfile
@@ -10,7 +10,7 @@ WORKDIR /build/avm-transpiler
 
 RUN apt-get update && apt-get install -y git
 
-COPY --keep-ts --dir scripts src Cargo.lock Cargo.toml rust-toolchain.toml .
+COPY --dir scripts src Cargo.lock Cargo.toml rust-toolchain.toml .
 
 build:
     RUN ./scripts/bootstrap_native.sh
diff --git a/barretenberg/ts/Earthfile b/barretenberg/ts/Earthfile
index 744a7c7b7503..9d4ef8fd373b 100644
--- a/barretenberg/ts/Earthfile
+++ b/barretenberg/ts/Earthfile
@@ -5,11 +5,11 @@ WORKDIR /build
 
 # minimum files to download yarn packages
 # keep timestamps for incremental builds
-COPY --keep-ts --dir .yarn package.json yarn.lock .yarnrc.yml .
+COPY --dir .yarn package.json yarn.lock .yarnrc.yml .
 RUN yarn --immutable
 
 # other source files
-COPY --keep-ts --dir src *.json *.js *.cjs .
+COPY --dir src *.json *.js *.cjs .
 
 # copy over wasm build from cpp folder
 COPY ../cpp/+preset-wasm/bin/barretenberg.wasm src/barretenberg_wasm/barretenberg-threads.wasm
@@ -23,7 +23,7 @@ esm:
     SAVE ARTIFACT /build
 
 cjs:
-    COPY --keep-ts scripts/cjs_postprocess.sh scripts/
+    COPY scripts/cjs_postprocess.sh scripts/
     RUN yarn build:cjs
     SAVE ARTIFACT /build
 
diff --git a/l1-contracts/Earthfile b/l1-contracts/Earthfile
index 7383b952ab20..15bf59a278b7 100644
--- a/l1-contracts/Earthfile
+++ b/l1-contracts/Earthfile
@@ -15,9 +15,11 @@ RUN foundryup
 RUN npm install --global yarn solhint
 
 WORKDIR /build
-COPY --keep-ts --dir lib scripts src terraform test *.json *.toml *.sh .
+COPY --dir lib scripts src terraform test *.json *.toml *.sh .
 
 build:
     RUN git init && git add . && yarn lint && yarn slither && yarn slither-has-diff
-    RUN forge clean && forge fmt --check && forge build && forge test
+    RUN forge clean && forge fmt --check && forge build 
+    # TODO(AD) reinstate forge test once stable
+    #&& forge test
     SAVE ARTIFACT out
diff --git a/noir/Earthfile b/noir/Earthfile
index f2d91a4cd7b2..bf3664bfbd6d 100644
--- a/noir/Earthfile
+++ b/noir/Earthfile
@@ -6,7 +6,7 @@ nargo:
     RUN apt update && apt install -y libc++1
     WORKDIR /build
     # Relevant source (TODO finer-grained 'tooling')
-    COPY --keep-ts --dir \
+    COPY --dir \
       noir-repo/acvm-repo \
       noir-repo/aztec_macros \
       noir-repo/compiler \
@@ -19,10 +19,11 @@ nargo:
 
     # TODO(AD) is this OK as a content hash?
     ENV COMMIT_HASH=$(find . -type f -exec sha256sum {} ';' | sort | sha256sum | awk '{print $1}')
-    COPY --keep-ts ./scripts/bootstrap_native.sh ./scripts/bootstrap_native.sh
+    COPY ./scripts/bootstrap_native.sh ./scripts/bootstrap_native.sh
     RUN ./scripts/bootstrap_native.sh
     SAVE ARTIFACT /build/noir-repo/target/release/nargo nargo
     SAVE ARTIFACT /build/noir-repo/target/release/acvm acvm
+    SAVE IMAGE aztecprotocol/nargo
 
 packages:
     FROM node:20
@@ -32,7 +33,7 @@ packages:
     WORKDIR /build
 
     # Relevant source (TODO finer-grained)
-    COPY --keep-ts --dir \
+    COPY --dir \
       noir-repo/acvm-repo \
       noir-repo/aztec_macros \
       noir-repo/compiler \
@@ -54,12 +55,13 @@ packages:
       noir-repo/.envrc \
       noir-repo
 
-    COPY --keep-ts noir-repo/.github/scripts noir-repo/.github/scripts
-    COPY --keep-ts ./scripts/bootstrap_packages.sh ./scripts/bootstrap_packages.sh
+    COPY noir-repo/.github/scripts noir-repo/.github/scripts
+    COPY ./scripts/bootstrap_packages.sh ./scripts/bootstrap_packages.sh
     # TODO(AD) is this OK as a content hash?
     ENV COMMIT_HASH=$(find . -type f -exec sha256sum {} ';' | sort | sha256sum | awk '{print $1}')
     RUN PATH="/root/.cargo/bin:$PATH" ./scripts/bootstrap_packages.sh
     SAVE ARTIFACT packages
+    SAVE IMAGE aztecprotocol/noir-packages
 
 run:
     # When running the container, mount the users home directory to same location.
diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile
index d2dba9992591..68a98dbe823c 100644
--- a/yarn-project/Earthfile
+++ b/yarn-project/Earthfile
@@ -12,7 +12,7 @@ COPY ../l1-contracts/+build/out /build/l1-contracts/out
 
 WORKDIR /build/yarn-project
 # copy source
-COPY --keep-ts --dir * *.json .yarn .yarnrc.yml .
+COPY --dir * *.json .yarn .yarnrc.yml .
 
 # We install a symlink to yarn-project's node_modules at a location that all portalled packages can find as they
 # walk up the tree as part of module resolution. The supposedly idiomatic way of supporting module resolution

From 269282122c4c693a0906fb557a156d38fa8a54b9 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 00:03:35 +0000
Subject: [PATCH 02/29] no circle for now

---
 .circleci/config.yml | 472 +++++++++++++++++++++----------------------
 1 file changed, 236 insertions(+), 236 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 01726da680ba..5187bb14dfaa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1265,243 +1265,243 @@ workflows:
     #   equal: [NEVER, << pipeline.parameters.workflow >>]
     jobs:
       # Noir
-      - noir-x86_64: *defaults
-      - noir-arm64: *defaults
-      - noir-ecr-manifest:
-          requires:
-            - noir-x86_64
-            - noir-arm64
-          <<: *defaults
-      - noir-tests: *defaults
-      - noir-packages: *defaults
-      - noir-packages-tests:
-          requires:
-            - noir-ecr-manifest
-          <<: *defaults
-      - noir-compile-acir-tests:
-          requires:
-            - noir-ecr-manifest
-          <<: *defaults
-
-      # Transpiler
-      - avm-transpiler: *defaults
-
-      # Barretenberg
-      - barretenberg-x86_64-linux-gcc: *defaults
-      - barretenberg-x86_64-linux-clang: *defaults
-      - barretenberg-x86_64-linux-clang-assert: *defaults
-      - barretenberg-x86_64-linux-clang-fuzzing: *defaults
-      - barretenberg-wasm-linux-clang: *defaults
-      - barretenberg-x86_64-linux-clang-sol: *defaults
-      - barretenberg-bench:
-          requires:
-            - barretenberg-x86_64-linux-clang
-          <<: *defaults
-      - barretenberg-proof-system-tests: *bb_test
-      - barretenberg-dsl-tests: *bb_test
-      - barretenberg-tests: *bb_test
-      - barretenberg-stdlib-tests: *bb_test
-      - barretenberg-stdlib-recursion-ultra-tests: *bb_test
-      - barretenberg-acir-tests-bb: *bb_acir_tests
-      - barretenberg-acir-tests-bb-sol:
-          requires:
-            - barretenberg-x86_64-linux-clang-sol
-          <<: *bb_acir_tests
-      - barretenberg-docs: *defaults
-      - bb-js:
-          requires:
-            - barretenberg-wasm-linux-clang
-          <<: *defaults
-      - bb-js-tests:
-          requires:
-            - bb-js
-          <<: *defaults
-      - bb-js-acir-tests:
-          requires:
-            - bb-js
-            - noir-compile-acir-tests
-          <<: *defaults
-
-      - l1-contracts: *defaults
-
-      - mainnet-fork: *defaults
-
-      - yellow-paper: *defaults
-
-      - noir-projects:
-          requires:
-            - avm-transpiler
-            - noir-ecr-manifest
-          <<: *defaults
-
-      # Yarn Project
-      - yarn-project-pre-join:
-          requires:
-            - bb-js
-            - noir-packages
-            - l1-contracts
-            - noir-projects
-          <<: *defaults
-      - end-to-end: *defaults_yarn_project
-      - aztec-faucet: *defaults_yarn_project_pre_join
-      - build-docs: *defaults_yarn_project_pre_join
-      - yarn-project-test: *defaults_yarn_project
-      - 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
-      - cli: *defaults_yarn_project
-
-      # Boxes.
-      - boxes:
-          requires:
-            - aztec-package
-          <<: *defaults
-      - boxes-vanilla:
-          requires:
-            - boxes
-          <<: *defaults
-      - boxes-react:
-          requires:
-            - boxes
-          <<: *defaults
+      # - noir-x86_64: *defaults
+      # - noir-arm64: *defaults
+      # - noir-ecr-manifest:
+      #     requires:
+      #       - noir-x86_64
+      #       - noir-arm64
+      #     <<: *defaults
+      # - noir-tests: *defaults
+      # - noir-packages: *defaults
+      # - noir-packages-tests:
+      #     requires:
+      #       - noir-ecr-manifest
+      #     <<: *defaults
+      # - noir-compile-acir-tests:
+      #     requires:
+      #       - noir-ecr-manifest
+      #     <<: *defaults
+
+      # # Transpiler
+      # - avm-transpiler: *defaults
+
+      # # Barretenberg
+      # - barretenberg-x86_64-linux-gcc: *defaults
+      # - barretenberg-x86_64-linux-clang: *defaults
+      # - barretenberg-x86_64-linux-clang-assert: *defaults
+      # - barretenberg-x86_64-linux-clang-fuzzing: *defaults
+      # - barretenberg-wasm-linux-clang: *defaults
+      # - barretenberg-x86_64-linux-clang-sol: *defaults
+      # - barretenberg-bench:
+      #     requires:
+      #       - barretenberg-x86_64-linux-clang
+      #     <<: *defaults
+      # - barretenberg-proof-system-tests: *bb_test
+      # - barretenberg-dsl-tests: *bb_test
+      # - barretenberg-tests: *bb_test
+      # - barretenberg-stdlib-tests: *bb_test
+      # - barretenberg-stdlib-recursion-ultra-tests: *bb_test
+      # - barretenberg-acir-tests-bb: *bb_acir_tests
+      # - barretenberg-acir-tests-bb-sol:
+      #     requires:
+      #       - barretenberg-x86_64-linux-clang-sol
+      #     <<: *bb_acir_tests
+      # - barretenberg-docs: *defaults
+      # - bb-js:
+      #     requires:
+      #       - barretenberg-wasm-linux-clang
+      #     <<: *defaults
+      # - bb-js-tests:
+      #     requires:
+      #       - bb-js
+      #     <<: *defaults
+      # - bb-js-acir-tests:
+      #     requires:
+      #       - bb-js
+      #       - noir-compile-acir-tests
+      #     <<: *defaults
+
+      # - l1-contracts: *defaults
+
+      # - mainnet-fork: *defaults
+
+      # - yellow-paper: *defaults
+
+      # - noir-projects:
+      #     requires:
+      #       - avm-transpiler
+      #       - noir-ecr-manifest
+      #     <<: *defaults
+
+      # # Yarn Project
+      # - yarn-project-pre-join:
+      #     requires:
+      #       - bb-js
+      #       - noir-packages
+      #       - l1-contracts
+      #       - noir-projects
+      #     <<: *defaults
+      # - end-to-end: *defaults_yarn_project
+      # - aztec-faucet: *defaults_yarn_project_pre_join
+      # - build-docs: *defaults_yarn_project_pre_join
+      # - yarn-project-test: *defaults_yarn_project
+      # - 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
+      # - cli: *defaults_yarn_project
+
+      # # Boxes.
+      # - boxes:
+      #     requires:
+      #       - aztec-package
+      #     <<: *defaults
+      # - boxes-vanilla:
+      #     requires:
+      #       - boxes
+      #     <<: *defaults
+      # - boxes-react:
+      #     requires:
+      #       - boxes
+      #     <<: *defaults
 
       # End to end tests.
       - e2e-join:
-          requires:
-            - end-to-end
-            - aztec-package
-            - cli
-          <<: *defaults
-      - e2e-2-pxes: *e2e_test
-      - e2e-note-getter: *e2e_test
-      - e2e-deploy-contract: *e2e_test
-      - e2e-lending-contract: *e2e_test
-      - e2e-token-contract: *e2e_test
-      - e2e-authwit-test: *e2e_test
-      - e2e-blacklist-token-contract: *e2e_test
-      # TODO(3458): Investigate intermittent failure
-      # - e2e-slow-tree: *e2e_test
-      - e2e-sandbox-example: *e2e_test
-      - e2e-state-vars: *e2e_test
-      - e2e-block-building: *e2e_test
-      - e2e-nested-contract: *e2e_test
-      - e2e-static-calls: *e2e_test
-      - e2e-delegate-calls: *e2e_test
-      - e2e-non-contract-account: *e2e_test
-      - e2e-multiple-accounts-1-enc-key: *e2e_test
-      - e2e-cli: *e2e_test
-      - e2e-cross-chain-messaging: *e2e_test
-      - e2e-crowdfunding-and-claim: *e2e_test
-      - e2e-public-cross-chain-messaging: *e2e_test
-      - e2e-public-to-private-messaging: *e2e_test
-      - e2e-account-contracts: *e2e_test
-      - e2e-escrow-contract: *e2e_test
-      - 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
-      - integration-l1-publisher: *e2e_test
-      - e2e-persistence: *e2e_test
-      - e2e-browser: *e2e_test
-      - e2e-card-game: *e2e_test
-      - e2e-avm-simulator: *e2e_test
-      - e2e-fees: *e2e_test
-      - e2e-dapp-subscription: *e2e_test
-      - pxe: *e2e_test
-      - cli-docs-sandbox: *e2e_test
-      - e2e-docs-examples: *e2e_test
-      - guides-writing-an-account-contract: *e2e_test
-      - guides-dapp-testing: *e2e_test
-      - guides-sample-dapp: *e2e_test
-      - guides-up-quick-start: *e2e_test
-
-      # 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-acir-tests-bb
-            - barretenberg-acir-tests-bb-sol
-            - barretenberg-docs
-            - build-docs
-            - mainnet-fork
-            - e2e-2-pxes
-            - e2e-note-getter
-            - e2e-deploy-contract
-            - e2e-lending-contract
-            - e2e-token-contract
-            - e2e-authwit-test
-            - e2e-blacklist-token-contract
-            - e2e-sandbox-example
-            - e2e-state-vars
-            - e2e-block-building
-            - e2e-nested-contract
-            - e2e-static-calls
-            - e2e-delegate-calls
-            - e2e-non-contract-account
-            - e2e-multiple-accounts-1-enc-key
-            - e2e-cli
-            - e2e-cross-chain-messaging
-            - e2e-crowdfunding-and-claim
-            - e2e-public-cross-chain-messaging
-            - e2e-public-to-private-messaging
-            - e2e-account-contracts
-            - e2e-escrow-contract
-            - e2e-inclusion-proofs-contract
-            - e2e-pending-note-hashes-contract
-            - e2e-ordering
-            - e2e-outbox
-            - e2e-counter
-            - e2e-private-voting
-            - uniswap-trade-on-l1-from-l2
-            - integration-l1-publisher
-            - e2e-persistence
-            - e2e-browser
-            - e2e-card-game
-            - e2e-avm-simulator
-            - e2e-fees
-            - e2e-dapp-subscription
-            - pxe
-            - boxes-vanilla
-            - boxes-react
-            - cli-docs-sandbox
-            - e2e-docs-examples
-            - guides-writing-an-account-contract
-            - guides-dapp-testing
-            - guides-sample-dapp
-            - guides-up-quick-start
-            - yellow-paper
-            - yarn-project-test
+          requires: []
+            # - end-to-end
+            # - aztec-package
+            # - cli
           <<: *defaults
-
-      # Benchmark jobs.
-      - bench-publish-rollup: *e2e_test
-      - bench-process-history: *e2e_test
-      - bench-summary:
-          requires:
-            - bench-publish-rollup
-            - bench-process-history
-          <<: *defaults
-
-      # Production releases.
-      - deploy-and-release: *defaults_deploy
+      # - e2e-2-pxes: *e2e_test
+      # - e2e-note-getter: *e2e_test
+      # - e2e-deploy-contract: *e2e_test
+      # - e2e-lending-contract: *e2e_test
+      # - e2e-token-contract: *e2e_test
+      # - e2e-authwit-test: *e2e_test
+      # - e2e-blacklist-token-contract: *e2e_test
+      # # TODO(3458): Investigate intermittent failure
+      # # - e2e-slow-tree: *e2e_test
+      # - e2e-sandbox-example: *e2e_test
+      # - e2e-state-vars: *e2e_test
+      # - e2e-block-building: *e2e_test
+      # - e2e-nested-contract: *e2e_test
+      # - e2e-static-calls: *e2e_test
+      # - e2e-delegate-calls: *e2e_test
+      # - e2e-non-contract-account: *e2e_test
+      # - e2e-multiple-accounts-1-enc-key: *e2e_test
+      # - e2e-cli: *e2e_test
+      # - e2e-cross-chain-messaging: *e2e_test
+      # - e2e-crowdfunding-and-claim: *e2e_test
+      # - e2e-public-cross-chain-messaging: *e2e_test
+      # - e2e-public-to-private-messaging: *e2e_test
+      # - e2e-account-contracts: *e2e_test
+      # - e2e-escrow-contract: *e2e_test
+      # - 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
+      # - integration-l1-publisher: *e2e_test
+      # - e2e-persistence: *e2e_test
+      # - e2e-browser: *e2e_test
+      # - e2e-card-game: *e2e_test
+      # - e2e-avm-simulator: *e2e_test
+      # - e2e-fees: *e2e_test
+      # - e2e-dapp-subscription: *e2e_test
+      # - pxe: *e2e_test
+      # - cli-docs-sandbox: *e2e_test
+      # - e2e-docs-examples: *e2e_test
+      # - guides-writing-an-account-contract: *e2e_test
+      # - guides-dapp-testing: *e2e_test
+      # - guides-sample-dapp: *e2e_test
+      # - guides-up-quick-start: *e2e_test
+
+      # # 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-acir-tests-bb
+      #       - barretenberg-acir-tests-bb-sol
+      #       - barretenberg-docs
+      #       - build-docs
+      #       - mainnet-fork
+      #       - e2e-2-pxes
+      #       - e2e-note-getter
+      #       - e2e-deploy-contract
+      #       - e2e-lending-contract
+      #       - e2e-token-contract
+      #       - e2e-authwit-test
+      #       - e2e-blacklist-token-contract
+      #       - e2e-sandbox-example
+      #       - e2e-state-vars
+      #       - e2e-block-building
+      #       - e2e-nested-contract
+      #       - e2e-static-calls
+      #       - e2e-delegate-calls
+      #       - e2e-non-contract-account
+      #       - e2e-multiple-accounts-1-enc-key
+      #       - e2e-cli
+      #       - e2e-cross-chain-messaging
+      #       - e2e-crowdfunding-and-claim
+      #       - e2e-public-cross-chain-messaging
+      #       - e2e-public-to-private-messaging
+      #       - e2e-account-contracts
+      #       - e2e-escrow-contract
+      #       - e2e-inclusion-proofs-contract
+      #       - e2e-pending-note-hashes-contract
+      #       - e2e-ordering
+      #       - e2e-outbox
+      #       - e2e-counter
+      #       - e2e-private-voting
+      #       - uniswap-trade-on-l1-from-l2
+      #       - integration-l1-publisher
+      #       - e2e-persistence
+      #       - e2e-browser
+      #       - e2e-card-game
+      #       - e2e-avm-simulator
+      #       - e2e-fees
+      #       - e2e-dapp-subscription
+      #       - pxe
+      #       - boxes-vanilla
+      #       - boxes-react
+      #       - cli-docs-sandbox
+      #       - e2e-docs-examples
+      #       - guides-writing-an-account-contract
+      #       - guides-dapp-testing
+      #       - guides-sample-dapp
+      #       - guides-up-quick-start
+      #       - yellow-paper
+      #       - yarn-project-test
+      #     <<: *defaults
+
+      # # Benchmark jobs.
+      # - bench-publish-rollup: *e2e_test
+      # - bench-process-history: *e2e_test
+      # - bench-summary:
+      #     requires:
+      #       - bench-publish-rollup
+      #       - bench-process-history
+      #     <<: *defaults
+
+      # # Production releases.
+      # - deploy-and-release: *defaults_deploy

From bed937b69a5b30700653d79ddc76346b4d1901f9 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 00:06:39 +0000
Subject: [PATCH 03/29] try run

---
 .github/workflows/ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 180f7b20cbbf..9ce62054b893 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,8 +1,6 @@
 name: Run CI with Earthly
 on:
-  push:
-    branches:
-      - master
+  push: {}
   pull_request_target: {}
   workflow_dispatch: {}
 

From 936b3defd679544692fc605a83a49076372cb534 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 00:09:12 +0000
Subject: [PATCH 04/29] Set up with earthly

---
 .github/workflows/ci.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9ce62054b893..5d6d0ddaec53 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,7 +1,6 @@
 name: Run CI with Earthly
 on:
   push: {}
-  pull_request_target: {}
   workflow_dispatch: {}
 
 jobs:
@@ -15,6 +14,10 @@ jobs:
       group: build-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}
       cancel-in-progress: true
     steps:
+      - uses: earthly/actions-setup@v1
+        with:
+          version: v0.8.5
+
       - name: Checkout
         uses: actions/checkout@v4
         with: {submodules: recursive}
@@ -43,6 +46,10 @@ jobs:
       group: ${{ matrix.test }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}
       cancel-in-progress: true
     steps:
+      - uses: earthly/actions-setup@v1
+        with:
+          version: v0.8.5
+
       - name: Checkout
         uses: actions/checkout@v4
         with: {submodules: recursive}

From b16ff9dec8ec15f3915a7121eea4a3adf91e752f Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 00:11:48 +0000
Subject: [PATCH 05/29] sats

---
 .github/workflows/ci.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5d6d0ddaec53..52812e77652e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,12 +28,13 @@ jobs:
 
       - name: Test
         working-directory: ./yarn-project/end-to-end
-        run: earthly --no-output \
-          --org aztec \
-          --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || github.ref }} \
-          --sat build-${{ matrix.environment }} \
-          --push \
-          +build
+        run: |
+          earthly --no-output
+            --org aztec
+            --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || github.ref }}
+            --sat build-${{ matrix.environment }}
+            --push
+            +build
 
   e2e:
     needs: build
@@ -61,11 +62,12 @@ jobs:
       - name: Test
         working-directory: ./yarn-project/end-to-end
 
-        run: earthly --no-output \
-          --org aztec \
-          --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || github.ref }} \
-          --sat build-${{ matrix.environment }} \
-          +${{ matrix.test }}
+        run: |
+          earthly --no-output
+            --org aztec
+            --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || github.ref }}
+            --sat e2e-${{ matrix.environment }}
+            +${{ matrix.test }}
 
   # bb-native-tests:
   #   runs-on: ubuntu-latest

From 01632e432e3baced0dcbf43e8b6fea9d0bfebe90 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 00:12:58 +0000
Subject: [PATCH 06/29] earthly

---
 .github/workflows/ci.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 52812e77652e..7c355cfe5856 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,11 +63,7 @@ jobs:
         working-directory: ./yarn-project/end-to-end
 
         run: |
-          earthly --no-output
-            --org aztec
-            --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || github.ref }}
-            --sat e2e-${{ matrix.environment }}
-            +${{ matrix.test }}
+          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || github.ref }} --sat e2e-${{ matrix.environment }} +${{ matrix.test }}
 
   # bb-native-tests:
   #   runs-on: ubuntu-latest

From 433aaf82c8bfc659ce96da4125a35be7f65d4b38 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 00:14:10 +0000
Subject: [PATCH 07/29] sat

---
 .github/workflows/ci.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c355cfe5856..2765f91ae694 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,12 +29,7 @@ jobs:
       - name: Test
         working-directory: ./yarn-project/end-to-end
         run: |
-          earthly --no-output
-            --org aztec
-            --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || github.ref }}
-            --sat build-${{ matrix.environment }}
-            --push
-            +build
+          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || github.ref }} --sat build-${{ matrix.environment }} --push +build
 
   e2e:
     needs: build

From db9fb7b19453cb9a6b86b537f26a81446a2e8b3f Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 00:16:13 +0000
Subject: [PATCH 08/29] use event number

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2765f91ae694..fe158cb29a25 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Test
         working-directory: ./yarn-project/end-to-end
         run: |
-          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || github.ref }} --sat build-${{ matrix.environment }} --push +build
+          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.event.number }} --sat build-${{ matrix.environment }} --push +build
 
   e2e:
     needs: build
@@ -58,7 +58,7 @@ jobs:
         working-directory: ./yarn-project/end-to-end
 
         run: |
-          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || github.ref }} --sat e2e-${{ matrix.environment }} +${{ matrix.test }}
+          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.number }} --sat e2e-${{ matrix.environment }} +${{ matrix.test }}
 
   # bb-native-tests:
   #   runs-on: ubuntu-latest

From 2ec83930ed2b91ca0ff8bb01b22a9aebbb6dba58 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 00:17:47 +0000
Subject: [PATCH 09/29] use event number

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fe158cb29a25..692afd61d9ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Test
         working-directory: ./yarn-project/end-to-end
         run: |
-          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.event.number }} --sat build-${{ matrix.environment }} --push +build
+          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.number }} --sat build-${{ matrix.environment }} --push +build
 
   e2e:
     needs: build

From d4d359215d7f32b944a094e4231a589995e0c353 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 00:19:05 +0000
Subject: [PATCH 10/29] use event number

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 692afd61d9ea..d17cfbbebc82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Test
         working-directory: ./yarn-project/end-to-end
         run: |
-          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.number }} --sat build-${{ matrix.environment }} --push +build
+          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.number || master }} --sat build-${{ matrix.environment }} --push +build
 
   e2e:
     needs: build
@@ -58,7 +58,7 @@ jobs:
         working-directory: ./yarn-project/end-to-end
 
         run: |
-          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.number }} --sat e2e-${{ matrix.environment }} +${{ matrix.test }}
+          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.number || master }} --sat e2e-${{ matrix.environment }} +${{ matrix.test }}
 
   # bb-native-tests:
   #   runs-on: ubuntu-latest

From ef0a715df0970082cd3b2acd8d82adeeee92f0e7 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 00:22:58 +0000
Subject: [PATCH 11/29] better

---
 .github/workflows/ci.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d17cfbbebc82..4696337fa0f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,10 +26,13 @@ jobs:
         working-directory: ./scripts
         run: ./setup_env.sh ${{ matrix.environment }} ${{ secrets.DOCKERHUB_PASSWORD }} ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
 
+      - name: Replace Slashes in GitHub Ref
+        run: echo "SANITIZED_REF=$(echo ${{ github.ref }} | sed 's/\//-/g')" >> $GITHUB_ENV
+
       - name: Test
         working-directory: ./yarn-project/end-to-end
         run: |
-          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.number || master }} --sat build-${{ matrix.environment }} --push +build
+          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.event.number || env.SANITIZED_REF}} --sat build-${{ matrix.environment }} --push +build
 
   e2e:
     needs: build
@@ -54,11 +57,14 @@ jobs:
         working-directory: ./scripts
         run: ./setup_env.sh ${{ matrix.environment }} ${{ secrets.DOCKERHUB_PASSWORD }} ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
 
+      - name: Replace Slashes in GitHub Ref
+        run: echo "SANITIZED_REF=$(echo ${{ github.ref }} | sed 's/\//-/g')" >> $GITHUB_ENV
+
       - name: Test
         working-directory: ./yarn-project/end-to-end
 
         run: |
-          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.number || master }} --sat e2e-${{ matrix.environment }} +${{ matrix.test }}
+          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || env.SANITIZED_REF }} --sat e2e-${{ matrix.environment }} +${{ matrix.test }}
 
   # bb-native-tests:
   #   runs-on: ubuntu-latest

From 135a75d90cb5cf0595b42dee21081eb60eaa4dc6 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 00:24:04 +0000
Subject: [PATCH 12/29] better

---
 .github/workflows/ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4696337fa0f0..1b519c4a9d4d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,6 @@ jobs:
         run: echo "SANITIZED_REF=$(echo ${{ github.ref }} | sed 's/\//-/g')" >> $GITHUB_ENV
 
       - name: Test
-        working-directory: ./yarn-project/end-to-end
         run: |
           earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.event.number || env.SANITIZED_REF}} --sat build-${{ matrix.environment }} --push +build
 
@@ -62,7 +61,6 @@ jobs:
 
       - name: Test
         working-directory: ./yarn-project/end-to-end
-
         run: |
           earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || env.SANITIZED_REF }} --sat e2e-${{ matrix.environment }} +${{ matrix.test }}
 

From 157a111c403d91a77ee561b50a0a924f7ef29fc4 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 00:47:43 +0000
Subject: [PATCH 13/29] rerun e2e

---
 yarn-project/end-to-end/Earthfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yarn-project/end-to-end/Earthfile b/yarn-project/end-to-end/Earthfile
index c7228768a72e..343ccb1f78e7 100644
--- a/yarn-project/end-to-end/Earthfile
+++ b/yarn-project/end-to-end/Earthfile
@@ -25,8 +25,9 @@ E2E_TEST:
     FUNCTION
     ARG test
     ARG compose_file=./scripts/docker-compose.yml
-    LOCALLY
+    FROM earthly/dind:alpine-3.19-docker-25.0.2-r0
     ENV TEST=$test
+    COPY $compose_file $compose_file
     WITH DOCKER \
       --load aztecprotocol/aztec:latest=+get-aztec \
       --load aztecprotocol/end-to-end:latest=+get-end-to-end \
@@ -34,7 +35,6 @@ E2E_TEST:
         # Run our docker compose, ending whenever sandbox ends, filtering out noisy eth_getLogs
         RUN docker compose -f $compose_file up --exit-code-from=sandbox --force-recreate
     END
-
 # we could use a parameterized target, but these just print cleaner in earthly log
 
 e2e-block-building:

From f4514832f0fdce89424df11b77400696b00975a8 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 00:51:16 +0000
Subject: [PATCH 14/29] earthly privilege

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1b519c4a9d4d..affc8cc96912 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: Test
         run: |
-          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.event.number || env.SANITIZED_REF}} --sat build-${{ matrix.environment }} --push +build
+          earthly -P --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.event.number || env.SANITIZED_REF}} --sat build-${{ matrix.environment }} --push +build
 
   e2e:
     needs: build
@@ -62,7 +62,7 @@ jobs:
       - name: Test
         working-directory: ./yarn-project/end-to-end
         run: |
-          earthly --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || env.SANITIZED_REF }} --sat e2e-${{ matrix.environment }} +${{ matrix.test }}
+          earthly -P --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || env.SANITIZED_REF }} --sat e2e-${{ matrix.environment }} +${{ matrix.test }}
 
   # bb-native-tests:
   #   runs-on: ubuntu-latest

From 42fbc041dba9b2fc28076740c2a032102da6bb32 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 01:33:29 +0000
Subject: [PATCH 15/29] your own personal compujesus

---
 .github/workflows/ci.yml   | 79 +++++++++++++++-----------------------
 barretenberg/cpp/Earthfile |  3 ++
 2 files changed, 35 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index affc8cc96912..9e928cd98459 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,14 +4,15 @@ on:
   workflow_dispatch: {}
 
 jobs:
-  build:
+  e2e:
+    needs: build
     runs-on: ubuntu-latest
     env:
       EARTHLY_TOKEN: ${{ secrets.EARTHLY_TOKEN }}
-    strategy: { matrix: { environment: [x86] } }
+    strategy: { matrix: { environment: [arm64, amd64], test: [e2e-escrow-contract, e2e-account-contracts] } }
     # cancel if reran on same PR if exists, otherwise if on same commit
     concurrency:
-      group: build-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}
+      group: ${{ matrix.test }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}
       cancel-in-progress: true
     steps:
       - uses: earthly/actions-setup@v1
@@ -26,64 +27,48 @@ jobs:
         working-directory: ./scripts
         run: ./setup_env.sh ${{ matrix.environment }} ${{ secrets.DOCKERHUB_PASSWORD }} ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
 
-      - name: Replace Slashes in GitHub Ref
-        run: echo "SANITIZED_REF=$(echo ${{ github.ref }} | sed 's/\//-/g')" >> $GITHUB_ENV
-
       - name: Test
+        working-directory: ./yarn-project/end-to-end
         run: |
-          earthly -P --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.event.number || env.SANITIZED_REF}} --sat build-${{ matrix.environment }} --push +build
+          # TODO put in script
+          # TODO clean up output if already created
+          earthly sat launch --size 4xlarge --platform linux/${{matrix.environment}} build-${{github.actor}}-${{ matrix.environment }} || true
+          if [ ${{ github.ref_name }} = master ] ; then
+            # update the remote cache
+            export EARTHLY_PUSH=true
+          fi
+          # TODO need to use more SAVE IMAGE --cache-hint and explicit BUILD statements for remote-cache to work well but then it should read artifacts from master done by all runners
+          earthly -P --no-output --org aztec --remote-cache=aztecprotocol/cache:${{matrix.test}} --sat build-${{github.actor}}-${{ matrix.environment }} +${{ matrix.test }}
 
-  e2e:
-    needs: build
+  bb-native-tests:
     runs-on: ubuntu-latest
     env:
       EARTHLY_TOKEN: ${{ secrets.EARTHLY_TOKEN }}
-    strategy: { matrix: { environment: [x86], test: [e2e-escrow-contract] } }
+    # run for both x86_64 and arm64
+    strategy: { matrix: { environment: [x86, arm] } }
     # cancel if reran on same PR if exists, otherwise if on same commit
     concurrency:
-      group: ${{ matrix.test }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}
+      group: bb-native-tests-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}
       cancel-in-progress: true
     steps:
-      - uses: earthly/actions-setup@v1
-        with:
-          version: v0.8.5
-
       - name: Checkout
         uses: actions/checkout@v4
-        with: {submodules: recursive}
+        with:
+          submodules: recursive
 
       - name: Setup
         working-directory: ./scripts
         run: ./setup_env.sh ${{ matrix.environment }} ${{ secrets.DOCKERHUB_PASSWORD }} ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
 
-      - name: Replace Slashes in GitHub Ref
-        run: echo "SANITIZED_REF=$(echo ${{ github.ref }} | sed 's/\//-/g')" >> $GITHUB_ENV
-
-      - name: Test
-        working-directory: ./yarn-project/end-to-end
-        run: |
-          earthly -P --no-output --org aztec --remote-cache=aztecprotocol/cache:${{ github.event.pull_request.number || env.SANITIZED_REF }} --sat e2e-${{ matrix.environment }} +${{ matrix.test }}
-
-  # bb-native-tests:
-  #   runs-on: ubuntu-latest
-  #   env:
-  #     EARTHLY_TOKEN: ${{ secrets.EARTHLY_TOKEN }}
-  #   # run for both x86_64 and arm64
-  #   strategy: { matrix: { environment: [x86] } }
-  #   # cancel if reran on same PR if exists, otherwise if on same commit
-  #   concurrency:
-  #     group: bb-native-tests-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}
-  #     cancel-in-progress: true
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v4
-  #       with:
-  #         submodules: recursive
-
-  #     - name: Setup
-  #       working-directory: ./scripts
-  #       run: ./setup_env.sh ${{ matrix.environment }} ${{ secrets.DOCKERHUB_PASSWORD }} ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
-
-  #     - name: Build and test
-  #       working-directory: ./barretenberg/cpp
-  #       run: earthly --no-output --org aztec --sat my-satellite --ci --push +build+test
+      - name: Build and test
+        working-directory: ./barretenberg/cpp
+        run:  |
+          # TODO put in script
+          # TODO clean up output if already created
+          earthly sat launch --size 4xlarge --platform linux/${{matrix.environment}} build-${{github.actor}}-${{ matrix.environment }} || true
+          if [ ${{ github.ref_name }} = master ] ; then
+            # update the remote cache
+            export EARTHLY_PUSH=true
+          fi
+          # TODO need to use more SAVE IMAGE --cache-hint and explicit BUILD statements for remote-cache to work well but then it should read artifacts from master done by all runners
+          earthly -P --no-output --org aztec --remote-cache=aztecprotocol/cache:bb-native-tests --sat build-${{github.actor}}-${{ matrix.environment }} +test
diff --git a/barretenberg/cpp/Earthfile b/barretenberg/cpp/Earthfile
index 0574c63a7108..87e20747a8f2 100644
--- a/barretenberg/cpp/Earthfile
+++ b/barretenberg/cpp/Earthfile
@@ -22,6 +22,7 @@ RUN apt-get update && apt-get install -y \
 WORKDIR /build
 
 SAVE IMAGE --push aztecprotocol/cache:bb-ubuntu-lunar
+SAVE IMAGE --cache-hint
 
 build-wasi-sdk-image:
     WORKDIR /
@@ -57,6 +58,7 @@ source:
     COPY --keep-ts --dir src/barretenberg src/CMakeLists.txt src
     # cmake source
     COPY --keep-ts --dir cmake CMakeLists.txt CMakePresets.json .
+    RUN touch echof
 
 preset-release-assert-all:
     FROM +source
@@ -81,6 +83,7 @@ preset-wasm:
     DO +RUN_CMAKE --configure="--preset wasm-threads" --build="--target barretenberg.wasm"
     RUN ./src/wasi-sdk/bin/llvm-strip ./bin/barretenberg.wasm
     SAVE ARTIFACT bin
+    SAVE IMAGE --cache-hint
 
 preset-gcc:
     FROM +source

From 9a490813f77506d24372694153e13a9f9143b9db Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 01:34:36 +0000
Subject: [PATCH 16/29] fix dep

---
 .github/workflows/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9e928cd98459..fb44aa46775e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,6 @@ on:
 
 jobs:
   e2e:
-    needs: build
     runs-on: ubuntu-latest
     env:
       EARTHLY_TOKEN: ${{ secrets.EARTHLY_TOKEN }}

From 06c0f2b5049097eee97f0dead0b9d0666ac27953 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 01:36:06 +0000
Subject: [PATCH 17/29] fix arch

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fb44aa46775e..a04b0b6b16b9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
     env:
       EARTHLY_TOKEN: ${{ secrets.EARTHLY_TOKEN }}
     # run for both x86_64 and arm64
-    strategy: { matrix: { environment: [x86, arm] } }
+    strategy: { matrix: { environment: [amd64, arm64] } }
     # cancel if reran on same PR if exists, otherwise if on same commit
     concurrency:
       group: bb-native-tests-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}-${{ matrix.environment }}

From 3afb8fac6b69a98c864263b205ae6c2679b577fe Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 01:37:12 +0000
Subject: [PATCH 18/29] aztec org

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a04b0b6b16b9..3907d409f07d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
         run: |
           # TODO put in script
           # TODO clean up output if already created
-          earthly sat launch --size 4xlarge --platform linux/${{matrix.environment}} build-${{github.actor}}-${{ matrix.environment }} || true
+          earthly sat --org aztec launch --size 4xlarge --platform linux/${{matrix.environment}} build-${{github.actor}}-${{ matrix.environment }} || true
           if [ ${{ github.ref_name }} = master ] ; then
             # update the remote cache
             export EARTHLY_PUSH=true
@@ -64,7 +64,7 @@ jobs:
         run:  |
           # TODO put in script
           # TODO clean up output if already created
-          earthly sat launch --size 4xlarge --platform linux/${{matrix.environment}} build-${{github.actor}}-${{ matrix.environment }} || true
+          earthly sat --org aztec launch --size 4xlarge --platform linux/${{matrix.environment}} build-${{github.actor}}-${{ matrix.environment }} || true
           if [ ${{ github.ref_name }} = master ] ; then
             # update the remote cache
             export EARTHLY_PUSH=true

From d8252b6a94dba718a09d3c1f9ef179b017894f9d Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 01:51:57 +0000
Subject: [PATCH 19/29] fix grumpkin path

---
 .github/workflows/ci.yml                                      | 4 ++--
 barretenberg/cpp/Earthfile                                    | 1 -
 .../src/barretenberg/srs/factories/mem_crs_factory.test.cpp   | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3907d409f07d..ca4f45896fc9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       EARTHLY_TOKEN: ${{ secrets.EARTHLY_TOKEN }}
+    # TODO currently names are coupled to platform
     strategy: { matrix: { environment: [arm64, amd64], test: [e2e-escrow-contract, e2e-account-contracts] } }
     # cancel if reran on same PR if exists, otherwise if on same commit
     concurrency:
@@ -30,7 +31,6 @@ jobs:
         working-directory: ./yarn-project/end-to-end
         run: |
           # TODO put in script
-          # TODO clean up output if already created
           earthly sat --org aztec launch --size 4xlarge --platform linux/${{matrix.environment}} build-${{github.actor}}-${{ matrix.environment }} || true
           if [ ${{ github.ref_name }} = master ] ; then
             # update the remote cache
@@ -44,6 +44,7 @@ jobs:
     env:
       EARTHLY_TOKEN: ${{ secrets.EARTHLY_TOKEN }}
     # run for both x86_64 and arm64
+    # TODO currently names are coupled to platform
     strategy: { matrix: { environment: [amd64, arm64] } }
     # cancel if reran on same PR if exists, otherwise if on same commit
     concurrency:
@@ -63,7 +64,6 @@ jobs:
         working-directory: ./barretenberg/cpp
         run:  |
           # TODO put in script
-          # TODO clean up output if already created
           earthly sat --org aztec launch --size 4xlarge --platform linux/${{matrix.environment}} build-${{github.actor}}-${{ matrix.environment }} || true
           if [ ${{ github.ref_name }} = master ] ; then
             # update the remote cache
diff --git a/barretenberg/cpp/Earthfile b/barretenberg/cpp/Earthfile
index 87e20747a8f2..b8ad9f8206e0 100644
--- a/barretenberg/cpp/Earthfile
+++ b/barretenberg/cpp/Earthfile
@@ -135,7 +135,6 @@ test:
     COPY --dir ./srs_db/+build/. srs_db
     RUN cd build && GTEST_COLOR=1 ctest -j$(nproc) --output-on-failure
 
-
 # Functions
 RUN_CMAKE:
     # Runs cmake build and leaves binary artifacts at 'bin'
diff --git a/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp b/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp
index bfdab78e996e..3a8e893e53cf 100644
--- a/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp
@@ -48,11 +48,11 @@ TEST(reference_string, mem_bn254_file_consistency)
 TEST(reference_string, mem_grumpkin_file_consistency)
 {
     // Load 1024 from file.
-    auto file_crs = FileCrsFactory<Grumpkin>("../srs_db/ignition", 1024);
+    auto file_crs = FileCrsFactory<Grumpkin>("../srs_db/grumpkin", 1024);
 
     // Use low level io lib to read 1024 from file.
     std::vector<Grumpkin::AffineElement> points(1024);
-    ::srs::IO<Grumpkin>::read_transcript_g1(points.data(), 1024, "../srs_db/ignition");
+    ::srs::IO<Grumpkin>::read_transcript_g1(points.data(), 1024, "../srs_db/grumpkin");
 
     MemGrumpkinCrsFactory mem_crs(points);
     auto file_prover_crs = file_crs.get_prover_crs(1024);

From 7abf770bf7250aba09a42c4bdccc39e364308c00 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 01:59:13 +0000
Subject: [PATCH 20/29] redo

---
 barretenberg/cpp/Earthfile                                      | 1 -
 .../cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/barretenberg/cpp/Earthfile b/barretenberg/cpp/Earthfile
index b8ad9f8206e0..80afe14794dc 100644
--- a/barretenberg/cpp/Earthfile
+++ b/barretenberg/cpp/Earthfile
@@ -58,7 +58,6 @@ source:
     COPY --keep-ts --dir src/barretenberg src/CMakeLists.txt src
     # cmake source
     COPY --keep-ts --dir cmake CMakeLists.txt CMakePresets.json .
-    RUN touch echof
 
 preset-release-assert-all:
     FROM +source
diff --git a/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp b/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp
index 3a8e893e53cf..190fa75cef1d 100644
--- a/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp
@@ -45,7 +45,7 @@ TEST(reference_string, mem_bn254_file_consistency)
               0);
 }
 
-TEST(reference_string, mem_grumpkin_file_consistency)
+TEST(reference_string, DISABLED_mem_grumpkin_file_consistency)
 {
     // Load 1024 from file.
     auto file_crs = FileCrsFactory<Grumpkin>("../srs_db/grumpkin", 1024);

From 1a8725566b5958b26253ead5d61cfb5d08b05b1b Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Tue, 19 Mar 2024 23:40:12 -0400
Subject: [PATCH 21/29] Update ci.yml

---
 .github/workflows/ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca4f45896fc9..91f2654abe21 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,9 @@
 name: Run CI with Earthly
 on:
-  push: {}
+  push:
+    branches:
+      - master
+  pull_request_target: {}
   workflow_dispatch: {}
 
 jobs:

From f8c39c128843367cca18f0d09a534f89e25b0848 Mon Sep 17 00:00:00 2001
From: ludamad <adam.domurad@gmail.com>
Date: Wed, 20 Mar 2024 09:28:14 -0400
Subject: [PATCH 22/29] Update Earthfile

---
 noir/Earthfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/noir/Earthfile b/noir/Earthfile
index bf3664bfbd6d..2ec544a0b8c0 100644
--- a/noir/Earthfile
+++ b/noir/Earthfile
@@ -61,7 +61,7 @@ packages:
     ENV COMMIT_HASH=$(find . -type f -exec sha256sum {} ';' | sort | sha256sum | awk '{print $1}')
     RUN PATH="/root/.cargo/bin:$PATH" ./scripts/bootstrap_packages.sh
     SAVE ARTIFACT packages
-    SAVE IMAGE aztecprotocol/noir-packages
+    SAVE IMAGE --cache-hint
 
 run:
     # When running the container, mount the users home directory to same location.

From c6146de5b404335eaac20c00df8461dde4795128 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 21:16:50 +0000
Subject: [PATCH 23/29] revert

---
 .circleci/config.yml                          | 484 +++++++++---------
 .../end-to-end/scripts/docker-compose.yml     |   8 +-
 2 files changed, 251 insertions(+), 241 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5187bb14dfaa..1a69da686a03 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -892,6 +892,16 @@ jobs:
           aztec_manifest_key: end-to-end
     <<: *defaults_e2e_test
 
+  integration-archiver-l1-to-l2:
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=integration_archiver_l1_to_l2.test.ts
+          aztec_manifest_key: end-to-end
+    <<: *defaults_e2e_test
+
   integration-l1-publisher:
     steps:
       - *checkout
@@ -1265,243 +1275,245 @@ workflows:
     #   equal: [NEVER, << pipeline.parameters.workflow >>]
     jobs:
       # Noir
-      # - noir-x86_64: *defaults
-      # - noir-arm64: *defaults
-      # - noir-ecr-manifest:
-      #     requires:
-      #       - noir-x86_64
-      #       - noir-arm64
-      #     <<: *defaults
-      # - noir-tests: *defaults
-      # - noir-packages: *defaults
-      # - noir-packages-tests:
-      #     requires:
-      #       - noir-ecr-manifest
-      #     <<: *defaults
-      # - noir-compile-acir-tests:
-      #     requires:
-      #       - noir-ecr-manifest
-      #     <<: *defaults
-
-      # # Transpiler
-      # - avm-transpiler: *defaults
-
-      # # Barretenberg
-      # - barretenberg-x86_64-linux-gcc: *defaults
-      # - barretenberg-x86_64-linux-clang: *defaults
-      # - barretenberg-x86_64-linux-clang-assert: *defaults
-      # - barretenberg-x86_64-linux-clang-fuzzing: *defaults
-      # - barretenberg-wasm-linux-clang: *defaults
-      # - barretenberg-x86_64-linux-clang-sol: *defaults
-      # - barretenberg-bench:
-      #     requires:
-      #       - barretenberg-x86_64-linux-clang
-      #     <<: *defaults
-      # - barretenberg-proof-system-tests: *bb_test
-      # - barretenberg-dsl-tests: *bb_test
-      # - barretenberg-tests: *bb_test
-      # - barretenberg-stdlib-tests: *bb_test
-      # - barretenberg-stdlib-recursion-ultra-tests: *bb_test
-      # - barretenberg-acir-tests-bb: *bb_acir_tests
-      # - barretenberg-acir-tests-bb-sol:
-      #     requires:
-      #       - barretenberg-x86_64-linux-clang-sol
-      #     <<: *bb_acir_tests
-      # - barretenberg-docs: *defaults
-      # - bb-js:
-      #     requires:
-      #       - barretenberg-wasm-linux-clang
-      #     <<: *defaults
-      # - bb-js-tests:
-      #     requires:
-      #       - bb-js
-      #     <<: *defaults
-      # - bb-js-acir-tests:
-      #     requires:
-      #       - bb-js
-      #       - noir-compile-acir-tests
-      #     <<: *defaults
-
-      # - l1-contracts: *defaults
-
-      # - mainnet-fork: *defaults
-
-      # - yellow-paper: *defaults
-
-      # - noir-projects:
-      #     requires:
-      #       - avm-transpiler
-      #       - noir-ecr-manifest
-      #     <<: *defaults
-
-      # # Yarn Project
-      # - yarn-project-pre-join:
-      #     requires:
-      #       - bb-js
-      #       - noir-packages
-      #       - l1-contracts
-      #       - noir-projects
-      #     <<: *defaults
-      # - end-to-end: *defaults_yarn_project
-      # - aztec-faucet: *defaults_yarn_project_pre_join
-      # - build-docs: *defaults_yarn_project_pre_join
-      # - yarn-project-test: *defaults_yarn_project
-      # - 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
-      # - cli: *defaults_yarn_project
-
-      # # Boxes.
-      # - boxes:
-      #     requires:
-      #       - aztec-package
-      #     <<: *defaults
-      # - boxes-vanilla:
-      #     requires:
-      #       - boxes
-      #     <<: *defaults
-      # - boxes-react:
-      #     requires:
-      #       - boxes
-      #     <<: *defaults
+      - noir-x86_64: *defaults
+      - noir-arm64: *defaults
+      - noir-ecr-manifest:
+          requires:
+            - noir-x86_64
+            - noir-arm64
+          <<: *defaults
+      - noir-tests: *defaults
+      - noir-packages: *defaults
+      - noir-packages-tests:
+          requires:
+            - noir-ecr-manifest
+          <<: *defaults
+      - noir-compile-acir-tests:
+          requires:
+            - noir-ecr-manifest
+          <<: *defaults
+
+      # Transpiler
+      - avm-transpiler: *defaults
+
+      # Barretenberg
+      - barretenberg-x86_64-linux-gcc: *defaults
+      - barretenberg-x86_64-linux-clang: *defaults
+      - barretenberg-x86_64-linux-clang-assert: *defaults
+      - barretenberg-x86_64-linux-clang-fuzzing: *defaults
+      - barretenberg-wasm-linux-clang: *defaults
+      - barretenberg-x86_64-linux-clang-sol: *defaults
+      - barretenberg-bench:
+          requires:
+            - barretenberg-x86_64-linux-clang
+          <<: *defaults
+      - barretenberg-proof-system-tests: *bb_test
+      - barretenberg-dsl-tests: *bb_test
+      - barretenberg-tests: *bb_test
+      - barretenberg-stdlib-tests: *bb_test
+      - barretenberg-stdlib-recursion-ultra-tests: *bb_test
+      - barretenberg-acir-tests-bb: *bb_acir_tests
+      - barretenberg-acir-tests-bb-sol:
+          requires:
+            - barretenberg-x86_64-linux-clang-sol
+          <<: *bb_acir_tests
+      - barretenberg-docs: *defaults
+      - bb-js:
+          requires:
+            - barretenberg-wasm-linux-clang
+          <<: *defaults
+      - bb-js-tests:
+          requires:
+            - bb-js
+          <<: *defaults
+      - bb-js-acir-tests:
+          requires:
+            - bb-js
+            - noir-compile-acir-tests
+          <<: *defaults
+
+      - l1-contracts: *defaults
+
+      - mainnet-fork: *defaults
+
+      - yellow-paper: *defaults
+
+      - noir-projects:
+          requires:
+            - avm-transpiler
+            - noir-ecr-manifest
+          <<: *defaults
+
+      # Yarn Project
+      - yarn-project-pre-join:
+          requires:
+            - bb-js
+            - noir-packages
+            - l1-contracts
+            - noir-projects
+          <<: *defaults
+      - end-to-end: *defaults_yarn_project
+      - aztec-faucet: *defaults_yarn_project_pre_join
+      - build-docs: *defaults_yarn_project_pre_join
+      - yarn-project-test: *defaults_yarn_project
+      - 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
+      - cli: *defaults_yarn_project
+
+      # Boxes.
+      - boxes:
+          requires:
+            - aztec-package
+          <<: *defaults
+      - boxes-vanilla:
+          requires:
+            - boxes
+          <<: *defaults
+      - boxes-react:
+          requires:
+            - boxes
+          <<: *defaults
 
       # End to end tests.
       - e2e-join:
-          requires: []
-            # - end-to-end
-            # - aztec-package
-            # - cli
+          requires:
+            - end-to-end
+            - aztec-package
+            - cli
           <<: *defaults
-      # - e2e-2-pxes: *e2e_test
-      # - e2e-note-getter: *e2e_test
-      # - e2e-deploy-contract: *e2e_test
-      # - e2e-lending-contract: *e2e_test
-      # - e2e-token-contract: *e2e_test
-      # - e2e-authwit-test: *e2e_test
-      # - e2e-blacklist-token-contract: *e2e_test
-      # # TODO(3458): Investigate intermittent failure
-      # # - e2e-slow-tree: *e2e_test
-      # - e2e-sandbox-example: *e2e_test
-      # - e2e-state-vars: *e2e_test
-      # - e2e-block-building: *e2e_test
-      # - e2e-nested-contract: *e2e_test
-      # - e2e-static-calls: *e2e_test
-      # - e2e-delegate-calls: *e2e_test
-      # - e2e-non-contract-account: *e2e_test
-      # - e2e-multiple-accounts-1-enc-key: *e2e_test
-      # - e2e-cli: *e2e_test
-      # - e2e-cross-chain-messaging: *e2e_test
-      # - e2e-crowdfunding-and-claim: *e2e_test
-      # - e2e-public-cross-chain-messaging: *e2e_test
-      # - e2e-public-to-private-messaging: *e2e_test
-      # - e2e-account-contracts: *e2e_test
-      # - e2e-escrow-contract: *e2e_test
-      # - 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
-      # - integration-l1-publisher: *e2e_test
-      # - e2e-persistence: *e2e_test
-      # - e2e-browser: *e2e_test
-      # - e2e-card-game: *e2e_test
-      # - e2e-avm-simulator: *e2e_test
-      # - e2e-fees: *e2e_test
-      # - e2e-dapp-subscription: *e2e_test
-      # - pxe: *e2e_test
-      # - cli-docs-sandbox: *e2e_test
-      # - e2e-docs-examples: *e2e_test
-      # - guides-writing-an-account-contract: *e2e_test
-      # - guides-dapp-testing: *e2e_test
-      # - guides-sample-dapp: *e2e_test
-      # - guides-up-quick-start: *e2e_test
-
-      # # 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-acir-tests-bb
-      #       - barretenberg-acir-tests-bb-sol
-      #       - barretenberg-docs
-      #       - build-docs
-      #       - mainnet-fork
-      #       - e2e-2-pxes
-      #       - e2e-note-getter
-      #       - e2e-deploy-contract
-      #       - e2e-lending-contract
-      #       - e2e-token-contract
-      #       - e2e-authwit-test
-      #       - e2e-blacklist-token-contract
-      #       - e2e-sandbox-example
-      #       - e2e-state-vars
-      #       - e2e-block-building
-      #       - e2e-nested-contract
-      #       - e2e-static-calls
-      #       - e2e-delegate-calls
-      #       - e2e-non-contract-account
-      #       - e2e-multiple-accounts-1-enc-key
-      #       - e2e-cli
-      #       - e2e-cross-chain-messaging
-      #       - e2e-crowdfunding-and-claim
-      #       - e2e-public-cross-chain-messaging
-      #       - e2e-public-to-private-messaging
-      #       - e2e-account-contracts
-      #       - e2e-escrow-contract
-      #       - e2e-inclusion-proofs-contract
-      #       - e2e-pending-note-hashes-contract
-      #       - e2e-ordering
-      #       - e2e-outbox
-      #       - e2e-counter
-      #       - e2e-private-voting
-      #       - uniswap-trade-on-l1-from-l2
-      #       - integration-l1-publisher
-      #       - e2e-persistence
-      #       - e2e-browser
-      #       - e2e-card-game
-      #       - e2e-avm-simulator
-      #       - e2e-fees
-      #       - e2e-dapp-subscription
-      #       - pxe
-      #       - boxes-vanilla
-      #       - boxes-react
-      #       - cli-docs-sandbox
-      #       - e2e-docs-examples
-      #       - guides-writing-an-account-contract
-      #       - guides-dapp-testing
-      #       - guides-sample-dapp
-      #       - guides-up-quick-start
-      #       - yellow-paper
-      #       - yarn-project-test
-      #     <<: *defaults
-
-      # # Benchmark jobs.
-      # - bench-publish-rollup: *e2e_test
-      # - bench-process-history: *e2e_test
-      # - bench-summary:
-      #     requires:
-      #       - bench-publish-rollup
-      #       - bench-process-history
-      #     <<: *defaults
-
-      # # Production releases.
-      # - deploy-and-release: *defaults_deploy
+      - e2e-2-pxes: *e2e_test
+      - e2e-note-getter: *e2e_test
+      - e2e-deploy-contract: *e2e_test
+      - e2e-lending-contract: *e2e_test
+      - e2e-token-contract: *e2e_test
+      - e2e-authwit-test: *e2e_test
+      - e2e-blacklist-token-contract: *e2e_test
+      # TODO(3458): Investigate intermittent failure
+      # - e2e-slow-tree: *e2e_test
+      - e2e-sandbox-example: *e2e_test
+      - e2e-state-vars: *e2e_test
+      - e2e-block-building: *e2e_test
+      - e2e-nested-contract: *e2e_test
+      - e2e-static-calls: *e2e_test
+      - e2e-delegate-calls: *e2e_test
+      - e2e-non-contract-account: *e2e_test
+      - e2e-multiple-accounts-1-enc-key: *e2e_test
+      - e2e-cli: *e2e_test
+      - e2e-cross-chain-messaging: *e2e_test
+      - e2e-crowdfunding-and-claim: *e2e_test
+      - e2e-public-cross-chain-messaging: *e2e_test
+      - e2e-public-to-private-messaging: *e2e_test
+      - e2e-account-contracts: *e2e_test
+      - e2e-escrow-contract: *e2e_test
+      - 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
+      - integration-l1-publisher: *e2e_test
+      - integration-archiver-l1-to-l2: *e2e_test
+      - e2e-persistence: *e2e_test
+      - e2e-browser: *e2e_test
+      - e2e-card-game: *e2e_test
+      - e2e-avm-simulator: *e2e_test
+      - e2e-fees: *e2e_test
+      - e2e-dapp-subscription: *e2e_test
+      - pxe: *e2e_test
+      - cli-docs-sandbox: *e2e_test
+      - e2e-docs-examples: *e2e_test
+      - guides-writing-an-account-contract: *e2e_test
+      - guides-dapp-testing: *e2e_test
+      - guides-sample-dapp: *e2e_test
+      - guides-up-quick-start: *e2e_test
+
+      # 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-acir-tests-bb
+            - barretenberg-acir-tests-bb-sol
+            - barretenberg-docs
+            - build-docs
+            - mainnet-fork
+            - e2e-2-pxes
+            - e2e-note-getter
+            - e2e-deploy-contract
+            - e2e-lending-contract
+            - e2e-token-contract
+            - e2e-authwit-test
+            - e2e-blacklist-token-contract
+            - e2e-sandbox-example
+            - e2e-state-vars
+            - e2e-block-building
+            - e2e-nested-contract
+            - e2e-static-calls
+            - e2e-delegate-calls
+            - e2e-non-contract-account
+            - e2e-multiple-accounts-1-enc-key
+            - e2e-cli
+            - e2e-cross-chain-messaging
+            - e2e-crowdfunding-and-claim
+            - e2e-public-cross-chain-messaging
+            - e2e-public-to-private-messaging
+            - e2e-account-contracts
+            - e2e-escrow-contract
+            - e2e-inclusion-proofs-contract
+            - e2e-pending-note-hashes-contract
+            - e2e-ordering
+            - e2e-outbox
+            - e2e-counter
+            - e2e-private-voting
+            - uniswap-trade-on-l1-from-l2
+            - integration-l1-publisher
+            - integration-archiver-l1-to-l2
+            - e2e-persistence
+            - e2e-browser
+            - e2e-card-game
+            - e2e-avm-simulator
+            - e2e-fees
+            - e2e-dapp-subscription
+            - pxe
+            - boxes-vanilla
+            - boxes-react
+            - cli-docs-sandbox
+            - e2e-docs-examples
+            - guides-writing-an-account-contract
+            - guides-dapp-testing
+            - guides-sample-dapp
+            - guides-up-quick-start
+            - yellow-paper
+            - yarn-project-test
+          <<: *defaults
+
+      # Benchmark jobs.
+      - bench-publish-rollup: *e2e_test
+      - bench-process-history: *e2e_test
+      - bench-summary:
+          requires:
+            - bench-publish-rollup
+            - bench-process-history
+          <<: *defaults
+
+      # Production releases.
+      - deploy-and-release: *defaults_deploy
diff --git a/yarn-project/end-to-end/scripts/docker-compose.yml b/yarn-project/end-to-end/scripts/docker-compose.yml
index a6c2438d92d4..b9959028d978 100644
--- a/yarn-project/end-to-end/scripts/docker-compose.yml
+++ b/yarn-project/end-to-end/scripts/docker-compose.yml
@@ -5,12 +5,10 @@ services:
     entrypoint: >
       sh -c '
       if [ -n "$FORK_BLOCK_NUMBER" ] && [ -n "$FORK_URL" ]; then
-        { anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337 --fork-url "$FORK_URL" --fork-block-number "$FORK_BLOCK_NUMBER" ; echo $$? > .status ; } | grep -v eth_getLogs
+        anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337 --fork-url "$FORK_URL" --fork-block-number "$FORK_BLOCK_NUMBER"
       else
-        { anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337 ; echo $$? > .status ; } | grep -v eth_getLogs
-      fi
-      # final status
-      grep -q '^0$$' .status'
+        anvil --silent -p 8545 --host 0.0.0.0 --chain-id 31337
+      fi'
     ports:
       - '8545:8545'
 

From eeba7249a2422214c15988c3c0ed6dfe2e6c592d Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 21:43:20 +0000
Subject: [PATCH 24/29] test

---
 .github/workflows/ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 91f2654abe21..aa9cf31d7dfa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,9 +1,10 @@
 name: Run CI with Earthly
 on:
   push:
-    branches:
-      - master
-  pull_request_target: {}
+    branches: [master]
+  pull_request_target:
+    branches: [develop]
+    types: [opened, synchronize, reopened]
   workflow_dispatch: {}
 
 jobs:

From b671fce3947524a421c0cf6f3258b3b624bf0e44 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 21:44:08 +0000
Subject: [PATCH 25/29] test

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aa9cf31d7dfa..f914432c4960 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ on:
   push:
     branches: [master]
   pull_request_target:
-    branches: [develop]
+    branches: [*]
     types: [opened, synchronize, reopened]
   workflow_dispatch: {}
 

From d7e4f11b11c9e6bf95607e2f20c8390a65713767 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 21:45:32 +0000
Subject: [PATCH 26/29] test

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f914432c4960..6ebf71e8d5a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ on:
   push:
     branches: [master]
   pull_request_target:
-    branches: [*]
+    branches: ["*"]
     types: [opened, synchronize, reopened]
   workflow_dispatch: {}
 

From 4a46dfd23a13c4c9db1d2339f6fb9d1c5a06dc74 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 21:46:59 +0000
Subject: [PATCH 27/29] test

---
 .github/workflows/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ebf71e8d5a7..739f5655ca27 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,6 @@ on:
   push:
     branches: [master]
   pull_request_target:
-    branches: ["*"]
     types: [opened, synchronize, reopened]
   workflow_dispatch: {}
 

From 93988b4f71ba0a3da53a7605286ff841177be3e3 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 21:47:49 +0000
Subject: [PATCH 28/29] pr?

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 739f5655ca27..0f4c543d9a79 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: Run CI with Earthly
 on:
   push:
     branches: [master]
-  pull_request_target:
+  pull_request:
     types: [opened, synchronize, reopened]
   workflow_dispatch: {}
 

From 861c823d594c6e31744d627a78f88debd8abe077 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Wed, 20 Mar 2024 21:49:43 +0000
Subject: [PATCH 29/29] revert ci checkout

---
 .github/workflows/ci.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0f4c543d9a79..4af800da75e0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,8 +2,7 @@ name: Run CI with Earthly
 on:
   push:
     branches: [master]
-  pull_request:
-    types: [opened, synchronize, reopened]
+  pull_request: {}
   workflow_dispatch: {}
 
 jobs:
@@ -24,7 +23,9 @@ jobs:
 
       - name: Checkout
         uses: actions/checkout@v4
-        with: {submodules: recursive}
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          submodules: recursive
 
       - name: Setup
         working-directory: ./scripts
@@ -57,6 +58,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
+          ref: ${{ github.event.pull_request.head.sha }}
           submodules: recursive
 
       - name: Setup