Merge pull request #81 from ethpandaops/feat/full-exp-cfg

feat: experiment cfg

Author: mattevans

backend/pkg/api/v1/proto/public.pb.go

@@ -1,6 +1,8 @@
 syntax = "proto3";
 package api.v1;
 
+import "google/protobuf/struct.proto";
+
 option go_package = "github.com/ethpandaops/lab/backend/pkg/api/v1/proto";
 
 // This file defines the public REST API layer for all Lab data.
@@ -110,8 +112,7 @@ message GetConfigResponse {
 // FrontendConfig represents the complete frontend configuration for public API consumption.
 message FrontendConfig {
   EthereumConfig ethereum = 1;
-  ModulesConfig modules = 2;
-  ExperimentsConfig experiments = 3;
+  repeated ExperimentConfig experiments = 2;
 }
 
 // EthereumConfig contains Ethereum-related configuration for public API consumption.
@@ -126,9 +127,8 @@ message NetworkConfig {
   int64 chain_id = 3 [json_name = "chainId"];
   string description = 4;
   int64 genesis_time = 5 [json_name = "genesisTime"];
-  map<string, string> service_urls = 6 [json_name = "serviceUrls"];
-  ForkConfig forks = 7;
-  string last_updated = 8 [json_name = "lastUpdated"];
+  ForkConfig forks = 6;
+  string last_updated = 7 [json_name = "lastUpdated"];
 }
 
 // ForkConfig contains fork information for public API consumption.
@@ -147,49 +147,6 @@ message ForkInfo {
   map<string, string> min_client_versions = 2 [json_name = "minClientVersions"];
 }
 
-// ModulesConfig contains all module configurations for public API consumption.
-message ModulesConfig {
-  BeaconChainTimingsModule beacon_chain_timings = 1 [json_name = "beaconChainTimings"];
-  XatuPublicContributorsModule xatu_public_contributors = 2 [json_name = "xatuPublicContributors"];
-  BeaconModule beacon = 3;
-}
-
-// BeaconChainTimingsModule configuration for public API consumption.
-message BeaconChainTimingsModule {
-  repeated string networks = 1;
-  repeated TimeWindow time_windows = 2 [json_name = "timeWindows"];
-  string path_prefix = 3 [json_name = "pathPrefix"];
-}
-
-// XatuPublicContributorsModule configuration for public API consumption.
-message XatuPublicContributorsModule {
-  repeated string networks = 1;
-  repeated TimeWindow time_windows = 2 [json_name = "timeWindows"];
-  string path_prefix = 3 [json_name = "pathPrefix"];
-  bool enabled = 4;
-}
-
-// BeaconModule configuration for public API consumption.
-message BeaconModule {
-  bool enabled = 1;
-  string description = 2;
-  string path_prefix = 3 [json_name = "pathPrefix"];
-  map<string, BeaconNetworkConfig> networks = 4;
-}
-
-// BeaconNetworkConfig contains beacon-specific network configuration for public API consumption.
-message BeaconNetworkConfig {
-  int32 head_lag_slots = 1 [json_name = "headLagSlots"];
-  int32 backlog_days = 2 [json_name = "backlogDays"];
-}
-
-// TimeWindow represents a time window configuration for public API consumption.
-message TimeWindow {
-  string file = 1;
-  string step = 2;
-  string range = 3;
-  string label = 4;
-}
 
 // ExperimentsConfig contains all experiments configuration for public API consumption.
 message ExperimentsConfig {
@@ -201,7 +158,8 @@ message ExperimentConfig {
   string id = 1;
   bool enabled = 2;
   repeated string networks = 3;
-  map<string, ExperimentDataAvailability> data_availability = 4 [json_name = "dataAvailability"];
+  google.protobuf.Struct config = 4;
+  map<string, ExperimentDataAvailability> data_availability = 5 [json_name = "dataAvailability"];
 }
 
 // ExperimentDataAvailability contains data availability information for an experiment on a specific network.

backend/pkg/api/v1/proto/public.proto

@@ -252,11 +252,6 @@ func convertConfigToAPIProto(config *configpb.FrontendConfig) *apiv1.FrontendCon
 				LastUpdated: network.LastUpdated,
 			}
 
-			// Add service URLs if present
-			if len(network.ServiceUrls) > 0 {
-				networkConfig.ServiceUrls = network.ServiceUrls
-			}
-
 			// Add forks if present
 			if network.Forks != nil && network.Forks.Consensus != nil && network.Forks.Consensus.Electra != nil {
 				networkConfig.Forks = &apiv1.ForkConfig{
@@ -275,78 +270,41 @@ func convertConfigToAPIProto(config *configpb.FrontendConfig) *apiv1.FrontendCon
 		result.Ethereum = ethereum
 	}
 
-	// Convert Modules config
-	if config.Modules != nil {
-		modules := &apiv1.ModulesConfig{}
-
-		// Beacon Chain Timings module
-		if config.Modules.BeaconChainTimings != nil {
-			bct := &apiv1.BeaconChainTimingsModule{
-				Networks:   config.Modules.BeaconChainTimings.Networks,
-				PathPrefix: config.Modules.BeaconChainTimings.PathPrefix,
-			}
-
-			if config.Modules.BeaconChainTimings.TimeWindows != nil {
-				timeWindows := make([]*apiv1.TimeWindow, 0, len(config.Modules.BeaconChainTimings.TimeWindows))
-				for _, tw := range config.Modules.BeaconChainTimings.TimeWindows {
-					timeWindows = append(timeWindows, &apiv1.TimeWindow{
-						File:  tw.File,
-						Step:  tw.Step,
-						Range: tw.Range,
-						Label: tw.Label,
-					})
-				}
-
-				bct.TimeWindows = timeWindows
+	// Convert Experiments config
+	if config.Experiments != nil {
+		expConfigs := make([]*apiv1.ExperimentConfig, 0, len(config.Experiments))
+		for _, exp := range config.Experiments {
+			expConfig := &apiv1.ExperimentConfig{
+				Id:       exp.Id,
+				Enabled:  exp.Enabled,
+				Networks: exp.Networks,
 			}
 
-			modules.BeaconChainTimings = bct
-		}
-
-		// Beacon module
-		if config.Modules.Beacon != nil {
-			beacon := &apiv1.BeaconModule{
-				Enabled:     config.Modules.Beacon.Enabled,
-				Description: config.Modules.Beacon.Description,
-				PathPrefix:  config.Modules.Beacon.PathPrefix,
+			// Include config if present
+			if exp.Config != nil {
+				expConfig.Config = exp.Config
 			}
 
-			if len(config.Modules.Beacon.Networks) > 0 {
-				beaconNetworks := make(map[string]*apiv1.BeaconNetworkConfig)
-				for name, netCfg := range config.Modules.Beacon.Networks {
-					beaconNetworks[name] = &apiv1.BeaconNetworkConfig{
-						HeadLagSlots: netCfg.HeadLagSlots,
-						BacklogDays:  netCfg.BacklogDays,
+			// Include data availability if present
+			if exp.DataAvailability != nil {
+				expConfig.DataAvailability = make(map[string]*apiv1.ExperimentDataAvailability)
+				for network, da := range exp.DataAvailability {
+					expConfig.DataAvailability[network] = &apiv1.ExperimentDataAvailability{
+						AvailableFromTimestamp:  da.AvailableFromTimestamp,
+						AvailableUntilTimestamp: da.AvailableUntilTimestamp,
+						MinSlot:                 da.MinSlot,
+						MaxSlot:                 da.MaxSlot,
+						SafeSlot:                da.SafeSlot,
+						HeadSlot:                da.HeadSlot,
+						HasData:                 da.HasData,
 					}
 				}
-
-				beacon.Networks = beaconNetworks
-			}
-
-			modules.Beacon = beacon
-		}
-
-		result.Modules = modules
-	}
-
-	// Convert Experiments config
-	if config.Experiments != nil {
-		experiments := &apiv1.ExperimentsConfig{}
-
-		if config.Experiments.Experiments != nil {
-			expConfigs := make([]*apiv1.ExperimentConfig, 0, len(config.Experiments.Experiments))
-			for _, exp := range config.Experiments.Experiments {
-				expConfigs = append(expConfigs, &apiv1.ExperimentConfig{
-					Id:       exp.Id,
-					Enabled:  exp.Enabled,
-					Networks: exp.Networks,
-				})
 			}
 
-			experiments.Experiments = expConfigs
+			expConfigs = append(expConfigs, expConfig)
 		}
 
-		result.Experiments = experiments
+		result.Experiments = expConfigs
 	}
 
 	return result

backend/pkg/api/v1/rest/handler.go

@@ -7,35 +7,23 @@ import (
 	"github.com/ethpandaops/lab/backend/pkg/internal/lab/geolocation"
 	"github.com/ethpandaops/lab/backend/pkg/internal/lab/storage"
 	"github.com/ethpandaops/lab/backend/pkg/server/internal/grpc"
-	"github.com/ethpandaops/lab/backend/pkg/server/internal/service/beacon_chain_timings"
-	"github.com/ethpandaops/lab/backend/pkg/server/internal/service/beacon_slots"
 	"github.com/ethpandaops/lab/backend/pkg/server/internal/service/cartographoor"
 	"github.com/ethpandaops/lab/backend/pkg/server/internal/service/experiments"
 	"github.com/ethpandaops/lab/backend/pkg/server/internal/service/xatu_cbt"
 )
 
 type Config struct {
-	LogLevel      string                   `yaml:"logLevel" default:"info"`
-	Server        *grpc.Config             `yaml:"grpc"`
-	Storage       *storage.Config          `yaml:"storage"`
-	Modules       map[string]*ModuleConfig `yaml:"modules"`
-	Cache         *cache.Config            `yaml:"cache"`
-	Geolocation   *geolocation.Config      `yaml:"geolocation"`
-	XatuCBT       *xatu_cbt.Config         `yaml:"xatu_cbt"`
-	Cartographoor *cartographoor.Config    `yaml:"cartographoor"`
-	Experiments   *experiments.Config      `yaml:"experiments"`
-}
-
-type ModuleConfig struct {
-	BeaconChainTimings *beacon_chain_timings.Config `yaml:"beacon_chain_timings"`
-	BeaconSlots        *beacon_slots.Config         `yaml:"beacon_slots"`
+	LogLevel      string                `yaml:"logLevel" default:"info"`
+	Server        *grpc.Config          `yaml:"grpc"`
+	Storage       *storage.Config       `yaml:"storage"`
+	Cache         *cache.Config         `yaml:"cache"`
+	Geolocation   *geolocation.Config   `yaml:"geolocation"`
+	XatuCBT       *xatu_cbt.Config      `yaml:"xatu_cbt"`
+	Cartographoor *cartographoor.Config `yaml:"cartographoor"`
+	Experiments   *experiments.Config   `yaml:"experiments"`
 }
 
 func (x *Config) Validate() error {
-	if x.Modules == nil {
-		return fmt.Errorf("modules config is required")
-	}
-
 	if x.Geolocation == nil {
 		return fmt.Errorf("geolocation config is required")
 	}