fix: backport #21687 — only delete logs from rolled-back blocks, not entire tag (A-686)#21713
Merged
ludamad merged 2 commits intobackport-to-v4-stagingfrom Mar 18, 2026
Merged
Conversation
…e tag (A-686) (#21687) (with conflicts)
…ProposedBlocks API
ludamad
approved these changes
Mar 18, 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
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
Backport of #21687 to v4.
During reorg,
deleteLogswas deleting the entire log entry for a tag instead of only removing logs from the rolled-back blocks. This caused logs from earlier blocks to be lost.Cherry-pick conflicts
The automatic cherry-pick failed due to API differences between
nextandv4:nextusesstore.addProposedBlock(block)(singular) — v4 usesstore.addProposedBlocks([block])(plural, takes array)nextuses a helperaddProposedBlocks(store, ...)— adapted to callstore.addProposedBlocks(...)directly in v4Commit structure
addProposedBlock→addProposedBlocksAPI callsFixes https://linear.app/aztec-labs/issue/A-686
ClaudeBox log: https://claudebox.work/s/1f9640fef77e1838?run=2