chore: merge v4-next into backport staging (fix ancestry)#21954
Merged
ludamad merged 7 commits intoMar 24, 2026
Conversation
## Summary Merges v4 into v4-next, resolving the conflict in `getBlockHashMembershipWitness` in `server.ts`. The conflict was between v4-next's simple passthrough to `getWorldState(referenceBlock)` and v4's off-by-one bugfix that uses `getWorldState(BlockNumber(referenceBlockNumber - 1))`. The v4 fix is correct: the Noir circuit checks the archive membership proof against `anchor_block_header.last_archive.root`, which is the archive tree root BEFORE the anchor block was added, so we need the world state at block N-1. Resolution: took the v4 bugfix, adapted to use v4-next's `getWorldState` (protected) instead of v4's `#getWorldState` (private). Replaces #21493 which had stale conflict markers. ClaudeBox log: https://claudebox.work/s/d4b96d5b355d7fba?run=1 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>
## Summary Merges latest `v4` (`bb3ea6f1`) into `v4-next` with a proper **merge commit** to preserve the merge topology. This fixes the issue where PR #21702 was squash-merged, causing git to lose track of which v4 commits were already in v4-next. ## Commits 1. **Merge commit with conflict markers** — raw `git merge origin/v4` showing the conflicts 2. **Fix server.ts** — resolve `getWorldState` vs `#getWorldState` conflict (use protected version), remove duplicate `resolveBlockNumber` method 3. **Fix deploy_network.sh** — resolve pre-existing conflict from old merge (keep default multiplier of 2) ## Important **This PR must be merged with a merge commit (not squashed)** to preserve the v4→v4-next merge topology. Add the `ci-no-squash` label. Without the merge commit, future auto-merges will re-encounter the same conflicts. ClaudeBox log: https://claudebox.work/s/3402fef75fe1ebde?run=4 --------- 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> Co-authored-by: spypsy <spypsy@users.noreply.github.com>
## Summary - Bump `.release-please-manifest.json` from `4.1.0` to `4.2.0` in preparation for the next release cycle.
BEGIN_COMMIT_OVERRIDE feat: entrypoint replay protection (#21649) feat: guard BoundedVec oracle returns against dirty trailing storage (#21589) fix: add bounds when allocating arrays in deserialization (#21622) feat: implement manual Packable for structs with sub-Field members (#21576) fix(aztec-node): throw on existing nullifier in getLowNullifierMembershipWitness (#21472) fix: use trait dispatch for array Packable::unpack in card_game_contract (#21683) fix(p2p): penalize peers for errors during response reading (#21680) fix: update nullifier non-inclusion test expectations after early oracle throw (backport #21600) (#21615) fix(aztec-nr): fix OOB index with nonzero offset (#21613) fix(builder): persist contractsDB across blocks within a checkpoint (#21520) fix(stdlib): accept null return_type for void Noir functions (#21647) feat: gas estimations on send (#21646) fix(validator): process block proposals from own validator keys in HA setups (backport #21603) (#21659) fix(p2p): penalize peer on tx rejected by pool (#21677) fix(sequencer): fix checkpoint budget redistribution for multi-block slots (#21692) feat: sync cache invalidation oracle (backport #21459) (#21730) feat!: make AES128 decrypt oracle return Option (backport #21696) (#21735) feat!: include init_hash in private initialization nullifier (backport #21427) (#21736) fix(sequencer): extract gas and blob configs from valid requests only (A-677) (#21747) chore: backport #21744 — replace dead BOOTSTRAP_TO env var with bootstrap.sh build arg (#21748) refactor: revert remove assert_bounded_vec_trimmed (#21758) END_COMMIT_OVERRIDE
BEGIN_COMMIT_OVERRIDE chore: backport #21754 (feat!: make isContractInitialized a tri-state enum) to v4-next (#21792) fix(stdlib): zero-pad bufferFromFields when declared length exceeds payload (#21802) test(protocol-contracts): verify max-size bytecode fits in contract class log (#21818) chore: port P2P mesh topic deflake fix to v4-next (#21825) fix(archiver): throw on duplicate contract class or instance additions (#21799) feat: sync poseidon in the browser (#21833) chore: backport #21824 (fix(aztec-up): add sensible defaults to installer y/n prompts) to v4-next (#21844) fix(sequencer): backport wall-clock time for slot estimation to v4-next (#21769) (#21847) chore: backport PR #21788 (feat(p2p): add tx validation for contract class id verification) to v4-next (#21852) feat: sync poseidon browser (#21851) END_COMMIT_OVERRIDE
…nto-staging # Conflicts: # yarn-project/aztec-node/src/aztec-node/server.ts
AztecBot
added
ci-draft
AztecBot
added a commit
that referenced
this pull request
Mar 25, 2026
BEGIN_COMMIT_OVERRIDE fix(aztec-up): narrow PATH cleanup regex to avoid removing user PATH entries (#21828) fix: consolidate blob source test into single summary log with supernode detection (#21719) fix: use anchor block on getL1ToL2MsgWitness (#21872) fix: make sure queries are not made ahead of the anchor block (#21874) chore(docs): backport docs infrastructure changes to v4 (#21437) chore: backport PR #21836 (fix: explicitly handle initial block case for getBlockHashMembershipWitness) to v4-next (#21891) chore: backport PR #21813 (fix(aztec-up): strip leading v prefix from version strings) to v4-next (#21912) docs: document defi-wonderland immutable macro (#21764) fix: pin typescript and harden lockfile check in docs examples CI (v4 backport) (#21914) docs: expand circuit profiling guide and document kernel gate cost overhead (#21770) feat: cli-wallet (#21757) chore: sync backport staging with v4-next HEAD (#21931) fix: bot gas estimations (backport #21945) (#21947) refactor(aztec-nr): use logging wrappers in compute_note_hash_and_nullifier (#21897) fix: backport v4 next staging (#21934) fix: make PXE#getSyncedBlockHeader a concurrency=1 job to prevent IDB tx liveness issues (#21944) feat: add error page mapping for incompatible oracles (#21943) fix(aztec-up): validate semver in uninstall to prevent path traversal (#21892) chore: merge v4-next into backport staging (fix ancestry) (#21954) fix(aztec-up): add truncation protection to install scripts (#21896) fix: noir format in compute_note_hash_and_nullifier.nr (#21956) fix(stdlib): decode `EthAddress`, `FunctionSelector` and wrapped field structs in `AbiDecoder` (#21926) chore: update noir to nightly-2026-02-12-patch.1 (#21960) fix: ensure empty docs examples does not populate yarn lock backport (#21963) fix: docs examples does not build on simple bootstrap backport (#21964) fix: add rc/testnet version detection to API reference pages (#21966) docs: document EmbeddedWallet automatic gas estimation and private authwits (#21790) fix(pxe): robust error handling in message processing (backport #21093) (#21981) chore: manually recreate backport (#21969) chore: (A-779) load all accounts before calling LogService.#getSecretsForSenders (#21923) END_COMMIT_OVERRIDE
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
4 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.
Summary
Performs a true merge of
v4-nextintobackport-to-v4-next-stagingto fix the broken accumulated backports PR #21899.Root cause: PR #21934 was squash-merged, so the v4-next commits it included were not git ancestors of staging. Git still saw full divergence from the March 20 merge base, producing a 770k-line inflated diff on #21899.
This PR: Does a real merge commit (2 parents) so v4-next becomes an ancestor of staging. The merge base advances to v4-next HEAD, and the diff on #21899 will collapse to only the actual backport changes.
Conflict resolution: Single conflict in
server.ts— kept the block-0 early-return guard from the #21836 backport (staging side) since v4-next doesn't have this fix.IMPORTANT: This PR must be merge-committed, NOT squash-merged. Squashing would recreate the exact same problem.
ClaudeBox log: https://claudebox.work/s/ed2e5696ee72129c?run=4