fix(jsonrpc): post log/block filters for reorg-applied blocks#6819
Merged
kuny0707 merged 3 commits intoJun 11, 2026
Merged
Conversation
halibobo1205
added
topic:json-rpc
topic:event subscribe
bladehan1
reviewed
Jun 8, 2026
bladehan1
reviewed
Jun 8, 2026
…er elements
- Restore topicToByteArray for LogFilter topics, guard with (0x)?[0-9a-fA-F]{63,64}$ so the stripped zero is padded back by ByteArray.fromHexString, while non-hex or wrong-length input still gets a clean -32602.
- LogFilter: validate element types before the (String) cast in the address array and nested topic array loops.
xxo1shine
approved these changes
Jun 11, 2026
317787106
approved these changes
Jun 11, 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
7 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.
What does this PR do?
Adds
reApplyLogsFilter(List<KhaosBlock>), invoked afterswitchForkhas fully applied the new branch (oldest-first), mirroringblockTrigger's jsonrpc FULL handling so reorg'd blocks reach the FULL stream like the normal extend path.Why are these changes required?
On a reorg,
pushBlockcallsswitchFork()and returns early, never reachingblockTrigger()— the only place that posts the "added" FULL filters (postBlockFilter/postLogsFilter(block, false, false)). The rollback side withdraws the orphaned branch's logs (reOrgLogsFilter,removed=true), but nothing re-posts the new branch's logs: withdraw old, never add new, violating reorg semantics.So dApps using
eth_newFilter+eth_getFilterChangesmiss every log in blocks applied viaswitchFork.This PR has been tested by:
Follow up
Extra details