Repository navigation
Merger: don't move canonical copies with a different LIB to forked store - #283
Merged
sduchesneau merged 4 commits intoOct 9, 2026
Conversation
Track seen one-block files by block number and ID instead of CanonicalName, so copies written by readers with a different LIB view are grouped as one block. Also skip entries below the base when collecting forked blocks. Fixes streamingfast#282 Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Contributor
|
Good catch @YaroShkvorets, this explains unexplained things that I've seen a while ago! I'll check this out later and surely merge it if it's sound |
sduchesneau
requested changes
Oct 9, 2026
sduchesneau
left a comment
sduchesneau
left a comment
Contributor
There was a problem hiding this comment.
This duplicates the purpose of CanonicalName (which comes from bstream).
Cleaner fix should be:
- remove LIB from bstream's OneBlockFile.CanonicalName
- bump it here and get rid of the new blockFileKey and cloneOneBlockFile
- keep the 'continue' fix, that one is good as-is.
Drop the merger's own block-ID key now that bstream's CanonicalName no longer includes the LIB (streamingfast/bstream#84). Needs the bstream bump. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Contributor
Author
|
Opened bstream PR: streamingfast/bstream#84 |
Contributor
Author
|
CI test fails, needs bstream merge and version bump to pass |
Contributor
|
@YaroShkvorets bump latest of bstream over rebased firehose-core and you should be good to go! |
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Contributor
Author
|
Bumped bstream to include streamingfast/bstream#85 |
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
2 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.
Fixes #282.
CanonicalNameno longer includes the LIB, so copies of the same block written with different LIBs (Polygon PoS / Amoy) are no longer moved to the forked-blocks store. Only another ID at the same height is.forkedBlocksInCurrentBundle: add the missingcontinueso entries below the base are dropped, not moved as forks.🤖 Generated with Claude Code