Simpler algorithm for Seedable algorithm (#9732)

erigontech · Mar 18, 2024 · 3c35bd2 · 3c35bd2
1 parent 114c8b1
commit 3c35bd2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -922,7 +922,7 @@ var (
 	}
 	CaplinArchiveFlag = cli.BoolFlag{
 		Name:  "caplin.archive",
-		Usage: "enables archival node in caplin (Experimental, does not work)",
+		Usage: "enables archival node in caplin",
 		Value: false,
 	}
 	BeaconApiAllowCredentialsFlag = cli.BoolFlag{

diff --git a/erigon-lib/chain/snapcfg/util.go b/erigon-lib/chain/snapcfg/util.go
@@ -280,15 +280,7 @@ type Cfg struct {
 }
 
 func (c Cfg) Seedable(info snaptype.FileInfo) bool {
-	// Caplin uses slots not block numbers, so the merge limit function does not work on some chains like sepolia.
-	var mergeLimit uint64
-	if info.Type.Enum() == snaptype.Enums.BlobSidecars || info.Type.Enum() == snaptype.Enums.BeaconBlocks {
-		mergeLimit = snaptype.Erigon2MergeLimit
-	} else {
-		mergeLimit = c.MergeLimit(info.From)
-	}
-
-	return info.To-info.From == mergeLimit
+	return info.To-info.From == snaptype.Erigon2MergeLimit || info.To-info.From == snaptype.Erigon2OldMergeLimit
 }
 
 func (c Cfg) MergeLimit(fromBlock uint64) uint64 {