Merge branch 'master' into tf/fixed-length-black-box-arrays

* master:
  chore(avm): Add a boolean to toggle proving in AVM unit tests (#5667)
  feat: sequencer validates setup/teardown function selectors (#5649)
  yolo fix
  feat: e2e token contract can run in 2m with snapshots and test separation. (#5526)
  feat: separate nullfier_inclusion checks for private/public/avm (#5657)
  feat(simulator): Fetch return values at circuit execution (#5642)
  chore: small logging changes (#5654)
  fix(hotfix): CI ignore git safe.directory checks (#5659)
  chore: update noir gates diff (#5658)
  fix: hotfix submodule cache

.circleci/config.yml

@@ -705,7 +705,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_token_contract.test.ts
+          command: cond_spot_run_container end-to-end 8 ./src/e2e_token_contract/
           aztec_manifest_key: end-to-end
     <<: *defaults_e2e_test
 

.github/ci-setup-action/action.yml

@@ -10,24 +10,26 @@ runs:
   # define an action, runs in OS of caller
   using: composite
   steps:
+    # Since we use multiple runners, dont want them clashing
+    - name: Generate Unique Home Directory
+      shell: bash
+      run: |
+        RUN_HOME=~/run-$RANDOM-$(date +%s)
+        echo HOME=$RUN_HOME >> $GITHUB_ENV
+        mkdir -p $RUN_HOME
+
     - name: Cache Submodules
       id: cache-submodules
       uses: actions/cache@v3
       with:
         path: .git/modules
-        key: submodules-${{ hashFiles('.gitmodules') }}
+        key: submodules-${{ hashFiles('.gitmodules') }}-spot-ebs
 
     - name: Checkout Submodules
-      shell: bash
-      run: git submodule sync --recursive && git submodule update --init --recursive
-
-    # Since we use multiple runners, dont want them clashing
-    - name: Generate Unique Home Directory
       shell: bash
       run: |
-        RUN_HOME=~/run-$RANDOM-$(date +%s)
-        echo HOME=$RUN_HOME >> $GITHUB_ENV
-        mkdir -p $RUN_HOME
+        git config --global --add safe.directory '*'
+        git submodule sync --recursive && git submodule update --init --recursive
 
     # TODO reconsider how jq gets into image
     - name: Setup jq

.github/workflows/protocol-circuits-gate-diff.yml

@@ -90,7 +90,7 @@ jobs:
 
       - name: Compare gates reports
         id: gates_diff
-        uses: TomAFrench/noir-gates-diff@e7cf131b7e7f044c01615f93f0b855f65ddc02d4
+        uses: TomAFrench/noir-gates-diff@df05f34e2ab275ddc4f2cac065df1c88f8a05e5d
         with:
           report: protocol_circuits_report.json
           summaryQuantile: 0 # Display any diff in gate count