Fix shard stuck #6739
Merged
Fix shard stuck #6739
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
| return sr.finalizeConfirmedBlock() | ||
| } | ||
|
|
||
| func (sr *subroundEndRound) waitForProof(shardID uint32, headerHash []byte) bool { |
Collaborator
There was a problem hiding this comment.
parameters are not necessarily needed
| } | ||
|
|
||
| func (sr *subroundEndRound) finalizeConfirmedBlock() bool { | ||
| sr.waitForProof(sr.ShardCoordinator().SelfId(), sr.GetData()) |
Collaborator
There was a problem hiding this comment.
check result of waitForProof and do not proceed in case of false?
| if !sr.waitForSignalSync() { | ||
| return false | ||
| } | ||
| _, _ = sr.sendProof() |
Collaborator
There was a problem hiding this comment.
we can remove the return values of sendProof now
sstanculeanu
approved these changes
Jan 28, 2025
ssd04
approved these changes
Jan 28, 2025
| // broadcast header proof | ||
| proof, err := sr.createAndBroadcastProof(sig, bitmap) | ||
| return proof, err == nil | ||
| _, err = sr.createAndBroadcastProof(sig, bitmap) |
Contributor
There was a problem hiding this comment.
returned proof variable here can also be removed
| func (sr *subroundEndRound) waitForProof() bool { | ||
| shardID := sr.ShardCoordinator().SelfId() | ||
| headerHash := sr.GetData() | ||
| if sr.EquivalentProofsPool().HasProof(sr.ShardCoordinator().SelfId(), sr.GetData()) { |
Contributor
There was a problem hiding this comment.
Suggested change
| if sr.EquivalentProofsPool().HasProof(sr.ShardCoordinator().SelfId(), sr.GetData()) { | |
| if sr.EquivalentProofsPool().HasProof(shardID, headerHash) { |
?
sstanculeanu
approved these changes
Jan 28, 2025
ssd04
approved these changes
Jan 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Reasoning behind the pull request
Proposed changes
Testing procedure
Pre-requisites
Based on the Contributing Guidelines the PR author and the reviewers must check the following requirements are met:
featbranch created?featbranch merging, do all satellite projects have a proper tag insidego.mod?