Skip to content

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
claudebox/1f9640fef77e1838-2
Mar 18, 2026
Merged

fix: backport #21687 — only delete logs from rolled-back blocks, not entire tag (A-686)#21713
ludamad merged 2 commits intobackport-to-v4-stagingfrom
claudebox/1f9640fef77e1838-2

Conversation

@AztecBot
Copy link
Collaborator

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 addProposedBlockaddProposedBlocks API calls

Fixes https://linear.app/aztec-labs/issue/A-686

ClaudeBox log: https://claudebox.work/s/1f9640fef77e1838?run=2

@AztecBot AztecBot added ci-draft Run CI on draft PRs. claudebox Owned by claudebox. it can push to this PR. labels Mar 18, 2026
@ludamad ludamad marked this pull request as ready for review March 18, 2026 02:13
@ludamad ludamad removed the claudebox Owned by claudebox. it can push to this PR. label Mar 18, 2026
@ludamad ludamad enabled auto-merge March 18, 2026 02:16
@ludamad ludamad removed the ci-draft Run CI on draft PRs. label Mar 18, 2026
@ludamad ludamad merged commit 445d6b8 into backport-to-v4-staging Mar 18, 2026
22 of 28 checks passed
@ludamad ludamad deleted the claudebox/1f9640fef77e1838-2 branch March 18, 2026 03:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants