Fixes

eth/backend.go

@@ -1148,13 +1148,16 @@ func (s *Ethereum) Start() error {
 	var currentTD *big.Int
 	if err := s.chainDB.View(s.sentryCtx, func(tx kv.Tx) error {
 		h := rawdb.ReadCurrentHeader(tx)
+		if h == nil {
+			return nil
+		}
 		var err error
 		currentTD, err = rawdb.ReadTd(tx, h.Hash(), h.Number.Uint64())
 		return err
 	}); err != nil {
 		return err
 	}
-	if isChainPoS(s.chainConfig, currentTD) {
+	if currentTD != nil && isChainPoS(s.chainConfig, currentTD) {
 		go s.eth1ExecutionServer.Start(s.sentryCtx)
 	} else {
 		go stages2.StageLoop(s.sentryCtx, s.chainDB, s.stagedSync, s.sentriesClient.Hd, s.waitForStageLoopStop, s.config.Sync.LoopThrottle, s.logger, s.blockReader, hook)

turbo/snapshotsync/freezeblocks/bor_snapshots.go

@@ -541,10 +541,12 @@ func BorSpansIdx(ctx context.Context, segmentFilePath string, blockFrom, blockTo
 RETRY:
 	g.Reset(0)
 	var i, offset, nextPos uint64
+	var key [8]byte
 	for g.HasNext() {
 		nextPos, _ = g.Skip()
+		binary.BigEndian.PutUint64(key[:], uint64(i))
 		i++
-		if err = rs.AddOffset(offset); err != nil {
+		if err = rs.AddKey(key[:], offset); err != nil {
 			return err
 		}
 		select {
@@ -616,7 +618,7 @@ func BorSegments(dir string) (res []snaptype.FileInfo, missingSnapshots []Range,
 		var l []snaptype.FileInfo
 		var m []Range
 		for _, f := range list {
-			if f.T != snaptype.BorEvents && f.T != snaptype.BorSpans {
+			if f.T != snaptype.BorEvents {
 				continue
 			}
 			l = append(l, f)
@@ -625,6 +627,17 @@ func BorSegments(dir string) (res []snaptype.FileInfo, missingSnapshots []Range,
 		res = append(res, l...)
 		missingSnapshots = append(missingSnapshots, m...)
 	}
+	{
+		var l []snaptype.FileInfo
+		for _, f := range list {
+			if f.T != snaptype.BorSpans {
+				continue
+			}
+			l = append(l, f)
+		}
+		l, _ = noGaps(noOverlaps(borSegmentsMustExist(dir, l)))
+		res = append(res, l...)
+	}
 
 	return res, missingSnapshots, nil
 }