Skip to content
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

Jump to bottom

Apply avoiding IBD patch10 logic to p2p v4 #1979

Merged
merged 18 commits into from
Mar 15, 2022
Merged

Apply avoiding IBD patch10 logic to p2p v4 #1979

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1cedc72
patch
someone235 Mar 2, 2022
ef1a3c0
remove debug log
someone235 Mar 2, 2022
b5eda33
remove count
someone235 Mar 2, 2022
4d3f504
Check checkpoint only if highestSharedBlockFound
someone235 Mar 2, 2022
20f16cf
Update checkpoint to new side-chain
michaelsutton Mar 5, 2022
cb5e9b5
Update checkpoint to yet another side-chain
michaelsutton Mar 7, 2022
9b45e80
Merge branch 'dev' into patch
michaelsutton Mar 7, 2022
685c049
yet another checkpoint
michaelsutton Mar 7, 2022
c903a65
a temp patch for fixing IBD issues for all side-chains
michaelsutton Mar 8, 2022
7c32768
route capacity workaround (for new syncing nodes)
michaelsutton Mar 8, 2022
09cebe6
Perform side-chain check earlier to avoid IBD start
michaelsutton Mar 8, 2022
9df231f
added relay hash to the log print
michaelsutton Mar 8, 2022
ca32eb6
Merge remote-tracking branch 'origin/dev' into patch
michaelsutton Mar 9, 2022
df643f6
Merge branch 'patch' into v0.11.13-rc (we apply the patch to p2p v4 s…
michaelsutton Mar 14, 2022
7ffe83e
Add the percentage report fix to v4 as well
michaelsutton Mar 14, 2022
38b211e
Make sure there are no negative numbers in the report
michaelsutton Mar 14, 2022
a99f8b4
Merge remote-tracking branch 'origin/dev' into v0.11.13-rc
michaelsutton Mar 15, 2022
085c1cc
A few comments explaining the IBD patch
michaelsutton Mar 15, 2022
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
39 changes: 34 additions & 5 deletions app/protocol/flows/v4/blockrelay/ibd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import (
"github.com/kaspanet/kaspad/infrastructure/config"
"github.com/kaspanet/kaspad/infrastructure/logger"
"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
"github.com/kaspanet/kaspad/util/difficulty"
"github.com/pkg/errors"
"math/big"
"time"
)

Expand Down Expand Up @@ -64,6 +66,34 @@ func (flow *handleIBDFlow) start() 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. This patch
// is applied only to p2p v4 since the implemented IBD negotiation has quadratic complexity in this worst-case.
// See IBD logic of p2p v5 for further details.
virtualSelectedParent, err := flow.Domain().Consensus().GetVirtualSelectedParent()
if err == nil {
virtualSelectedParentHeader, err := flow.Domain().Consensus().GetBlockHeader(virtualSelectedParent)
if err == nil {
// We first check that DAA score of the relay block is at distance of more than DAA window size.
// This indicates a side-chain which is not in the future of any block in the current virtual DAA window.
if virtualSelectedParentHeader.DAAScore() > block.Header.DAAScore()+2641 {
// We then find the 'unit' of current virtual difficulty. We check if the relay block is at least
// at distance of 180 such units. This signals another condition for a pow-weak side-chain.
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 {
Comment on lines +85 to +86
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please write a small comment explaining this logic

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added comments. Re the general comment below, this is temp code by definition. As we already have p2p v5 which fixed precisely this issue, and p2p v4 will soon be obsolete.

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)
if !wasIBDNotRunning {
log.Debugf("IBD is already running")
Expand All @@ -76,15 +106,14 @@ func (flow *handleIBDFlow) runIBDIfNotRunning(block *externalapi.DomainBlock) er
flow.logIBDFinished(isFinishedSuccessfully)
}()

highHash := consensushashing.BlockHash(block)
log.Debugf("IBD started with peer %s and highHash %s", flow.peer, highHash)
log.Debugf("Syncing blocks up to %s", highHash)
log.Debugf("Trying to find highest shared chain block with peer %s with high hash %s", flow.peer, highHash)
log.Infof("IBD started with peer %s and highHash %s", flow.peer, highHash)
log.Infof("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)
highestSharedBlockHash, highestSharedBlockFound, err := flow.findHighestSharedBlockHash(highHash)
if err != nil {
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)
if err != nil {
Expand Down