Skip to content

Commit 992f8ea

Browse files
PhilWindlePhilWindle
authored
feat: merge-train/spartan (#23671)
BEGIN_COMMIT_OVERRIDE test(e2e): unskip pipelining related e2e tests (#23642) fix(archiver): prune blocks without proposed checkpoint by end of build slot (#23606) test: migrate benchmarks to pipelining setup (#23647) fix(p2p): fall back to archiver in BLOCK_TXS response validation (#23624) docs(slashing): align operator and slasher docs with AZIP-7 (#23494) fix(p2p): do not penalize peers that signal a missing block with Fr.ZERO (#23672) chore: adjust metrics deployment (#23676) fix(cheat-codes): warpL2TimeAtLeastBy advances relative to leading clock (#23675) chore: tighten node pool sizes (#23678) chore: remove archival nodes (#23630) chore: merge blob sink duties into RPC node (#23631) fix: sync avm-transpiler Cargo.lock with noir submodule (#23683) fix(spartan): set validator lag env vars in tps-scenario (#23684) fix: make world-state hash queries reorg-aware to close getWorldState race (#23677) fix: pin noir submodule to next's version on merge-train/spartan (#23690) fix: ensure image ref is used by bench runner (#23682) fix(ci): retry aztec-nr nargo dependency clone on transient network flake (#23653) chore: run one-off jobs on network nodes (#23701) fix: simulate proposals inside target slot (#23692) chore: smaller eth-devnet (#23704) chore: enable testnet autoscaling (#23705) feat(api)!: redesign node log retrieval API around tag-based queries (#23625) fix(sequencer): set own proposed checkpoint locally instead of via p2p loopback (#23659) END_COMMIT_OVERRIDE
2 parents 6236335 + 69d7b58 commit 992f8ea

157 files changed

Lines changed: 4667 additions & 3788 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/nightly-bench-10tps.yml‎

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ on:
1313
description: "Nightly tag to use (e.g., 2.3.4-nightly.20251209). Ignored if docker_image is set. Leave empty to auto-detect."
1414
required: false
1515
type: string
16+
source_ref:
17+
description: "Git ref to checkout (e.g., v5.0.0-nightly.20260529). Required when docker_image is not a standard nightly tag."
18+
required: false
19+
type: string
1620

1721
concurrency:
1822
group: nightly-bench-10tps-${{ github.ref }}
@@ -24,6 +28,7 @@ jobs:
2428
outputs:
2529
docker_image: ${{ steps.docker-image.outputs.docker_image }}
2630
image_label: ${{ steps.docker-image.outputs.image_label }}
31+
source_ref: ${{ steps.docker-image.outputs.source_ref }}
2732
steps:
2833
- name: Checkout
2934
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
@@ -36,19 +41,43 @@ jobs:
3641
if [[ -n "${{ inputs.docker_image }}" ]]; then
3742
docker_image="${{ inputs.docker_image }}"
3843
image_label="${{ inputs.docker_image }}"
44+
image_tag="${docker_image##*:}"
3945
elif [[ -n "${{ inputs.nightly_tag }}" ]]; then
4046
nightly_tag="${{ inputs.nightly_tag }}"
4147
docker_image="aztecprotocol/aztec:${nightly_tag}"
4248
image_label="${nightly_tag}"
49+
image_tag="${nightly_tag}"
4350
else
4451
current_version=$(jq -r '."."' .release-please-manifest.json)
4552
nightly_tag="${current_version}-nightly.$(date -u +%Y%m%d)"
4653
docker_image="aztecprotocol/aztec:${nightly_tag}"
4754
image_label="${nightly_tag}"
55+
image_tag="${nightly_tag}"
4856
fi
57+
58+
if [[ -n "${{ inputs.source_ref }}" ]]; then
59+
source_ref="${{ inputs.source_ref }}"
60+
elif [[ "${image_tag:-}" =~ ^[0-9]+\.[0-9]+\.[0-9]+-nightly\.[0-9]{8}$ ]]; then
61+
source_ref="v${image_tag}"
62+
else
63+
echo "Could not infer git ref from docker image. Pass workflow input source_ref."
64+
exit 1
65+
fi
66+
4967
echo "docker_image=$docker_image" >> "$GITHUB_OUTPUT"
5068
echo "image_label=$image_label" >> "$GITHUB_OUTPUT"
69+
echo "source_ref=$source_ref" >> "$GITHUB_OUTPUT"
5170
echo "Using docker image: $docker_image"
71+
echo "Using source ref: $source_ref"
72+
73+
- name: Verify source git ref
74+
id: verify-source
75+
run: |
76+
set -euo pipefail
77+
source_ref="${{ steps.docker-image.outputs.source_ref }}"
78+
git fetch --depth 1 origin "refs/tags/${source_ref}:refs/tags/${source_ref}"
79+
source_sha=$(git rev-parse "${source_ref}^{}")
80+
echo "Nightly source commit: $source_sha"
5281
5382
- name: Check if Docker image exists
5483
run: |
@@ -68,19 +97,21 @@ jobs:
6897
network: bench-10tps
6998
namespace: bench-10tps
7099
aztec_docker_image: ${{ needs.select-image.outputs.docker_image }}
71-
ref: next
100+
ref: ${{ needs.select-image.outputs.source_ref }}
72101
notify_on_failure: false
73102
secrets: inherit
74103

75104
wait-for-first-l2-block:
76-
needs: deploy-bench-10tps-network
105+
needs:
106+
- select-image
107+
- deploy-bench-10tps-network
77108
runs-on: ubuntu-latest
78109
timeout-minutes: 120
79110
steps:
80111
- name: Checkout
81112
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
82113
with:
83-
ref: ${{ github.sha }}
114+
ref: ${{ needs.select-image.outputs.source_ref }}
84115

85116
- name: Authenticate to Google Cloud
86117
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f
@@ -108,7 +139,7 @@ jobs:
108139
- name: Checkout
109140
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
110141
with:
111-
ref: ${{ github.sha }}
142+
ref: ${{ needs.select-image.outputs.source_ref }}
112143

113144
- name: Run 10 TPS benchmark
114145
timeout-minutes: 240
@@ -139,7 +170,7 @@ jobs:
139170
- name: Checkout
140171
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
141172
with:
142-
ref: next
173+
ref: ${{ needs.select-image.outputs.source_ref }}
143174

144175
- name: Cleanup network resources
145176
env:
@@ -165,7 +196,7 @@ jobs:
165196
- name: Checkout
166197
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
167198
with:
168-
ref: next
199+
ref: ${{ needs.select-image.outputs.source_ref }}
169200

170201
- name: Notify Slack on failure
171202
env:

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

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
outputs:
2121
nightly_tag: ${{ steps.nightly-tag.outputs.nightly_tag }}
2222
docker_image: ${{ steps.nightly-tag.outputs.docker_image }}
23+
source_ref: ${{ steps.nightly-tag.outputs.source_ref }}
2324
steps:
2425
- name: Checkout
2526
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
@@ -36,9 +37,20 @@ jobs:
3637
nightly_tag="${current_version}-nightly.$(date -u +%Y%m%d)"
3738
fi
3839
docker_image="aztecprotocol/aztec:${nightly_tag}"
40+
source_ref="v${nightly_tag}"
3941
echo "nightly_tag=$nightly_tag" >> "$GITHUB_OUTPUT"
4042
echo "docker_image=$docker_image" >> "$GITHUB_OUTPUT"
43+
echo "source_ref=$source_ref" >> "$GITHUB_OUTPUT"
4144
echo "Using nightly tag: $nightly_tag"
45+
echo "Using source ref: $source_ref"
46+
47+
- name: Verify source git ref
48+
run: |
49+
set -euo pipefail
50+
source_ref="${{ steps.nightly-tag.outputs.source_ref }}"
51+
git fetch --depth 1 origin "refs/tags/${source_ref}:refs/tags/${source_ref}"
52+
source_sha=$(git rev-parse "${source_ref}^{}")
53+
echo "Nightly source commit: $source_sha"
4254
4355
- name: Check if Docker image exists
4456
run: |
@@ -61,19 +73,21 @@ jobs:
6173
network: tps-scenario
6274
namespace: nightly-bench
6375
aztec_docker_image: ${{ needs.select-image.outputs.docker_image }}
64-
ref: next
76+
ref: ${{ needs.select-image.outputs.source_ref }}
6577
notify_on_failure: false
6678
secrets: inherit
6779

6880
wait-bench-l2-block:
69-
needs: deploy-bench-network
81+
needs:
82+
- select-image
83+
- deploy-bench-network
7084
runs-on: ubuntu-latest
7185
timeout-minutes: 120
7286
steps:
7387
- name: Checkout
7488
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
7589
with:
76-
ref: next
90+
ref: ${{ needs.select-image.outputs.source_ref }}
7791

7892
- name: Authenticate to Google Cloud
7993
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f
@@ -102,7 +116,7 @@ jobs:
102116
- name: Checkout
103117
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
104118
with:
105-
ref: next
119+
ref: ${{ needs.select-image.outputs.source_ref }}
106120

107121
- name: Run benchmarks
108122
timeout-minutes: 240
@@ -152,6 +166,7 @@ jobs:
152166
cleanup-bench:
153167
if: always()
154168
needs:
169+
- select-image
155170
- deploy-bench-network
156171
- wait-bench-l2-block
157172
- benchmark
@@ -160,7 +175,7 @@ jobs:
160175
- name: Checkout
161176
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
162177
with:
163-
ref: next
178+
ref: ${{ needs.select-image.outputs.source_ref }}
164179

165180
- name: Cleanup network resources
166181
env:
@@ -186,7 +201,7 @@ jobs:
186201
- name: Checkout
187202
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
188203
with:
189-
ref: next
204+
ref: ${{ needs.select-image.outputs.source_ref }}
190205

191206
- name: Notify Slack and dispatch ClaudeBox on failure
192207
env:
@@ -210,19 +225,21 @@ jobs:
210225
network: prove-n-tps-fake
211226
namespace: prove-n-tps-fake
212227
aztec_docker_image: ${{ needs.select-image.outputs.docker_image }}
213-
ref: next
228+
ref: ${{ needs.select-image.outputs.source_ref }}
214229
notify_on_failure: false
215230
secrets: inherit
216231

217232
wait-proving-l2-block:
218-
needs: deploy-proving-network
233+
needs:
234+
- select-image
235+
- deploy-proving-network
219236
runs-on: ubuntu-latest
220237
timeout-minutes: 120
221238
steps:
222239
- name: Checkout
223240
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
224241
with:
225-
ref: next
242+
ref: ${{ needs.select-image.outputs.source_ref }}
226243

227244
- name: Authenticate to Google Cloud
228245
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f
@@ -251,7 +268,7 @@ jobs:
251268
- name: Checkout
252269
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
253270
with:
254-
ref: next
271+
ref: ${{ needs.select-image.outputs.source_ref }}
255272

256273
- name: Run proving benchmarks
257274
timeout-minutes: 180
@@ -299,6 +316,7 @@ jobs:
299316
cleanup-proving:
300317
if: always()
301318
needs:
319+
- select-image
302320
- deploy-proving-network
303321
- wait-proving-l2-block
304322
- proving-benchmark
@@ -307,7 +325,7 @@ jobs:
307325
- name: Checkout
308326
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
309327
with:
310-
ref: next
328+
ref: ${{ needs.select-image.outputs.source_ref }}
311329

312330
- name: Cleanup network resources
313331
env:
@@ -333,7 +351,7 @@ jobs:
333351
- name: Checkout
334352
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
335353
with:
336-
ref: next
354+
ref: ${{ needs.select-image.outputs.source_ref }}
337355

338356
- name: Notify Slack and dispatch ClaudeBox on failure
339357
env:
@@ -357,19 +375,21 @@ jobs:
357375
network: block-capacity
358376
namespace: nightly-block-capacity
359377
aztec_docker_image: ${{ needs.select-image.outputs.docker_image }}
360-
ref: next
378+
ref: ${{ needs.select-image.outputs.source_ref }}
361379
notify_on_failure: false
362380
secrets: inherit
363381

364382
wait-block-capacity-l2-block:
365-
needs: deploy-block-capacity-network
383+
needs:
384+
- select-image
385+
- deploy-block-capacity-network
366386
runs-on: ubuntu-latest
367387
timeout-minutes: 120
368388
steps:
369389
- name: Checkout
370390
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
371391
with:
372-
ref: next
392+
ref: ${{ needs.select-image.outputs.source_ref }}
373393

374394
- name: Authenticate to Google Cloud
375395
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f
@@ -398,7 +418,7 @@ jobs:
398418
- name: Checkout
399419
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
400420
with:
401-
ref: next
421+
ref: ${{ needs.select-image.outputs.source_ref }}
402422

403423
- name: Run block capacity benchmarks
404424
timeout-minutes: 240
@@ -447,6 +467,7 @@ jobs:
447467
cleanup-block-capacity:
448468
if: always()
449469
needs:
470+
- select-image
450471
- deploy-block-capacity-network
451472
- wait-block-capacity-l2-block
452473
- block-capacity-benchmark
@@ -455,7 +476,7 @@ jobs:
455476
- name: Checkout
456477
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
457478
with:
458-
ref: next
479+
ref: ${{ needs.select-image.outputs.source_ref }}
459480

460481
- name: Cleanup network resources
461482
env:
@@ -481,7 +502,7 @@ jobs:
481502
- name: Checkout
482503
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
483504
with:
484-
ref: next
505+
ref: ${{ needs.select-image.outputs.source_ref }}
485506

486507
- name: Notify Slack and dispatch ClaudeBox on failure
487508
env:

0 commit comments

Comments
 (0)