Merge pull request #128 from ethpandaops/chore/expose-more-cfg

feat(beacons): expose attestation subnet mismatch detection tunables

Author: mattevans

pkg/application/beacons.go

@@ -164,13 +164,43 @@ func (a *Application) createBeaconConfig(address string) *ethereum.Config {
 		if int(a.config.AttestationSubnetCheck.MaxSubnets) != 0 {
 			config.AttestationSubnetConfig.MaxSubnets = int(a.config.AttestationSubnetCheck.MaxSubnets)
 		}
+
+		// Apply mismatch detection settings if provided
+		if a.config.AttestationSubnetCheck.MismatchDetectionWindow != 0 {
+			config.AttestationSubnetConfig.MismatchDetectionWindow = int(a.config.AttestationSubnetCheck.MismatchDetectionWindow)
+		}
+
+		if a.config.AttestationSubnetCheck.MismatchThreshold != 0 {
+			config.AttestationSubnetConfig.MismatchThreshold = int(a.config.AttestationSubnetCheck.MismatchThreshold)
+		}
+
+		if a.config.AttestationSubnetCheck.MismatchCooldownSeconds != 0 {
+			config.AttestationSubnetConfig.MismatchCooldownSeconds = int(a.config.AttestationSubnetCheck.MismatchCooldownSeconds)
+		}
+
+		if a.config.AttestationSubnetCheck.SubnetHighWaterMark != 0 {
+			config.AttestationSubnetConfig.SubnetHighWaterMark = int(a.config.AttestationSubnetCheck.SubnetHighWaterMark)
+		}
 	}
 
 	return config
 }
 
 // createTopicManager creates and configures a topic manager for the beacon node.
 func (a *Application) createTopicManager(ctx context.Context, log logrus.FieldLogger, config *ethereum.Config) (ethereum.TopicManager, error) {
+	// Log attestation subnet configuration
+	if config.AttestationSubnetConfig.Enabled {
+		log.WithFields(logrus.Fields{
+			"max_subnets":               config.AttestationSubnetConfig.MaxSubnets,
+			"mismatch_detection_window": config.AttestationSubnetConfig.MismatchDetectionWindow,
+			"mismatch_threshold":        config.AttestationSubnetConfig.MismatchThreshold,
+			"mismatch_cooldown_seconds": config.AttestationSubnetConfig.MismatchCooldownSeconds,
+			"subnet_high_water_mark":    config.AttestationSubnetConfig.SubnetHighWaterMark,
+		}).Info("Attestation subnet checking enabled")
+	} else {
+		log.Info("Attestation subnet checking disabled")
+	}
+
 	topicManager := ethereum.NewTopicManager(log, &ethereum.TopicConfig{
 		AllTopics:               ethereum.GetDefaultAllTopics(),
 		OptInTopics:             ethereum.GetOptInTopics(),

pkg/config/v1/config.pb.go

@@ -4,7 +4,18 @@ import (
 	"errors"
 )
 
-const defaultMaxSubnets = 2
+const (
+	// Max number of subnets acceptable to monitor.
+	defaultMaxSubnets = 2
+	// Number of slots to track to determine a mismatch.
+	defaultMismatchDetectionWindow = 2
+	// Number of times a detection window mismatch needs to trigger before reconnection.
+	defaultMismatchThreshold = 1
+	// Number of seconds post reconnection before another reconnection can potentially occur.
+	defaultMismatchCooldownSeconds = 300 // 5 minutes.
+	// Number of additional events on subnets other than the advetised allowed before mismatch is triggered.
+	subnetHighWaterMark = 5
+)
 
 // Config defines the configuration for the Ethereum beacon node.
 type Config struct {
@@ -42,10 +53,10 @@ func NewDefaultConfig() *Config {
 		AttestationSubnetConfig: SubnetConfig{
 			Enabled:                 false,
 			MaxSubnets:              defaultMaxSubnets,
-			MismatchDetectionWindow: 32,
-			MismatchThreshold:       1,
-			MismatchCooldownSeconds: 300, // 5 minutes
-			SubnetHighWaterMark:     5,   // Allow up to 5 additional temporary subnets
+			MismatchDetectionWindow: defaultMismatchDetectionWindow,
+			MismatchThreshold:       defaultMismatchThreshold,
+			MismatchCooldownSeconds: defaultMismatchCooldownSeconds,
+			SubnetHighWaterMark:     subnetHighWaterMark,
 		},
 	}
 }

pkg/config/v1/config.pb.validate.go

@@ -70,6 +70,16 @@ message AttestationSubnetCheck {
   // MaxSubnets is the maximum number of subnets a node can be subscribed to
   // before single_attestation topic is disabled.
   uint32 max_subnets = 2 [(buf.validate.field).uint32 = { lte: 64 }];
+  // MismatchDetectionWindow is the number of slots to track for subnet activity.
+  uint32 mismatch_detection_window = 3;
+  // MismatchThreshold is the number of mismatches required before triggering reconnection.
+  uint32 mismatch_threshold = 4;
+  // MismatchCooldownSeconds is the cooldown period between reconnections in seconds.
+  uint32 mismatch_cooldown_seconds = 5;
+  // SubnetHighWaterMark allows temporary participation in additional subnets
+  // without triggering a restart. This accommodates validators temporarily
+  // joining subnets to submit attestations while protecting privacy.
+  uint32 subnet_high_water_mark = 6;
 }