Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-11-24 14:35:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Parents must be picked first before set as virtual parents

Browse Source
This commit is contained in:
msutton 2022-07-10 01:29:37 +03:00
parent 4edba5df8b
commit c93f310d20
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
domain/consensus/processes/consensusstatemanager/resolve.go
View File

@ -168,10 +168,17 @@ func (csm *consensusStateManager) ResolveVirtual(maxBlocksToResolve uint64) (*ex
// If `isCompletelyResolved`, set virtual correctly with all tips which have less blue work than pending // If `isCompletelyResolved`, set virtual correctly with all tips which have less blue work than pending
virtualTipCandidates := []*externalapi.DomainHash{intermediateTip} virtualTipCandidates := []*externalapi.DomainHash{intermediateTip}
if isCompletelyResolved { if isCompletelyResolved {
virtualTipCandidates, err = csm.getLowerTips(readStagingArea, pendingTip) lowerTips, err := csm.getLowerTips(readStagingArea, pendingTip)
if err != nil { if err != nil {
return nil, false, err return nil, false, err
} }
log.Debugf("Picking virtual parents from relevant tips len: %d", len(lowerTips))
virtualTipCandidates, err = csm.pickVirtualParents(readStagingArea, lowerTips)
if err != nil {
return nil, false, err
}
log.Debugf("Picked virtual parents: %s", virtualTipCandidates)
} }
virtualUTXODiff, err := csm.updateVirtualWithParents(updateVirtualStagingArea, virtualTipCandidates) virtualUTXODiff, err := csm.updateVirtualWithParents(updateVirtualStagingArea, virtualTipCandidates)
if err != nil { if err != nil {
@ -183,7 +190,6 @@ func (csm *consensusStateManager) ResolveVirtual(maxBlocksToResolve uint64) (*ex
return nil, false, err return nil, false, err
} }
// TODO: why was `readStagingArea` used here ?
selectedParentChainChanges, err := csm.dagTraversalManager. selectedParentChainChanges, err := csm.dagTraversalManager.
CalculateChainPath(updateVirtualStagingArea, prevVirtualSelectedParent, pendingTip) CalculateChainPath(updateVirtualStagingArea, prevVirtualSelectedParent, pendingTip)
if err != nil { if err != nil {