Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-06-04 13:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch' into v0.11.13-rc (we apply the patch to p2p v4 since it still has the unoptimized IBD)

Browse Source
This commit is contained in:
msutton 2022-03-14 12:58:26 +02:00
commit df643f67cf
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/protocol/flows/v4/blockrelay/ibd.go
View File

@ -13,7 +13,9 @@ import (
"github.com/kaspanet/kaspad/infrastructure/config" "github.com/kaspanet/kaspad/infrastructure/config"
"github.com/kaspanet/kaspad/infrastructure/logger" "github.com/kaspanet/kaspad/infrastructure/logger"
"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router" "github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
"github.com/kaspanet/kaspad/util/difficulty"
"github.com/pkg/errors" "github.com/pkg/errors"
"math/big"
"time" "time"
) )
@ -64,6 +66,28 @@ func (flow *handleIBDFlow) start() error {
} }
func (flow *handleIBDFlow) runIBDIfNotRunning(block *externalapi.DomainBlock) error { func (flow *handleIBDFlow) runIBDIfNotRunning(block *externalapi.DomainBlock) error {
highHash := consensushashing.BlockHash(block)
// Temp code to avoid IBD from lagging nodes publishing their side-chain
virtualSelectedParent, err := flow.Domain().Consensus().GetVirtualSelectedParent()
if err == nil {
virtualSelectedParentHeader, err := flow.Domain().Consensus().GetBlockHeader(virtualSelectedParent)
if err == nil {
if virtualSelectedParentHeader.DAAScore() > block.Header.DAAScore()+2641 {
virtualDifficulty := difficulty.CalcWork(virtualSelectedParentHeader.Bits())
var virtualSub, difficultyMul big.Int
if difficultyMul.Mul(virtualDifficulty, big.NewInt(180)).
Cmp(virtualSub.Sub(virtualSelectedParentHeader.BlueWork(), block.Header.BlueWork())) < 0 {
log.Criticalf("Avoiding IBD triggered by relay %s with %d DAA score diff and lower blue work (%d, %d)",
highHash,
virtualSelectedParentHeader.DAAScore()-block.Header.DAAScore(),
virtualSelectedParentHeader.BlueWork(), block.Header.BlueWork())
return nil
}
}
}
}
wasIBDNotRunning := flow.TrySetIBDRunning(flow.peer) wasIBDNotRunning := flow.TrySetIBDRunning(flow.peer)
if !wasIBDNotRunning { if !wasIBDNotRunning {
log.Debugf("IBD is already running") log.Debugf("IBD is already running")
@ -76,15 +100,14 @@ func (flow *handleIBDFlow) runIBDIfNotRunning(block *externalapi.DomainBlock) er
flow.logIBDFinished(isFinishedSuccessfully) flow.logIBDFinished(isFinishedSuccessfully)
}() }()
highHash := consensushashing.BlockHash(block) log.Infof("IBD started with peer %s and highHash %s", flow.peer, highHash)
log.Debugf("IBD started with peer %s and highHash %s", flow.peer, highHash) log.Infof("Syncing blocks up to %s", highHash)
log.Debugf("Syncing blocks up to %s", highHash) log.Infof("Trying to find highest shared chain block with peer %s with high hash %s", flow.peer, highHash)
log.Debugf("Trying to find highest shared chain block with peer %s with high hash %s", flow.peer, highHash)
highestSharedBlockHash, highestSharedBlockFound, err := flow.findHighestSharedBlockHash(highHash) highestSharedBlockHash, highestSharedBlockFound, err := flow.findHighestSharedBlockHash(highHash)
if err != nil { if err != nil {
return err return err
} }
log.Debugf("Found highest shared chain block %s with peer %s", highestSharedBlockHash, flow.peer) log.Infof("Found highest shared chain block %s with peer %s", highestSharedBlockHash, flow.peer)
shouldDownloadHeadersProof, shouldSync, err := flow.shouldSyncAndShouldDownloadHeadersProof(block, highestSharedBlockFound) shouldDownloadHeadersProof, shouldSync, err := flow.shouldSyncAndShouldDownloadHeadersProof(block, highestSharedBlockFound)
if err != nil { if err != nil {