feat: merge-train/spartan (#20382)

BEGIN_COMMIT_OVERRIDE
chore: Should fix proving benchmarks by reducing committee lag (#20381)
chore: standalone forge broadcast wrapper with retry, timeout, and anvil
detection (#19824)
chore: benchmark tx val (#20227)
fix: cloudflare terraform API (#20387)
fix: HA e2e test order & retries (#20383)
fix: incorporate forge broadcast review feedback (#20390)
refactor(p2p): rewrite FileStoreTxCollection with retry, backoff, and
shared worker pool (#20317)
chore(ci): run ci job on draft PRs (#20395)
feat(bot): allow anchoring txs to proposed chain (#20392)
feat(p2p): slot-based soft deletion for TxPoolV2 (#20388)
chore: add setup-container script (#20309)
feat: build aztec-prover-agent with baked-in CRS (#20391)
fix!: change protocol contracts deployer to be the contract address
(#20396)
feat(p2p): enforce minimum tx pool age for block building (#20384)
refactor(sentinel): update validator statuses to checkpoint-based naming
(#20372)
chore: log tx hash (#20413)
chore: update l1 fee analysis to measure blob count in L1 blocks
(#20414)
chore: set up tx file store in next-net (#20418)
chore(ci): gate draft PRs from CI, allow override with ci-draft label
(#20426)
fix: stabilize writing_an_account_contract.test.ts (#20420)
END_COMMIT_OVERRIDE

Author: ludamad

.github/workflows/ci3.yml

@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     # exclusive with ci3-external.yml: never run on forks
     # (github.event.pull_request.head.repo.fork resolves to nil if not a pull request)
-    if: github.event.pull_request.head.repo.fork != true && github.event.pull_request.draft == false
+    if: github.event.pull_request.head.repo.fork != true && (github.event.pull_request.draft == false || contains(github.event.pull_request.labels.*.name, 'ci-draft'))
     environment: ${{ startsWith(github.ref, 'refs/tags/v') && 'master' || '' }}
     steps:
       - name: Checkout

.github/workflows/deploy-network.yml

@@ -150,9 +150,11 @@ jobs:
           AZTEC_DOCKER_IMAGE: "aztecprotocol/aztec:${{ inputs.docker_image_tag || inputs.semver }}"
           CREATE_ROLLUP_CONTRACTS: ${{ inputs.deploy_contracts == true && 'true' || '' }}
           USE_NETWORK_CONFIG: ${{ inputs.deploy_contracts == true && 'false' || '' }}
+          PROVER_AGENT_DOCKER_IMAGE: "aztecprotocol/aztec-prover-agent:${{ inputs.docker_image_tag || inputs.semver }}"
         run: |
           echo "Deploying network: ${{ inputs.network }}"
           echo "Using image: $AZTEC_DOCKER_IMAGE"
+          echo "Using prover image: $PROVER_AGENT_DOCKER_IMAGE"
           echo "Using branch/ref: ${{ steps.checkout-ref.outputs.ref }}"
 
           cd spartan

.github/workflows/nightly-spartan-bench.yml

@@ -152,7 +152,7 @@ jobs:
           fi
 
       - name: Run proving benchmarks
-        timeout-minutes: 150
+        timeout-minutes: 180
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -162,7 +162,7 @@ jobs:
           GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
           RUN_ID: ${{ github.run_id }}
-          AWS_SHUTDOWN_TIME: 150
+          AWS_SHUTDOWN_TIME: 180
           NO_SPOT: 1
         run: |
           ./.github/ci3.sh network-proving-bench prove-n-tps-fake prove-n-tps-fake "aztecprotocol/aztec:${{ steps.nightly-tag.outputs.nightly_tag }}"

.test_patterns.yml

@@ -238,27 +238,6 @@ tests:
     owners:
       - *saleel
 
-  # Example http://ci.aztec-labs.com/18db8adf0db50928
-  # This seems to be an error in acvm wasm/js
-  - regex: "run_compose_test [a-z]*-[a-z]* box boxes"
-    error_regex: "call_indirect to a null table entry"
-    owners:
-      - *adam
-
-  # Example http://ci.aztec-labs.com/1752518c2215134c
-  # This seems to be a flake in how this is set up. TODO redo boxes.
-  - regex: "run_compose_test [a-z]*-[a-z]* box boxes"
-    error_regex: "expect.locator..toBeVisible.."
-    owners:
-      - *adam
-
-  # Example http://ci.aztec-labs.com/cd76b19670ab613f
-  # related to wasm proving browser flakes potentially
-  - regex: "run_compose_test [a-z]*-[a-z]* box boxes"
-    error_regex: "Out of bounds memory access (evaluating 'this.exports"
-    owners:
-      - *adam
-
   - regex: "run_compose_test vite-[a-z]* box boxes"
     error_regex: "Test timeout of [0-9]+ms exceeded."
     owners:
@@ -330,13 +309,6 @@ tests:
     owners:
       - *palla
 
-  # http://ci.aztec-labs.com/963635a09039594f
-  # http://ci.aztec-labs.com/d3b12131764bce18
-  - regex: "boxes/scripts/run_test.sh"
-    error_regex: "sending signal TERM to command"
-    owners:
-      - *adam
-
   # http://ci.aztec-labs.com/e8228a36afda93b8
   # Test passed but there was an error on stopping
   - regex: "playground/scripts/run_test.sh"

ci3/run_compose_test

@@ -14,7 +14,11 @@ shutdown=0
 trap 'shutdown=1' TERM INT
 
 down() {
-  docker compose -p "$name" down --remove-orphans --timeout 2 >/dev/null 2>&1 || true
+  local down_flags="--remove-orphans --timeout 2"
+  if [ "${REMOVE_COMPOSE_VOLUMES:-0}" -eq 1 ]; then
+    down_flags="-v $down_flags"
+  fi
+  docker compose -p "$name" down $down_flags >/dev/null 2>&1 || true
 }
 trap down EXIT
 

docs/docs-developers/docs/resources/migration_notes.md

@@ -97,6 +97,26 @@ Additionally, `debug_log_format_slice` has been removed. Use `debug_log_format`
 
 This has been done as usage of Noir slices is discouraged and the function was unused in the aztec codebase.
 
+### [AztecNode] Sentinel validator status values renamed
+
+The `ValidatorStatusInSlot` values returned by `getValidatorsStats` and `getValidatorStats` have been updated to reflect the multi-block-per-slot model, where blocks and checkpoints are distinct concepts:
+
+```diff
+- 'block-mined'
++ 'checkpoint-mined'
+
+- 'block-proposed'
++ 'checkpoint-proposed'
+
+- 'block-missed'
++ 'checkpoint-missed'  // blocks were proposed but checkpoint was not attested
++ 'blocks-missed'      // no block proposals were sent at all
+```
+
+The `attestation-sent` and `attestation-missed` values are unchanged but now explicitly refer to checkpoint attestations.
+
+The `ValidatorStatusType` used for categorizing statuses has also changed from `'block' | 'attestation'` to `'proposer' | 'attestation'`.
+
 ### [aztec.js] `getDecodedPublicEvents` renamed to `getPublicEvents` with new signature
 
 The `getDecodedPublicEvents` function has been renamed to `getPublicEvents` and now uses a filter object instead of positional parameters:

l1-contracts/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@aztec/l1-contracts",
   "version": "0.1.0",
+  "type": "module",
   "license": "Apache-2.0",
   "description": "Aztec contracts for the Ethereum mainnet and testnets",
   "devDependencies": {