add flags for configurable hours of blob data

validator/cmd/main.go

@@ -59,6 +59,6 @@ func Main() cliapp.LifecycleAction {
 		beaconClient := service.NewBlobSidecarClient(cfg.BeaconConfig.BeaconURL)
 		blobClient := service.NewBlobSidecarClient(cfg.BlobConfig.BeaconURL)
 
-		return service.NewValidator(l, headerClient, beaconClient, blobClient, closeApp), nil
+		return service.NewValidator(l, headerClient, beaconClient, blobClient, closeApp, cfg.BlocksPerMinuteConfig*cfg.HoursOfBlobDataConfig*60), nil
 	}
 }

validator/flags/config.go

@@ -10,9 +10,11 @@ import (
 )
 
 type ValidatorConfig struct {
-	LogConfig    oplog.CLIConfig
-	BeaconConfig common.BeaconConfig
-	BlobConfig   common.BeaconConfig
+	LogConfig             oplog.CLIConfig
+	BeaconConfig          common.BeaconConfig
+	BlobConfig            common.BeaconConfig
+	BlocksPerMinuteConfig int
+	HoursOfBlobDataConfig int
 }
 
 func (c ValidatorConfig) Check() error {
@@ -24,6 +26,14 @@ func (c ValidatorConfig) Check() error {
 		return fmt.Errorf("blob config check failed: %w", err)
 	}
 
+	if c.BlocksPerMinuteConfig <= 0 {
+		return fmt.Errorf("blocks per minute must be greater than 0")
+	}
+
+	if c.HoursOfBlobDataConfig <= 0 {
+		return fmt.Errorf("hours of blob data must be greater than 0")
+	}
+
 	return nil
 }
 
@@ -40,5 +50,7 @@ func ReadConfig(cliCtx *cli.Context) ValidatorConfig {
 			BeaconURL:           cliCtx.String(BlobApiClientUrlFlag.Name),
 			BeaconClientTimeout: timeout,
 		},
+		BlocksPerMinuteConfig: cliCtx.Int(BeaconClientTimeoutFlag.Name),
+		HoursOfBlobDataConfig: cliCtx.Int(HoursOfBlobDataClientFlag.Name),
 	}
 }

validator/flags/flags.go

@@ -27,6 +27,20 @@ var (
 		Required: true,
 		EnvVars:  opservice.PrefixEnvVar(EnvVarPrefix, "BLOB_API_HTTP"),
 	}
+	BlocksPerMinuteClientFlag = &cli.IntFlag{
+		Name:     "blocks-per-minute",
+		Usage:    "The number of blocks per minute",
+		Value:    5,
+		Required: true,
+		EnvVars:  opservice.PrefixEnvVar(EnvVarPrefix, "BLOCKS_PER_MINUTE"),
+	}
+	HoursOfBlobDataClientFlag = &cli.IntFlag{
+		Name:     "hours-of-blob-data",
+		Usage:    "The number of hours of blob data to fetch",
+		Value:    2,
+		Required: true,
+		EnvVars:  opservice.PrefixEnvVar(EnvVarPrefix, "HOURS_OF_BLOB_DATA"),
+	}
 )
 
 func init() {

validator/service/service.go

@@ -21,8 +21,6 @@ import (
 var ErrAlreadyStopped = errors.New("already stopped")
 
 const (
-	// 5 blocks per minute, 120 minutes
-	twoHoursOfBlocks = 5 * 120
 	// finalized l1 offset
 	finalizedL1Offset = 64
 	// Known log for any validation errors
@@ -31,23 +29,25 @@ const (
 	retryAttempts = 10
 )
 
-func NewValidator(l log.Logger, headerClient client.BeaconBlockHeadersProvider, beaconAPI BlobSidecarClient, blobAPI BlobSidecarClient, app context.CancelCauseFunc) *ValidatorService {
+func NewValidator(l log.Logger, headerClient client.BeaconBlockHeadersProvider, beaconAPI BlobSidecarClient, blobAPI BlobSidecarClient, app context.CancelCauseFunc, hoursOfBlocks int) *ValidatorService {
 	return &ValidatorService{
-		log:          l,
-		headerClient: headerClient,
-		beaconAPI:    beaconAPI,
-		blobAPI:      blobAPI,
-		closeApp:     app,
+		log:           l,
+		headerClient:  headerClient,
+		beaconAPI:     beaconAPI,
+		blobAPI:       blobAPI,
+		closeApp:      app,
+		hoursOfBlocks: hoursOfBlocks,
 	}
 }
 
 type ValidatorService struct {
-	stopped      atomic.Bool
-	log          log.Logger
-	headerClient client.BeaconBlockHeadersProvider
-	beaconAPI    BlobSidecarClient
-	blobAPI      BlobSidecarClient
-	closeApp     context.CancelCauseFunc
+	stopped       atomic.Bool
+	log           log.Logger
+	headerClient  client.BeaconBlockHeadersProvider
+	beaconAPI     BlobSidecarClient
+	blobAPI       BlobSidecarClient
+	closeApp      context.CancelCauseFunc
+	hoursOfBlocks int
 }
 
 // Start starts the validator service. This will fetch the current range of blocks to validate and start the validation
@@ -64,7 +64,7 @@ func (a *ValidatorService) Start(ctx context.Context) error {
 	}
 
 	end := header.Data.Header.Message.Slot - finalizedL1Offset
-	start := end - twoHoursOfBlocks
+	start := end - phase0.Slot(a.hoursOfBlocks)
 
 	go a.checkBlobs(ctx, start, end)