feature: Step by step sync (#116)

node-real · Jun 13, 2023 · 551d8eb · 551d8eb
1 parent 6da3fa5
commit 551d8eb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/eth/stagedsync/stage_headers.go b/eth/stagedsync/stage_headers.go
@@ -110,6 +110,11 @@ func SpawnStageHeaders(
  }
  defer tx.Rollback()
  }
+ if initialCycle {
+ // Set sync upperbound only at the initalCycle to avoid repeated set.
+ cfg.hd.SetStageSyncUpperBound(cfg.StageSyncUpperBound)
+ cfg.hd.SetStageSyncStep(cfg.StageSyncStep)
+ }
  if initialCycle && cfg.snapshots != nil && cfg.snapshots.Cfg().Enabled {
  if err := cfg.hd.AddHeadersFromSnapshot(tx, cfg.snapshots.BlocksAvailable(), cfg.blockReader); err != nil {
  return err
@@ -801,13 +806,6 @@ func HeadersPOW(
  headerInserter := headerdownload.NewHeaderInserter(logPrefix, localTd, headerProgress, cfg.blockReader)
  cfg.hd.SetHeaderReader(&ChainReaderImpl{config: &cfg.chainConfig, tx: tx, blockReader: cfg.blockReader})
 
- if cfg.StageSyncUpperBound > 0 && cfg.StageSyncStep == 0 {
- // if sync upperbound enabled but disabled step sync, then set upperbound, otherwise not to avoid repeated set.
- cfg.hd.SetStageSyncUpperBound(cfg.StageSyncUpperBound)
- }
-
- cfg.hd.SetStageSyncStep(cfg.StageSyncStep)
-
  stopped := false
  var noProgressCounter uint = 0
  prevProgress := headerProgress

diff --git a/turbo/stages/headerdownload/header_algos.go b/turbo/stages/headerdownload/header_algos.go
@@ -608,6 +608,9 @@ func (hd *HeaderDownload) InsertHeader(hf FeedHeaderFunc, terminalTotalDifficult
  blocksToTTD = x.Uint64()
  }
  }
+ if hd.stageSyncStep > 0 && hd.highestInDb%hd.stageSyncStep == 0 {
+ return false, true, 0, lastTime, nil
+ }
  return hd.insertQueue.Len() > 0 && hd.insertQueue[0].blockHeight <= hd.highestInDb+1, false, blocksToTTD, lastTime, nil
 }
 
@@ -1229,7 +1232,7 @@ func (hd *HeaderDownload) SetStageSyncUpperBound(stageSyncUpperBound uint64) {
 func (hd *HeaderDownload) SetStageSyncStep(stageSyncStep uint64) {
  hd.lock.Lock()
  defer hd.lock.Unlock()
- hd.stageSyncUpperBound += stageSyncStep
+ hd.stageSyncStep = stageSyncStep
 }
 
 func (hd *HeaderDownload) SetRequestId(requestId int) {

diff --git a/turbo/stages/headerdownload/header_data_struct.go b/turbo/stages/headerdownload/header_data_struct.go
@@ -271,6 +271,7 @@ type HeaderDownload struct {
  posDownloaderTip common.Hash // See https://hackmd.io/GDc0maGsQeKfP8o2C7L52w
  badPoSHeaders map[common.Hash]common.Hash // Invalid Tip -> Last Valid Ancestor
  stageSyncUpperBound uint64 // Upper bound for stage sync, stop sync upon reached this height
+ stageSyncStep uint64 // Step for stage sync
 }
 
 // HeaderRecord encapsulates two forms of the same header - raw RLP encoding (to avoid duplicated decodings and encodings), and parsed value types.Header