Skip to content

Fix voting process stopping with each synchronization #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 31, 2024
Merged

Fix voting process stopping with each synchronization #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95c692f
Fix nil panic in td.Cmp(bestTd)
ironbeer Oct 31, 2024
3ec7a58
Fix voting process stopping with each synchronization.
ironbeer Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eth/peerset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ func (ps *peerSet) peerWithHighestJustifiedBlockAndTD() (bestPeer *eth.Peer, bes
continue
}
_, td := p.Head()
if *justified > bestJustified || (*justified == bestJustified && td.Cmp(bestTd) > 0) {
if bestPeer == nil || *justified > bestJustified || (*justified == bestJustified && td.Cmp(bestTd) > 0) {
bestPeer, bestJustified, bestTd = p.Peer, *justified, td
}
}
Expand Down
4 changes: 2 additions & 2 deletions eth/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ func (cs *chainSyncer) nextSyncOp() *chainSyncOp {
if peerJustified < *ourJustified {
return nil
}
// Ignored because justified block height is the same but TD is lower.
if peerJustified == *ourJustified && peerTD.Cmp(ourTD) < 0 {
// Ignored because justified block height is the same but TD is the same or lower.
if peerJustified == *ourJustified && peerTD.Cmp(ourTD) <= 0 {
return nil
}
}
Expand Down