[1.2.2] P2P: Block nack reset fix #1786
Merged
Conversation
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
… that instead of chain head for determination if block nack reset should be sent. Also reset consecutive_blocks_nacks when block nacks are not consecutive.
linh2931
approved these changes
Jul 28, 2025
greg7mdp
reviewed
Jul 28, 2025
plugins/net_plugin/net_plugin.cpp
Outdated
| fc::raw::unpack( peek_ds, bh ); | ||
| const block_id_type blk_id = bh.calculate_id(); | ||
| const uint32_t blk_num = last_received_block_num = block_header::num_from_id(blk_id); | ||
| my_impl->last_block_num_received = blk_num; |
Contributor
There was a problem hiding this comment.
shouldn't it be something like:
my_impl->last_block_num_received = std::max(blk_num, my_impl->last_block_num_received);
or are we guaranteed to receive blocks from only one connection at a time?
Contributor
Author
There was a problem hiding this comment.
We can't do that because if we receive a large invalid block then my_impl->last_block_num_received would stay that value. Really what we are trying to accomplish here is just knowing if we are receiving blocks from this connection. Maybe it would be better to add a last_block_received_time to connection and compare that to say 5 seconds in close and use that as the determination.
greg7mdp
approved these changes
Jul 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Track
last_block_num_receivedacross all connections and use that instead of chain head for determination if block nack reset should be sent. Also resetconsecutive_blocks_nackswhen block nacks are not consecutive.Resolves #1784