Skip to content

router: prevent rescan on startup #407

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
Nov 12, 2017
Merged

router: prevent rescan on startup #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
153794a
routing/router: sets bestHeight before filtering chain
cfromknecht Nov 11, 2017
e62bb03
routing/chainview/btcd: makes rescan logging statement print to trace
cfromknecht Nov 11, 2017
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
10 changes: 5 additions & 5 deletions routing/chainview/btcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,12 +366,12 @@ func (b *BtcdFilteredChainView) chainFilterer() {
continue
}

// If no block was returned from the rescan,
// it means no maching transactions were found.
// If no block was returned from the rescan, it
// means no matching transactions were found.
if len(rescanned) != 1 {
log.Debugf("no matching block found "+
"for rescan of hash %v",
blockHash)
log.Tracef("rescan of block %v at "+
"height=%d yielded no "+
"transactions", blockHash, i)
continue
}
decoded, err := decodeJSONBlock(
Expand Down
16 changes: 15 additions & 1 deletion routing/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,18 @@ func (r *ChannelRouter) Start() error {
r.newBlocks = r.cfg.ChainView.FilteredBlocks()
r.staleBlocks = r.cfg.ChainView.DisconnectedBlocks()

_, pruneHeight, err := r.cfg.Graph.PruneTip()
if err != nil {
switch {
// If the graph has never been pruned, or hasn't fully been
// created yet, then we don't treat this as an explicit error.
case err == channeldb.ErrGraphNeverPruned:
case err == channeldb.ErrGraphNotFound:
default:
return err
}
}

// Before we perform our manual block pruning, we'll construct and
// apply a fresh chain filter to the active FilteredChainView instance.
// We do this before, as otherwise we may miss on-chain events as the
Expand All @@ -281,8 +293,9 @@ func (r *ChannelRouter) Start() error {
if err != nil && err != channeldb.ErrGraphNoEdgesFound {
return err
}

log.Infof("Filtering chain using %v channels active", len(channelView))
err = r.cfg.ChainView.UpdateFilter(channelView, r.bestHeight)
err = r.cfg.ChainView.UpdateFilter(channelView, pruneHeight)
if err != nil {
return err
}
Expand Down Expand Up @@ -331,6 +344,7 @@ func (r *ChannelRouter) syncGraphWithChain() error {
return err
}
r.bestHeight = uint32(bestHeight)

pruneHash, pruneHeight, err := r.cfg.Graph.PruneTip()
if err != nil {
switch {
Expand Down