fix: only delete logs from rolled-back blocks, not entire tag (A-686)#21687
Merged
spalladino merged 2 commits intomerge-train/spartanfrom Mar 18, 2026
Conversation
nventuro
reviewed
Mar 17, 2026
Contributor
nventuro
left a comment
nventuro
left a comment
There was a problem hiding this comment.
The fix looks correct. I'd add two tests where we have two txs in different blocks emit logs with the same tag, reorg the second block and check that the node query fns still return the first (un-reorged) log.
ludamad
reviewed
Mar 17, 2026
| const firstBlockToDelete = Math.min(...blockNumbers); | ||
|
|
||
| // Collect all unique private tags across all blocks being deleted | ||
| const allPrivateTags = new Set( |
Collaborator
There was a problem hiding this comment.
I'd probably extract blocks.map(block => this.#privateLogKeysByBlock.getAsync(block.number)) into a temporary
ludamad
approved these changes
Mar 18, 2026
spalladino
deleted the
phil/a-686-deletelogs-deletes-all-logs-for-a-tag-not-just-rolled-back
branch
Collaborator
|
❌ Failed to cherry-pick to |
AztecBot
pushed a commit
that referenced
this pull request
Mar 18, 2026
…e tag (A-686) (#21687) (with conflicts)
ludamad
added a commit
that referenced
this pull request
Mar 18, 2026
…entire tag (A-686) (#21713) ## Summary Backport of #21687 to v4. During reorg, `deleteLogs` was 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 `next` and `v4`: - `next` uses `store.addProposedBlock(block)` (singular) — v4 uses `store.addProposedBlocks([block])` (plural, takes array) - `next` uses a helper `addProposedBlocks(store, ...)` — adapted to call `store.addProposedBlocks(...)` directly in v4 ## Commit structure 1. **Cherry-pick with conflicts** — raw cherry-pick preserving conflict markers 2. **Conflict resolution** — adapted `addProposedBlock` → `addProposedBlocks` API calls Fixes https://linear.app/aztec-labs/issue/A-686 ClaudeBox log: https://claudebox.work/s/1f9640fef77e1838?run=2
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
6 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.
During reorg, deleteLogs was 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.
Fixes https://linear.app/aztec-labs/issue/A-686