Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-03-30 15:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NOD-479] Fix unorphaning in API server initial sync (#513)

Browse Source
This commit is contained in:
Ori Newman 2019-12-04 17:06:20 +02:00 committed by Svarog
parent e872ebc7b3
commit 1332e1aa68
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apiserver/sync.go
View File

@ -211,8 +211,10 @@ func fetchBlock(client *jsonrpc.Client, blockHash *daghash.Hash) (
// into the database. See addBlock for further details.
func addBlocks(client *jsonrpc.Client, rawBlocks []string, verboseBlocks []btcjson.GetBlockVerboseResult) error {
for i, rawBlock := range rawBlocks {
verboseBlock := verboseBlocks[i]
err := addBlock(client, rawBlock, verboseBlock)
err := addBlockAndMissingAncestors(client, &rawAndVerboseBlock{
rawBlock: rawBlock,
verboseBlock: &verboseBlocks[i],
})
if err != nil {
return err
}
@ -928,7 +930,15 @@ func (r *rawAndVerboseBlock) String() string {
}
func handleBlockAddedMsg(client *jsonrpc.Client, blockAdded *jsonrpc.BlockAddedMsg) error {
blocks, err := fetchBlockAndMissingAncestors(client, blockAdded.Header.BlockHash())
block, err := fetchBlock(client, blockAdded.Header.BlockHash())
if err != nil {
return err
}
return addBlockAndMissingAncestors(client, block)
}
func addBlockAndMissingAncestors(client *jsonrpc.Client, block *rawAndVerboseBlock) error {
blocks, err := fetchBlockAndMissingAncestors(client, block)
if err != nil {
return err
}
@ -942,11 +952,7 @@ func handleBlockAddedMsg(client *jsonrpc.Client, blockAdded *jsonrpc.BlockAddedM
return nil
}
func fetchBlockAndMissingAncestors(client *jsonrpc.Client, blockHash *daghash.Hash) ([]*rawAndVerboseBlock, error) {
block, err := fetchBlock(client, blockHash)
if err != nil {
return nil, err
}
func fetchBlockAndMissingAncestors(client *jsonrpc.Client, block *rawAndVerboseBlock) ([]*rawAndVerboseBlock, error) {
pendingBlocks := []*rawAndVerboseBlock{block}
blocksToAdd := make([]*rawAndVerboseBlock, 0)
blocksToAddSet := make(map[string]struct{})