RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Detect fork in connectBlocks loop

Browse Source
This commit is contained in:
Martin Boehm 2020-11-25 11:58:09 +01:00
parent 636167c72a
commit 248de3cb34
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
db/sync.go
View File

@ -44,6 +44,7 @@ func NewSyncWorker(db *RocksDB, chain bchain.BlockChain, syncWorkers, syncChunk
} }
var errSynced = errors.New("synced") var errSynced = errors.New("synced")
var errFork = errors.New("fork")
// ErrOperationInterrupted is returned when operation is interrupted by OS signal // ErrOperationInterrupted is returned when operation is interrupted by OS signal
var ErrOperationInterrupted = errors.New("ErrOperationInterrupted") var ErrOperationInterrupted = errors.New("ErrOperationInterrupted")
@ -105,7 +106,7 @@ func (w *SyncWorker) resyncIndex(onNewBlock bchain.OnNewBlockFunc, initialSync b
} }
if remoteHash != localBestHash { if remoteHash != localBestHash {
// forked - the remote hash differs from the local hash at the same height // forked - the remote hash differs from the local hash at the same height
glog.Info("resync: local is forked at height ", localBestHeight, ", local hash ", localBestHash, ", remote hash", remoteHash) glog.Info("resync: local is forked at height ", localBestHeight, ", local hash ", localBestHash, ", remote hash ", remoteHash)
return w.handleFork(localBestHeight, localBestHash, onNewBlock, initialSync) return w.handleFork(localBestHeight, localBestHash, onNewBlock, initialSync)
} }
glog.Info("resync: local at ", localBestHeight, " is behind") glog.Info("resync: local at ", localBestHeight, " is behind")
@ -141,7 +142,11 @@ func (w *SyncWorker) resyncIndex(onNewBlock bchain.OnNewBlockFunc, initialSync b
return w.resyncIndex(onNewBlock, initialSync) return w.resyncIndex(onNewBlock, initialSync)
} }
} }
return w.connectBlocks(onNewBlock, initialSync) err = w.connectBlocks(onNewBlock, initialSync)
if err == errFork {
return w.resyncIndex(onNewBlock, initialSync)
}
return err
} }
func (w *SyncWorker) handleFork(localBestHeight uint32, localBestHash string, onNewBlock bchain.OnNewBlockFunc, initialSync bool) error { func (w *SyncWorker) handleFork(localBestHeight uint32, localBestHash string, onNewBlock bchain.OnNewBlockFunc, initialSync bool) error {
@ -377,9 +382,9 @@ func (w *SyncWorker) getBlockChain(out chan blockResult, done chan struct{}) {
hash := w.startHash hash := w.startHash
height := w.startHeight height := w.startHeight
prevHash := ""
// some coins do not return Next hash // loop until error ErrBlockNotFound
// must loop until error
for { for {
select { select {
case <-done: case <-done:
@ -394,6 +399,12 @@ func (w *SyncWorker) getBlockChain(out chan blockResult, done chan struct{}) {
out <- blockResult{err: err} out <- blockResult{err: err}
return return
} }
if block.Prev != "" && prevHash != "" && prevHash != block.Prev {
glog.Infof("sync: fork detected at height %d %s, local prevHash %s, remote prevHash %s", height, block.Hash, prevHash, block.Prev)
out <- blockResult{err: errFork}
return
}
prevHash = block.Hash
hash = block.Next hash = block.Next
height++ height++
out <- blockResult{block: block} out <- blockResult{block: block}