initial snapshot when there is no snapshot (ethereum#86)

s1na · May 18, 2022 · 2b40d13 · 2b40d13
1 parent 5fffa0c
commit 2b40d13
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/consensus/XDPoS/engines/engine_v2/engine.go b/consensus/XDPoS/engines/engine_v2/engine.go
@@ -171,13 +171,13 @@ func (x *XDPoS_v2) Initial(chain consensus.ChainReader, header *types.Header) er
 	}
 
 	// Initial first v2 snapshot
-	if header.Number.Uint64() < x.config.V2.SwitchBlock.Uint64()+x.config.Gap {
+	lastGapNum := x.config.V2.SwitchBlock.Uint64() - x.config.Gap
+	lastGapHeader := chain.GetHeaderByNumber(lastGapNum)
 
-		checkpointBlockNumber := header.Number.Uint64() - header.Number.Uint64()%x.config.Epoch
-		checkpointHeader := chain.GetHeaderByNumber(checkpointBlockNumber)
+	snap, _ := loadSnapshot(x.db, lastGapHeader.Hash())
 
-		lastGapNum := checkpointBlockNumber - x.config.Gap
-		lastGapHeader := chain.GetHeaderByNumber(lastGapNum)
+	if snap == nil {
+		checkpointHeader := chain.GetHeaderByNumber(x.config.V2.SwitchBlock.Uint64())
 
 		log.Info("[Initial] init first snapshot")
 		_, _, masternodes, err := x.getExtraFields(checkpointHeader)