Skip to content

move the validation of download finish if the block height is 0 #781

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
Apr 24, 2020
Merged

move the validation of download finish if the block height is 0 #781

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0114314
move the validation of download finish if the block height is 0
capt4ce Apr 24, 2020
c2bd0ec
Merge branch 'develop' into 780-fix-node-stuck
andy-shi88 Apr 24, 2020
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
23 changes: 10 additions & 13 deletions core/blockchainsync/downloadBlockchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,21 +76,18 @@ func (bd *BlockchainDownloader) IsDownloadFinish(currentLastBlock *model.Block)
return false
}
heightAfterDownload := afterDownloadLastBlock.Height
// to avoid the network being start at the initial kick off / restart
if currentHeight == heightAfterDownload {
bd.firstDownloadCounter++
if bd.firstDownloadCounter >= constant.MaxResolvedPeers {
bd.firstDownloadCounter = 0
return true
}
return false
}
cumulativeDifficultyAfterDownload := afterDownloadLastBlock.CumulativeDifficulty
if currentHeight > 0 && currentHeight == heightAfterDownload && currentCumulativeDifficulty == cumulativeDifficultyAfterDownload {
if currentHeight == heightAfterDownload && currentCumulativeDifficulty == cumulativeDifficultyAfterDownload {
if currentHeight == 0 {
bd.firstDownloadCounter++
if bd.firstDownloadCounter >= constant.MaxResolvedPeers {
bd.firstDownloadCounter = 0
return true
}
}
bd.firstDownloadCounter = 0
return true
}
bd.firstDownloadCounter = 0
return false
}

Expand Down Expand Up @@ -362,7 +359,7 @@ func (bd *BlockchainDownloader) DownloadFromPeer(feederPeer *model.Peer, chainBl
err := bd.BlockService.ValidateBlock(block, lastBlock)
if err != nil {
monitoring.IncrementMainchainDownloadCycleDebugger(bd.ChainType, 69)
bd.Logger.Infof("[download blockchain] failed to verify block %v from peer: %s\nwith previous: %v\n", block.ID, err, lastBlock.ID)
bd.Logger.Warnf("[download blockchain] failed to verify block %v from peer: %s\nwith previous: %v\n", block.ID, err, lastBlock.ID)
blacklistErr := bd.PeerExplorer.PeerBlacklist(feederPeer, err.Error())
if blacklistErr != nil {
monitoring.IncrementMainchainDownloadCycleDebugger(bd.ChainType, 70)
Expand All @@ -380,7 +377,7 @@ func (bd *BlockchainDownloader) DownloadFromPeer(feederPeer *model.Peer, chainBl
if blacklistErr != nil {
bd.Logger.Errorf("Failed to add blacklist: %v\n", blacklistErr)
}
bd.Logger.Info("failed to push block from peer:", err)
bd.Logger.Warn("failed to push block from peer:", err)
return &PeerForkInfo{
FeederPeer: feederPeer,
}, err
Expand Down