fix: explicitly handle initial block case for getBlockHashMembershipWitness#21836
Merged
Conversation
nchamo
approved these changes
Mar 20, 2026
Co-authored-by: Nicolas Chamo <nicolas@chamo.com.ar>
Co-authored-by: Nicolas Chamo <nicolas@chamo.com.ar>
Co-authored-by: Nicolas Chamo <nicolas@chamo.com.ar>
Contributor
|
Let's backport to v4-next, no more changes to v4 unless critical |
Contributor
Author
|
Yeah sorry, I meant v4-next. v4 is no-go territory for me 😅
…On Fri, 20 Mar 2026 at 1:04 PM Santiago Palladino ***@***.***> wrote:
*spalladino* left a comment (AztecProtocol/aztec-packages#21836)
<#21836 (comment)>
Let's backport to v4-next, no more changes to v4 unless critical
—
Reply to this email directly, view it on GitHub
<#21836?email_source=notifications&email_token=AAE7DLOIFPHOWW4A6OSVFN34RUXTHA5CNFSNUABFM5UWIORPF5TWS5BNNB2WEL2JONZXKZKDN5WW2ZLOOQXTIMBZG42TKMBVHE22M4TFMFZW63VGMF2XI2DPOKSWK5TFNZ2KYZTPN52GK4S7MNWGSY3L#issuecomment-4097550595>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAE7DLPQJKVJWINXD2OUHGD4RUXTHAVCNFSM6AAAAACWY7KIMWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHM2DAOJXGU2TANJZGU>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Collaborator
|
❌ Failed to cherry-pick to |
AztecBot
pushed a commit
that referenced
this pull request
Mar 23, 2026
mverzilli
added a commit
that referenced
this pull request
Mar 23, 2026
…for getBlockHashMembershipWitness) to v4-next (#21891) ## Summary Backport of #21836 to v4-next. Cherry-pick of f8b6239 onto `backport-to-v4-next-staging` with conflict resolution. **Conflict:** `server.ts` had a conflict because v4-next doesn't have the `resolveBlockNumber` method or the `N-1` world state lookup refactor from `next`. Adapted the fix to check for block 0 using both `BlockNumber.ZERO` and initial block hash comparison, keeping the v4-next `getWorldState(referenceBlock)` pattern. **Original PR description:** Explicitly handles the initial block (block 0) case in `getBlockHashMembershipWitness`. Block 0 has an empty archive, so no membership witness can exist. ## Changes - `yarn-project/aztec-node/src/aztec-node/server.ts`: Early return `undefined` when reference block is block 0 (by number or hash) - `yarn-project/aztec-node/src/aztec-node/server.test.ts`: Added test for the initial block case ## Commits (3-commit backport structure) 1. Cherry-pick with conflict markers 2. Conflict resolution (adapted for v4-next) 3. Test comment adaptation --------- Co-authored-by: Martin Verzilli <martin@aztec-labs.com>
AztecBot
added a commit
that referenced
this pull request
Mar 24, 2026
…for getBlockHashMembershipWitness) to v4-next (#21891) Backport of #21836 to v4-next. Cherry-pick of f8b6239 onto `backport-to-v4-next-staging` with conflict resolution. **Conflict:** `server.ts` had a conflict because v4-next doesn't have the `resolveBlockNumber` method or the `N-1` world state lookup refactor from `next`. Adapted the fix to check for block 0 using both `BlockNumber.ZERO` and initial block hash comparison, keeping the v4-next `getWorldState(referenceBlock)` pattern. **Original PR description:** Explicitly handles the initial block (block 0) case in `getBlockHashMembershipWitness`. Block 0 has an empty archive, so no membership witness can exist. - `yarn-project/aztec-node/src/aztec-node/server.ts`: Early return `undefined` when reference block is block 0 (by number or hash) - `yarn-project/aztec-node/src/aztec-node/server.test.ts`: Added test for the initial block case 1. Cherry-pick with conflict markers 2. Conflict resolution (adapted for v4-next) 3. Test comment adaptation --------- Co-authored-by: Martin Verzilli <martin@aztec-labs.com>
This was referenced Mar 24, 2026
Thunkar
pushed a commit
that referenced
this pull request
Mar 24, 2026
## Summary Merges `v4-next` into `backport-to-v4-next-staging` to bring the staging branch up to date. The staging branch was 6 commits behind v4-next (3 previous accumulated backport merges, 2 v4 merge commits, 1 version bump) because it was never rebased after PR #21819 was merged. This caused PR #21899 to show a massive 2932-file / 770K-addition diff and become unmergeable. After merging this PR into staging, close PR #21899 — its diff against v4-next will be clean. ## Conflict Resolution (server.ts) In `getBlockHashMembershipWitness`, both sides modified the same function: - **Staging** (from #21836): Added block-0 / initial-block-hash early return guard - **v4-next** (from #21819): Added N-1 block number adjustment for archive membership proof Resolution: Both changes coexist — block-0 guard runs first, then the N-1 adjustment applies. BEGIN_COMMIT_OVERRIDE chore: sync backport staging with v4-next HEAD 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> Co-authored-by: spypsy <spypsy@users.noreply.github.com> Co-authored-by: Amin Sammara <84764772+aminsammara@users.noreply.github.com>
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Mar 24, 2026
BEGIN_COMMIT_OVERRIDE fix: explicitly handle initial block case for getBlockHashMembershipWitness (#21836) fix(aztec-up): narrow PATH cleanup regex to avoid removing user PATH entries (#21828) fix: use anchor block on getL1ToL2MsgWitness (#21872) fix: make sure queries are not made ahead of the anchor block (#21874) fix(aztec-up): strip leading `v` prefix from version strings (#21813) END_COMMIT_OVERRIDE
Thunkar
pushed a commit
that referenced
this pull request
Mar 24, 2026
…for getBlockHashMembershipWitness) to v4-next (#21891) Backport of #21836 to v4-next. Cherry-pick of f8b6239 onto `backport-to-v4-next-staging` with conflict resolution. **Conflict:** `server.ts` had a conflict because v4-next doesn't have the `resolveBlockNumber` method or the `N-1` world state lookup refactor from `next`. Adapted the fix to check for block 0 using both `BlockNumber.ZERO` and initial block hash comparison, keeping the v4-next `getWorldState(referenceBlock)` pattern. **Original PR description:** Explicitly handles the initial block (block 0) case in `getBlockHashMembershipWitness`. Block 0 has an empty archive, so no membership witness can exist. - `yarn-project/aztec-node/src/aztec-node/server.ts`: Early return `undefined` when reference block is block 0 (by number or hash) - `yarn-project/aztec-node/src/aztec-node/server.test.ts`: Added test for the initial block case 1. Cherry-pick with conflict markers 2. Conflict resolution (adapted for v4-next) 3. Test comment adaptation --------- Co-authored-by: Martin Verzilli <martin@aztec-labs.com>
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.
Just a minor nit, but I noticed getBlockHashMembershipWitness was not handling the initial block case explicitly and it made me nervous.
@spalladino please let me know if it's ok to backport this too
Closes F-473