up-bump alpha6

turbo/cli/default_flags.go

@@ -45,6 +45,7 @@ var DefaultFlags = []cli.Flag{
 	&utils.TxPoolCommitEveryFlag,
 	&PruneDistanceFlag,
 	&PruneBlocksDistanceFlag,
+	&PruneKeepAllBlocksFlag,
 	&PruneModeFlag,
 	&BatchSizeFlag,
 	&BodyCacheLimitFlag,

turbo/cli/flags.go

@@ -95,9 +95,13 @@ var (
 		Name:  "prune.distance",
 		Usage: `Keep state history for the latest N blocks (default: everything)`,
 	}
+	PruneKeepAllBlocksFlag = cli.BoolFlag{
+		Name:  "prune.keep-all-blocks",
+		Usage: `Keep the entire block history.`,
+	}
 	PruneBlocksDistanceFlag = cli.Uint64Flag{
 		Name:  "prune.distance.blocks",
-		Usage: `Keep block history for the latest N blocks (default: everything)`,
+		Usage: `Keep block history for the latest N blocks (default: pre-merge history)`,
 	}
 	ExperimentsFlag = cli.StringFlag{
 		Name: "experiments",
@@ -450,7 +454,16 @@ func ApplyFlagsForEthConfigCobra(f *pflag.FlagSet, cfg *ethconfig.Config) {
 	default:
 		utils.Fatalf("error: --prune.mode must be one of archive, full, minimal")
 	}
-	mode.Blocks = prune.Distance(blockDistance)
+
+	var keepAllBlocks bool
+	keepAllBlocksFlagVal := f.Bool(PruneKeepAllBlocksFlag.Name, PruneKeepAllBlocksFlag.Value, PruneKeepAllBlocksFlag.Usage)
+	if keepAllBlocksFlagVal != nil {
+		keepAllBlocks = *keepAllBlocksFlagVal
+	}
+
+	if keepAllBlocks || blockDistance != math.MaxUint64 {
+		mode.Blocks = prune.Distance(blockDistance)
+	}
 	mode.History = prune.Distance(distance)
 
 	cfg.Prune = mode