Skip to content

chore: merge v4 into backport-to-v4-staging#21618

Merged
alexghr merged 3 commits intobackport-to-v4-stagingfrom
claudebox/merge-v4-into-backport-staging
Mar 16, 2026
Merged

chore: merge v4 into backport-to-v4-staging#21618
alexghr merged 3 commits intobackport-to-v4-stagingfrom
claudebox/merge-v4-into-backport-staging

Conversation

@AztecBot
Copy link
Collaborator

Summary

  • Fast-forward merge of 51 commits from v4 into backport-to-v4-staging
  • No conflicts — clean fast-forward merge
  • 214 files changed across archiver, p2p, sequencer, prover, stdlib, spartan, and more

ClaudeBox log: https://claudebox.work/s/4542813f964f2419?run=1

AztecBot and others added 2 commits March 14, 2026 03:14
BEGIN_COMMIT_OVERRIDE
fix: orchestrator enqueue yield (#21286)
chore: default multiplier (#21482)
chore: update yarn.lock (#21479)
chore: backport #21231 feat!: improve L2ToL1MessageWitness API to v4
(#21463)
feat(rpc): add package version to RPC response headers (#21526)
feat(ethereum): check VK tree root and protocol contracts hash in rollup
compatibility (#21537)
feat: add public log filtering by tag (#21561)
END_COMMIT_OVERRIDE
…ints (#21597)

## Summary

- Updates the finalized block heuristic from `epochDuration * 2` to
`epochDuration * 2 * 4` to subtract checkpoints (assumed 4 blocks each)
instead of blocks.
- The proper fix is in #21156 which replaces this heuristic with L1
finality.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@AztecBot AztecBot added the claudebox Owned by claudebox. it can push to this PR. label Mar 16, 2026
@alexghr alexghr marked this pull request as ready for review March 16, 2026 17:48
@alexghr alexghr enabled auto-merge (squash) March 16, 2026 17:52
@alexghr alexghr merged commit ecc6cdc into backport-to-v4-staging Mar 16, 2026
11 of 12 checks passed
@alexghr alexghr deleted the claudebox/merge-v4-into-backport-staging branch March 16, 2026 18:18
alexghr added a commit that referenced this pull request Mar 17, 2026
BEGIN_COMMIT_OVERRIDE
fix(aztec-nr): return Option from decode functions and fix event
commitment capacity (backport #21264) (#21360)
fix: backport #21271 — handle bad note lengths on
compute_note_hash_and_nullifier (#21364)
fix: not reusing tags of partially reverted txs (#20817)
chore: revert accidental backport of #20817 (#21583)
feat: Implement commit all and revert all for world state checkpoints
(#21532)
cherry-pick: fix: dependabot alerts (#21531)
fix: dependabot alerts (backport #21531 to v4) (#21592)
fix: backport #21443 — Don't update state if we failed to execute
sufficient transactions (v4) (#21610)
chore: Fix msgpack serialisation (#21612)
fix(p2p): fall back to maxTxsPerCheckpoint for per-block tx validation
(#21605)
chore: merge v4 into backport-to-v4-staging (#21618)
fix(revert): avm sim uses event loop again (#21138) (#21630)
fix(e2e): remove historic/finalized block checks from epochs_multiple
test (#21642)
fix: clamp finalized block to oldest available in world-state (#21643)
fix: skip handleChainFinalized when block is behind oldest available
(#21656)
chore: demote finalized block skip log to trace (#21661)
fix: off-by-1 in getBlockHashMembershipWitness archive snapshot
(backport #21648) (#21663)
fix: capture txs not available error reason in proposal handler (#21670)
chore: add L1 inclusion time to stg public (#21665)
END_COMMIT_OVERRIDE

---------

Co-authored-by: Jan Beneš <janbenes1234@gmail.com>
Co-authored-by: PhilWindle <60546371+PhilWindle@users.noreply.github.com>
Co-authored-by: Phil Windle <philip.windle@gmail.com>
Co-authored-by: Santiago Palladino <santiago@aztecprotocol.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: ludamad <adam.domurad@gmail.com>
Co-authored-by: Alex Gherghisan <alexghr@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

claudebox Owned by claudebox. it can push to this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants