Skip to content

Commit 92da992

Browse files
authored
feat: merge-train/spartan (#23580)
BEGIN_COMMIT_OVERRIDE fix(archiver): skip descendants of invalid-attestations checkpoints (#23502) chore: scale network validators (#23579) fix(ci): nightly 10 TPS bench GCP auth and checkout (#23586) chore: set eth node resource profile (#23583) fix: wait for checkpoint before sentinel assertions (#23573) fix: slash attestations for invalid checkpoint proposals (#23506) test: fix web3signer pipelining `e2e_multi_validator_node_key_store.test.ts` (#23568) fix: cap CI devbox hostname (#23591) test: stabilize invalid checkpoint descendant e2e (#23582) test(e2e): stabilize invalidation slots in `proposer invalidates multiple checkpoints` (#23590) test(e2e): stabilize invalid proposal slashing target slot in `attested_invalid_proposal` (#23589) chore(foundation): faster toBufferBE via zero fast-path (#23592) fix: honour BB_BINARY_PATH (#23570) chore: bump reth and lighthouse (#23588) chore: add web3signer and postgres node selectors (#23598) fix: do not symlink .codex folders (#23593) chore: fix claude and codex symlinking tests (#23599) test(e2e): narrow down sentinel check in `multiple_validators_sentinel` (#23604) test(e2e): fix `proposer invalidates multiple checkpoints` timeout (#23608) fix: record zero-amount slashing offenses (#23556) fix: log slashing offense names (#23565) feat(p2p): tx validation cache (#23585) chore: add KEDA deployment module (#23553) chore: add KEDA prover agent autoscaling (#23554) chore: update destroy_bootnode.sh (#23626) chore: skip failing chonk_pinned_inputs.test in CI (#23643) chore(ci): tolerate public authwit P2P receipt flake (#23648) END_COMMIT_OVERRIDE
2 parents d6d968b + 47d5eb9 commit 92da992

116 files changed

Lines changed: 3303 additions & 1009 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.

.claude/bootstrap.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
# `test`. Keeps hook scripts and their tests as a self-contained component.
55
source $(git rev-parse --show-toplevel)/ci3/source_bootstrap
66

7-
hash=$(cache_content_hash ^.claude)
7+
# Hash everything agents_symlink_test inspects, not just .claude/: the .codex mirrors and the root
8+
# AGENTS.md/CLAUDE.md symlinks live outside .claude/, so a change there must still rerun the test.
9+
hash=$(cache_content_hash "^.*.claude" "^.*.codex" "^AGENTS.md" "^CLAUDE.md")
810

911
function test_cmds {
1012
# source_base cd's us into .claude/, so glob relative-to-here, but emit paths

.claude/tests/agents_symlink_test

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,43 @@ while IFS= read -r dir; do
8282
"$ROOT"/noir/noir-repo/*) continue;;
8383
esac
8484
codex="$(dirname "$dir")/.codex"
85-
if [[ ! -L "$codex" ]]; then
86-
fail "${codex#$ROOT/} is missing or is not a symlink to .claude"
85+
rel=${codex#$ROOT/}
86+
# A .codex may either be a symlink to its sibling .claude (the repo root keeps this form), or a
87+
# real directory whose immediate children symlink into .claude (the per-package form, required
88+
# because a sandbox cannot bind-mount a path that is itself a symlink). Either way Codex must see
89+
# exactly the same contents as .claude.
90+
if [[ -L "$codex" ]]; then
91+
resolved=$(cd "$(dirname "$codex")" && cd "$(readlink "$codex")" 2>/dev/null && pwd -P) || resolved=""
92+
claude_resolved=$(cd "$dir" && pwd -P)
93+
if [[ "$resolved" != "$claude_resolved" ]]; then
94+
fail "$rel is a symlink to ${resolved:-?}, expected its sibling .claude ($claude_resolved)"
95+
else
96+
pass "$rel -> .claude"
97+
fi
8798
continue
8899
fi
89-
resolved=$(cd "$(dirname "$codex")" && cd "$(readlink "$codex")" 2>/dev/null && pwd -P) || resolved=""
90-
claude_resolved=$(cd "$dir" && pwd -P)
91-
if [[ "$resolved" != "$claude_resolved" ]]; then
92-
fail "${codex#$ROOT/} resolves to $resolved, expected $claude_resolved"
100+
if [[ ! -d "$codex" ]]; then
101+
fail "$rel is missing (expected a directory mirroring .claude via child symlinks)"
93102
continue
94103
fi
95-
pass "${codex#$ROOT/}"
104+
codex_ok=1
105+
# Forward: every entry in .claude must have a matching symlink in .codex.
106+
while IFS= read -r child; do
107+
name=$(basename "$child")
108+
if [[ ! -L "$codex/$name" || ! "$codex/$name" -ef "$child" ]]; then
109+
fail "$rel/$name should be a symlink to ../.claude/$name"
110+
codex_ok=0
111+
fi
112+
done < <(find "$dir" -mindepth 1 -maxdepth 1)
113+
# Reverse: every entry in .codex must correspond to a .claude entry (no stale or dangling links).
114+
while IFS= read -r entry; do
115+
name=$(basename "$entry")
116+
if [[ ! -e "$dir/$name" && ! -L "$dir/$name" ]]; then
117+
fail "$rel/$name is stale; no matching .claude/$name"
118+
codex_ok=0
119+
fi
120+
done < <(find "$codex" -mindepth 1 -maxdepth 1)
121+
(( codex_ok )) && pass "$rel"
96122
done < <(find "$ROOT" -type d -name .claude -not -path "$ROOT/noir/*" -not -path "$ROOT/**/node_modules/*")
97123

98124
echo

.github/workflows/deploy-network.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ jobs:
111111
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
112112
with:
113113
ref: ${{ steps.checkout-ref.outputs.ref }}
114-
fetch-depth: 1
114+
# Full history so recursive submodules can checkout pinned commits (not only branch tips).
115+
fetch-depth: 0
116+
lfs: true
115117
persist-credentials: false
116118
submodules: recursive # Initialize git submodules for l1-contracts dependencies
117119

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
- name: Checkout
8181
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
8282
with:
83-
ref: next
83+
ref: ${{ github.sha }}
8484

8585
- name: Authenticate to Google Cloud
8686
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f
@@ -108,7 +108,7 @@ jobs:
108108
- name: Checkout
109109
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
110110
with:
111-
ref: next
111+
ref: ${{ github.sha }}
112112

113113
- name: Run 10 TPS benchmark
114114
timeout-minutes: 240

.github/workflows/weekly-proving-bench.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- name: Checkout
7272
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
7373
with:
74-
ref: next
74+
ref: ${{ github.sha }}
7575

7676
- name: Authenticate to Google Cloud
7777
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f

.test_patterns.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,13 @@ tests:
9191
owners:
9292
- *nico
9393

94+
# Fails in CI: "No execution steps in ivc-inputs.msgpack" — pinned Chonk IVC
95+
# inputs missing/stale. http://ci.aztec-labs.com/d7647a841ee811a0
96+
- regex: "bbapi/chonk_pinned_inputs.test"
97+
skip: true
98+
owners:
99+
- *palla
100+
94101
# e2e tests skipped
95102
- regex: "testbench/port_change.test.ts"
96103
skip: true
@@ -342,6 +349,15 @@ tests:
342349
owners:
343350
- *adam
344351

352+
# http://ci.aztec-labs.com/93754bdf832ef9bd
353+
# P2P receipt race in the compose CLI-wallet flow: the account deployment tx
354+
# can be reported as dropped after the 5s grace window before inclusion is
355+
# visible to the queried node.
356+
- regex: "yarn-project/end-to-end/scripts/run_test.sh compose ../cli-wallet/test/flows/public_authwit_transfer.sh"
357+
error_regex: "Transaction .* was dropped\\. Reason: Tx dropped by P2P node"
358+
owners:
359+
- *palla
360+
345361
- regex: "cd l1-contracts && forge test"
346362
error_regex: "Encountered 1 failing test in test/staking_asset_handler/claim.t.sol:ClaimTest"
347363
owners:
@@ -379,20 +395,6 @@ tests:
379395
owners:
380396
- *spyros
381397

382-
# Multi-validator web3signer suite is unstable under proposer pipelining:
383-
# two distinct failure modes have been seen in the same "should build blocks
384-
# & attest with multiple validator keys" case — Promise.all index-0
385-
# waitForTx aborting with "Tx dropped by P2P node"
386-
# (ci.aztec-labs.com/9a5fa90aa18f62e7), and the proposer missing the slot's
387-
# 5-attestation deadline ("AttestationTimeoutError" / "Block .* not found .*
388-
# reorg") on PR #23344 run 26370196367 (ci.aztec-labs.com/b91d3218b5e88ae4).
389-
# Error-regex flake matches still let ci3 retry-and-fail both attempts. Skip
390-
# outright on merge-train/spartan until proposer pipelining stabilises.
391-
- regex: "yarn-project/end-to-end/scripts/run_test.sh web3signer src/composed/web3signer/e2e_multi_validator_node_key_store.test.ts"
392-
skip: true
393-
owners:
394-
- *palla
395-
396398
# http://ci.aztec-labs.com/98d59d04f85223f8
397399
# Build-cache flake: module not found during Jest startup
398400
- regex: "src/e2e_sequencer/gov_proposal.parallel.test.ts"

barretenberg/.codex

Lines changed: 0 additions & 1 deletion
This file was deleted.

barretenberg/.codex/agents

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.claude/agents

barretenberg/.codex/skills

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.claude/skills

barretenberg/cpp/.codex

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)