chore: merge v4-next into backport-to-v4-next-staging#21645
Merged
benesjan merged 21 commits intoMar 17, 2026
Merged
Conversation
…20932) Backports two fixes from `next` that enable the AVM transpiler for `linux/arm64` release builds, resolving [#20793](#20793) — `aztec compile` fails with "AVM Transpiler is not enabled" on `linux/arm64`. **Cherry-picked from:** - #20814 — added `arm64-linux` cross-compile to `avm-transpiler/bootstrap.sh` + wired `AVM_TRANSPILER_LIB` in `CMakePresets.json` - #20932 — fixed Makefile dependency (`bb-cpp-cross-arm64-linux` was depending on `avm-transpiler-native` instead of `avm-transpiler-cross-arm64-linux`), plus `barretenberg-rs` release fix **Root cause:** The `zig-arm64-linux` CMake preset was missing `AVM_TRANSPILER_LIB`, and `avm-transpiler/bootstrap.sh` had no `arm64-linux` case in `build_cross`. The arm64-linux bb binary was compiled without `ENABLE_AVM_TRANSPILER`. **Changes:** - `avm-transpiler/bootstrap.sh` — add `arm64-linux` case to `build_cross` - `barretenberg/cpp/CMakePresets.json` — wire `AVM_TRANSPILER_LIB` for `zig-arm64-linux` preset - `Makefile` — add `avm-transpiler-cross-arm64-linux` target, fix `bb-cpp-cross-arm64-linux` dependency - `barretenberg/rust/bootstrap.sh` — add `release` function with on-the-fly binding generation - `barretenberg/ts/scripts/copy_cross.sh` — relax arch check for release context **Conflict resolution:** `barretenberg/rust/bootstrap.sh` had a minor conflict — the `release` function didn't exist on v4. Resolved by accepting the full function. - [x] Native avm-transpiler build succeeds - [x] Makefile targets verified: `avm-transpiler-cross-arm64-linux`, `bb-cpp-cross-arm64-linux` dependency corrected - [x] CMake preset verified: `zig-arm64-linux` has `AVM_TRANSPILER_LIB` pointing to correct cross-compiled path - [ ] Full cross-compilation validated in release CI Closes #20793 ClaudeBox log: http://ci.aztec-labs.com/596d4a62f30fd2f0-2
Fixes the orchestrator limiting the number of in-progress jobs, now it only limits the actual enqueuing operation and gives the event loop more room to breath. Either this PR must be backported or the previous PR #21247 must be removed the from the backport train.
## Summary - Lower `SLASH_INACTIVITY_TARGET_PERCENTAGE` from 0.8 to 0.7 - Disable `SLASH_DUPLICATE_PROPOSAL_PENALTY` and `SLASH_DUPLICATE_ATTESTATION_PENALTY` (set to 0) - Increase `SLASH_GRACE_PERIOD_L2_SLOTS` from 1200 to 8400 - Reduce `perBlockAllocationMultiplier` from 2 to 1.2 ## Test plan - Verify generated config files are updated after running `yarn generate` in relevant packages - Deploy to devnet/testnet and confirm slasher behavior matches new parameters --------- Co-authored-by: Aztec Bot <49558828+AztecBot@users.noreply.github.com>
This PR was created because merging `v4` into `v4-next` resulted in conflicts. Please resolve the conflicts and merge this PR to keep `v4-next` up to date. This PR was auto-generated by the `pull-v4-into-v4-next` workflow.
…21463) ## Summary Backport of #21231 to `v4`. Cherry-pick of merge commit `a8b2277a50` with two conflicts resolved: - `docs/docs-developers/docs/resources/migration_notes.md` — accepted incoming migration notes entries - `yarn-project/archiver/src/store/block_store.ts` — included `getEpochAtSlot` import ### Commit structure 1. **Cherry-pick commit** — raw cherry-pick with conflict markers preserved for review 2. **Conflict resolution commit** — resolved the two conflicts above No additional build fixes were needed — the code compiles cleanly on v4. ClaudeBox log: https://claudebox.work/s/8bd8c8724c80cbb2?run=1
## Motivation
The JSON-RPC server already returns `x-aztec-*` headers for protocol
component versions (chain id, rollup address, etc.), but does not
include the node's package version. This makes it harder to identify
which software version a node is running when debugging or monitoring.
## Approach
Extended `getVersioningMiddleware` to accept an optional
`packageVersion` parameter and emit it as an `x-aztec-packageVersion`
response header alongside existing versioning headers.
## Example
```
$ curl -s -D- http://localhost:8090 -H 'content-type: application/json' -d '[{"jsonrpc":"2.0","id":1,"method":"node_getNodeVersion","params":[]}]'
HTTP/1.1 200 OK
Vary: Accept-Encoding, Origin
Access-Control-Allow-Origin: *
Content-Type: application/json; charset=utf-8
x-aztec-l2CircuitsVkTreeRoot: 0x06624799e2080c43aba671cdece34d5f4cdff2122bc6be41d80bd903ca0975cc
x-aztec-l2ProtocolContractsHash: 0x23c2022f0b69b29e354b4f7612d5db3ba0bc4259d71ac9186ed272945a644b9c
x-aztec-packageVersion: 5.0.0
Content-Length: 43
Date: Fri, 13 Mar 2026 16:04:31 GMT
Connection: keep-alive
Keep-Alive: timeout=5
[{"jsonrpc":"2.0","id":1,"result":"5.0.0"}]
```
## Changes
- **stdlib**: Updated `getVersioningMiddleware` to accept an optional
`opts` bag with `packageVersion`, setting `x-aztec-packageVersion`
header when provided
- **aztec**: Wired `getPackageVersion()` into both the main and admin
RPC server middleware calls
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
…lup compatibility (#21537) ## Summary - Adds `getVkTreeRoot()` and `getProtocolContractsHash()` methods to `RollupContract` that read immutable config from L1 storage slots (stfStorageSlot + 3 and + 4) - Extends `waitForCompatibleRollup` to verify all three values (genesis archive root, VK tree root, protocol contracts hash) before allowing the node to proceed - Prevents nodes from starting against a rollup deployed with incompatible circuits or protocol contracts ## Test plan - Added unit tests for `getVkTreeRoot` and `getProtocolContractsHash` in `rollup.test.ts` that verify storage slot arithmetic against values set during deployment - Existing `waitForCompatibleRollup` behavior preserved: enters standby mode on mismatch, polls until compatible rollup found
Reimplementation of #21471. I did the filtering in-memory as explained there due to lack of indices. Additionally I fixed a bug in which certain index tuples were ignored - e.g. if `afterLog` and `txHash` were both specified, `txHash` was ignored. --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
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>
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) 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>
benesjan
requested review from
a team,
dbanks12,
fcarreiro,
nventuro and
sirasistant
as code owners
benesjan
changed the title
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
benesjan
requested review from
ludamad
and removed request for
dbanks12,
nventuro and
sirasistant
Thunkar
approved these changes
Mar 17, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There were conflicts between
backport-to-v4-next-stagingandv4-next. Since they were in the scope of fairies I decided to go ahead and resolve them. I guess the conflict was a result of stuff getting merged tov4that then got auto cherry picked tov4-nextwhile there were already more changes merged tobackport-to-v4-next-staging. These changes then likely caused the conflicts.I didn't have the permissions to directly push to
backport-to-v4-next-stagingso I created this PR.