Skip to content

chore: merge v4 into v4-next (resolve conflicts)#21493

Closed
AztecBot wants to merge 1 commit intov4-nextfrom
sync/v4-into-v4-next-20260313-132749
Closed

chore: merge v4 into v4-next (resolve conflicts)#21493
AztecBot wants to merge 1 commit intov4-nextfrom
sync/v4-into-v4-next-20260313-132749

Conversation

@AztecBot
Copy link
Collaborator

@AztecBot AztecBot commented Mar 13, 2026

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.

@AztecBot
Copy link
Collaborator Author

AztecBot commented Mar 17, 2026

New v4 changes pushed. A fresh sync branch sync/v4-into-v4-next-20260317-153928 has been created. Please resolve conflicts there or close this PR and use the new branch.

@AztecBot
Copy link
Collaborator Author

AztecBot commented Mar 17, 2026

New v4 changes pushed. A fresh sync branch sync/v4-into-v4-next-20260317-160903 has been created. Please resolve conflicts there or close this PR and use the new branch.

@AztecBot
Copy link
Collaborator Author

AztecBot commented Mar 17, 2026

New v4 changes pushed. A fresh sync branch sync/v4-into-v4-next-20260317-164008 has been created. Please resolve conflicts there or close this PR and use the new branch.

@AztecBot
Copy link
Collaborator Author

AztecBot commented Mar 17, 2026

New v4 changes pushed. A fresh sync branch sync/v4-into-v4-next-20260317-170852 has been created. Please resolve conflicts there or close this PR and use the new branch.

@AztecBot
Copy link
Collaborator Author

AztecBot commented Mar 17, 2026

New v4 changes pushed. A fresh sync branch sync/v4-into-v4-next-20260317-180934 has been created. Please resolve conflicts there or close this PR and use the new branch.

@AztecBot
Copy link
Collaborator Author

AztecBot commented Mar 17, 2026

New v4 changes pushed. A fresh sync branch sync/v4-into-v4-next-20260317-181549 has been created. Please resolve conflicts there or close this PR and use the new branch.

@AztecBot
Copy link
Collaborator Author

AztecBot commented Mar 17, 2026

New v4 changes pushed. A fresh sync branch sync/v4-into-v4-next-20260317-183427 has been created. Please resolve conflicts there or close this PR and use the new branch.

@AztecBot AztecBot mentioned this pull request Mar 17, 2026
Merged
@AztecBot
Copy link
Collaborator Author

AztecBot commented Mar 17, 2026

New v4 changes pushed. A fresh sync branch sync/v4-into-v4-next-20260317-190904 has been created. Please resolve conflicts there or close this PR and use the new branch.

@nventuro nventuro closed this Mar 17, 2026
@nventuro nventuro reopened this Mar 17, 2026
@nventuro
Copy link
Contributor

nventuro commented Mar 17, 2026

(this is in theory stale and replaced by #21702)

nventuro pushed a commit that referenced this pull request Mar 17, 2026
@AztecBot @benesjan
@PhilWindle @spalladino @claude @ludamad @alexghr
chore: merge v4 into v4-next (resolve conflicts) (#21702)
d23ae01 
## 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>
@nventuro nventuro closed this Mar 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@AztecBot @nventuro