Merge pull request #123 from ethpandaops/release/attnets-support

release(contributoor): attnets support

Author: mattevans

.github/typos.toml

@@ -0,0 +1,2 @@
+[files]
+extend-exclude = ["pkg/ethereum/node_identity_test.go"]

.github/workflows/alpha-release.yml

@@ -23,10 +23,19 @@ jobs:
           RELEASE_SUFFIX=${GITHUB_REF#refs/heads/release/}
 
           # Fetch all tags and get the latest that matches the pattern
-          # Using the refs/tags API
-          LATEST_VERSION=$(curl --silent "https://api.github.com/repos/$GITHUB_REPOSITORY/git/refs/tags" \
-                      | jq -r --arg suffix "$RELEASE_SUFFIX" '.[] | select(.ref | test("refs/tags/v?[0-9]+\\.[0-9]+\\.[0-9]+-" + $suffix + "$")) | .ref' \
+          # Using the refs/tags API with authentication
+          LATEST_VERSION=$(curl --silent -H "Authorization: token $GITHUB_TOKEN" \
+                      "https://api.github.com/repos/$GITHUB_REPOSITORY/git/refs/tags" \
+                      | jq -r --arg suffix "$RELEASE_SUFFIX" \
+                      'if type == "array" then .[] | select(.ref | test("refs/tags/v?[0-9]+\\.[0-9]+\\.[0-9]+-" + $suffix + "$")) | .ref else empty end' \
                       | sed 's|refs/tags/||' | sort -V | tail -n 1)
+
+          # Alternative: Use git commands directly which is more reliable
+          if [[ -z "$LATEST_VERSION" ]]; then
+            echo "API call failed or returned no results, trying git command..."
+            LATEST_VERSION=$(git tag -l "*-${RELEASE_SUFFIX}" | grep -E "^v?[0-9]+\.[0-9]+\.[0-9]+-${RELEASE_SUFFIX}$" | sort -V | tail -n 1)
+          fi
+
           echo "Found latest $RELEASE_SUFFIX version: $LATEST_VERSION"
 
           # Default to 0.0.0 if no matching release was found

.github/workflows/check-typos.yml

@@ -13,4 +13,6 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Check for typos
-        uses: crate-ci/typos@392b78fe18a52790c53f42456e46124f77346842 # v1.34.0
+        uses: crate-ci/typos@392b78fe18a52790c53f42456e46124f77346842 # v1.34.0
+        with:
+          config: .github/typos.toml

cmd/sentry/config.go

@@ -13,7 +13,35 @@ import (
 
 // applyConfigOverridesFromFlags applies CLI flags to the config if they are set.
 func applyConfigOverridesFromFlags(cfg *config.Config, c *cli.Context) error {
-	// Apply environment variables first, then override with CLI flags if set
+	// Apply network configuration
+	if err := applyNetworkConfig(cfg, c); err != nil {
+		return err
+	}
+
+	// Apply service addresses
+	applyServiceAddresses(cfg, c)
+
+	// Apply logging configuration
+	applyLoggingConfig(cfg, c)
+
+	// Apply output server configuration
+	if err := applyOutputServerConfig(cfg, c); err != nil {
+		return err
+	}
+
+	// Apply contributoor directory
+	applyContributoorDirectory(cfg, c)
+
+	// Apply attestation subnet configuration
+	if err := applyAttestationSubnetConfig(cfg, c); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// applyNetworkConfig applies network configuration from env and CLI.
+func applyNetworkConfig(cfg *config.Config, c *cli.Context) error {
 	if network := os.Getenv("CONTRIBUTOOR_NETWORK"); network != "" {
 		log.Infof("Setting network from env to %s", network)
 
@@ -30,6 +58,12 @@ func applyConfigOverridesFromFlags(cfg *config.Config, c *cli.Context) error {
 		}
 	}
 
+	return nil
+}
+
+// applyServiceAddresses applies service address configurations.
+func applyServiceAddresses(cfg *config.Config, c *cli.Context) {
+	// Beacon node address
 	if addr := os.Getenv("CONTRIBUTOOR_BEACON_NODE_ADDRESS"); addr != "" {
 		log.Infof("Setting beacon node address from env")
 		cfg.SetBeaconNodeAddress(addr)
@@ -40,6 +74,7 @@ func applyConfigOverridesFromFlags(cfg *config.Config, c *cli.Context) error {
 		cfg.SetBeaconNodeAddress(c.String("beacon-node-address"))
 	}
 
+	// Metrics address
 	if addr := os.Getenv("CONTRIBUTOOR_METRICS_ADDRESS"); addr != "" {
 		log.Infof("Setting metrics address from env to %s", addr)
 		cfg.SetMetricsAddress(addr)
@@ -50,6 +85,7 @@ func applyConfigOverridesFromFlags(cfg *config.Config, c *cli.Context) error {
 		cfg.SetMetricsAddress(c.String("metrics-address"))
 	}
 
+	// Health check address
 	if addr := os.Getenv("CONTRIBUTOOR_HEALTH_CHECK_ADDRESS"); addr != "" {
 		log.Infof("Setting health check address from env to %s", addr)
 		cfg.SetHealthCheckAddress(addr)
@@ -59,7 +95,10 @@ func applyConfigOverridesFromFlags(cfg *config.Config, c *cli.Context) error {
 		log.Infof("Overriding health check address from CLI to %s", c.String("health-check-address"))
 		cfg.SetHealthCheckAddress(c.String("health-check-address"))
 	}
+}
 
+// applyLoggingConfig applies logging configuration.
+func applyLoggingConfig(cfg *config.Config, c *cli.Context) {
 	if level := os.Getenv("CONTRIBUTOOR_LOG_LEVEL"); level != "" {
 		log.Infof("Setting log level from env to %s", level)
 		cfg.SetLogLevel(level)
@@ -69,7 +108,11 @@ func applyConfigOverridesFromFlags(cfg *config.Config, c *cli.Context) error {
 		log.Infof("Overriding log level from CLI to %s", c.String("log-level"))
 		cfg.SetLogLevel(c.String("log-level"))
 	}
+}
 
+// applyOutputServerConfig applies output server configuration.
+func applyOutputServerConfig(cfg *config.Config, c *cli.Context) error {
+	// Address
 	if addr := os.Getenv("CONTRIBUTOOR_OUTPUT_SERVER_ADDRESS"); addr != "" {
 		log.Infof("Setting output server address from env")
 		cfg.SetOutputServerAddress(addr)
@@ -80,7 +123,17 @@ func applyConfigOverridesFromFlags(cfg *config.Config, c *cli.Context) error {
 		cfg.SetOutputServerAddress(c.String("output-server-address"))
 	}
 
-	// Handle credentials from env
+	// Credentials
+	if err := applyOutputServerCredentials(cfg, c); err != nil {
+		return err
+	}
+
+	// TLS
+	return applyOutputServerTLS(cfg, c)
+}
+
+// applyOutputServerCredentials applies output server credentials.
+func applyOutputServerCredentials(cfg *config.Config, c *cli.Context) error {
 	var (
 		username = os.Getenv("CONTRIBUTOOR_USERNAME")
 		password = os.Getenv("CONTRIBUTOOR_PASSWORD")
@@ -105,6 +158,11 @@ func applyConfigOverridesFromFlags(cfg *config.Config, c *cli.Context) error {
 		)
 	}
 
+	return nil
+}
+
+// applyOutputServerTLS applies output server TLS configuration.
+func applyOutputServerTLS(cfg *config.Config, c *cli.Context) error {
 	if tls := os.Getenv("CONTRIBUTOOR_OUTPUT_SERVER_TLS"); tls != "" {
 		log.Infof("Setting output server tls from env to %s", tls)
 
@@ -127,17 +185,226 @@ func applyConfigOverridesFromFlags(cfg *config.Config, c *cli.Context) error {
 		cfg.SetOutputServerTLS(tls)
 	}
 
-	// Handle contributoor directory from env
+	return nil
+}
+
+// applyContributoorDirectory applies contributoor directory configuration.
+func applyContributoorDirectory(cfg *config.Config, c *cli.Context) {
 	if dir := os.Getenv("CONTRIBUTOOR_DIRECTORY"); dir != "" {
 		log.Infof("Setting contributoor directory from env to %s", dir)
 		cfg.ContributoorDirectory = dir
 	}
 
-	// CLI flag overrides env var
 	if c.String("contributoor-directory") != "" {
 		log.Infof("Overriding contributoor directory from CLI to %s", c.String("contributoor-directory"))
 		cfg.ContributoorDirectory = c.String("contributoor-directory")
 	}
+}
+
+// applyAttestationSubnetConfig applies attestation subnet configuration.
+func applyAttestationSubnetConfig(cfg *config.Config, c *cli.Context) error {
+	// Handle enabled flag from env
+	if enabled := os.Getenv("CONTRIBUTOOR_ATTESTATION_SUBNET_CHECK_ENABLED"); enabled != "" {
+		log.Infof("Setting attestation subnet check enabled from env to %s", enabled)
+
+		enabledBool, err := strconv.ParseBool(enabled)
+		if err != nil {
+			return errors.Wrap(err, "failed to parse attestation subnet check enabled env var")
+		}
+
+		if cfg.AttestationSubnetCheck == nil {
+			cfg.AttestationSubnetCheck = &config.AttestationSubnetCheck{}
+		}
+
+		cfg.AttestationSubnetCheck.Enabled = enabledBool
+		cfg.AttestationSubnetCheck.MaxSubnets = 2
+	}
+
+	// Handle max subnets from env
+	if maxSubnets := os.Getenv("CONTRIBUTOOR_ATTESTATION_SUBNET_MAX_SUBNETS"); maxSubnets != "" {
+		log.Infof("Setting attestation subnet max subnets from env to %s", maxSubnets)
+
+		maxSubnetsInt, err := strconv.ParseUint(maxSubnets, 10, 32)
+		if err != nil {
+			return errors.Wrap(err, "failed to parse attestation subnet max subnets env var")
+		}
+
+		if cfg.AttestationSubnetCheck == nil {
+			cfg.AttestationSubnetCheck = &config.AttestationSubnetCheck{}
+		}
+
+		cfg.AttestationSubnetCheck.MaxSubnets = uint32(maxSubnetsInt)
+	}
+
+	// CLI flag overrides env var for enabled
+	if c.Bool("attestation-subnet-check-enabled") {
+		log.Infof("Setting attestation subnet check enabled from CLI to true")
+
+		if cfg.AttestationSubnetCheck == nil {
+			cfg.AttestationSubnetCheck = &config.AttestationSubnetCheck{}
+		}
+
+		cfg.AttestationSubnetCheck.Enabled = true
+	}
+
+	// CLI flag overrides env var for max subnets
+	if c.Int("attestation-subnet-max-subnets") >= 0 { // -1 means not set
+		log.Infof("Setting attestation subnet max subnets from CLI to %d", c.Int("attestation-subnet-max-subnets"))
+
+		if cfg.AttestationSubnetCheck == nil {
+			cfg.AttestationSubnetCheck = &config.AttestationSubnetCheck{}
+		}
+
+		cfg.AttestationSubnetCheck.MaxSubnets = uint32(c.Int("attestation-subnet-max-subnets")) //nolint:gosec // conversion fine.
+	}
+
+	// Handle mismatch detection window
+	if err := applyMismatchDetectionWindow(cfg, c); err != nil {
+		return err
+	}
+
+	// Handle mismatch threshold
+	if err := applyMismatchThreshold(cfg, c); err != nil {
+		return err
+	}
+
+	// Handle mismatch cooldown
+	if err := applyMismatchCooldown(cfg, c); err != nil {
+		return err
+	}
+
+	// Handle subnet high water mark
+	if err := applySubnetHighWaterMark(cfg, c); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// applyMismatchDetectionWindow applies mismatch detection window configuration.
+func applyMismatchDetectionWindow(cfg *config.Config, c *cli.Context) error {
+	// Handle env var
+	if window := os.Getenv("CONTRIBUTOOR_ATTESTATION_SUBNET_MISMATCH_DETECTION_WINDOW"); window != "" {
+		log.Infof("Setting attestation subnet mismatch detection window from env to %s", window)
+
+		windowInt, err := strconv.ParseUint(window, 10, 32)
+		if err != nil {
+			return errors.Wrap(err, "failed to parse attestation subnet mismatch detection window env var")
+		}
+
+		if cfg.AttestationSubnetCheck == nil {
+			cfg.AttestationSubnetCheck = &config.AttestationSubnetCheck{}
+		}
+
+		cfg.AttestationSubnetCheck.MismatchDetectionWindow = uint32(windowInt)
+	}
+
+	// CLI flag overrides env var
+	if c.Int("attestation-subnet-mismatch-detection-window") >= 0 { // -1 means not set
+		log.Infof("Setting attestation subnet mismatch detection window from CLI to %d", c.Int("attestation-subnet-mismatch-detection-window"))
+
+		if cfg.AttestationSubnetCheck == nil {
+			cfg.AttestationSubnetCheck = &config.AttestationSubnetCheck{}
+		}
+
+		cfg.AttestationSubnetCheck.MismatchDetectionWindow = uint32(c.Int("attestation-subnet-mismatch-detection-window")) //nolint:gosec // conversion fine.
+	}
+
+	return nil
+}
+
+// applyMismatchThreshold applies mismatch threshold configuration.
+func applyMismatchThreshold(cfg *config.Config, c *cli.Context) error {
+	// Handle env var
+	if threshold := os.Getenv("CONTRIBUTOOR_ATTESTATION_SUBNET_MISMATCH_THRESHOLD"); threshold != "" {
+		log.Infof("Setting attestation subnet mismatch threshold from env to %s", threshold)
+
+		thresholdInt, err := strconv.ParseUint(threshold, 10, 32)
+		if err != nil {
+			return errors.Wrap(err, "failed to parse attestation subnet mismatch threshold env var")
+		}
+
+		if cfg.AttestationSubnetCheck == nil {
+			cfg.AttestationSubnetCheck = &config.AttestationSubnetCheck{}
+		}
+
+		cfg.AttestationSubnetCheck.MismatchThreshold = uint32(thresholdInt)
+	}
+
+	// CLI flag overrides env var
+	if c.Int("attestation-subnet-mismatch-threshold") >= 0 { // -1 means not set
+		log.Infof("Setting attestation subnet mismatch threshold from CLI to %d", c.Int("attestation-subnet-mismatch-threshold"))
+
+		if cfg.AttestationSubnetCheck == nil {
+			cfg.AttestationSubnetCheck = &config.AttestationSubnetCheck{}
+		}
+
+		cfg.AttestationSubnetCheck.MismatchThreshold = uint32(c.Int("attestation-subnet-mismatch-threshold")) //nolint:gosec // conversion fine.
+	}
+
+	return nil
+}
+
+// applyMismatchCooldown applies mismatch cooldown configuration.
+func applyMismatchCooldown(cfg *config.Config, c *cli.Context) error {
+	// Handle env var
+	if cooldown := os.Getenv("CONTRIBUTOOR_ATTESTATION_SUBNET_MISMATCH_COOLDOWN_SECONDS"); cooldown != "" {
+		log.Infof("Setting attestation subnet mismatch cooldown from env to %s seconds", cooldown)
+
+		cooldownInt, err := strconv.ParseUint(cooldown, 10, 32)
+		if err != nil {
+			return errors.Wrap(err, "failed to parse attestation subnet mismatch cooldown env var")
+		}
+
+		if cfg.AttestationSubnetCheck == nil {
+			cfg.AttestationSubnetCheck = &config.AttestationSubnetCheck{}
+		}
+
+		cfg.AttestationSubnetCheck.MismatchCooldownSeconds = uint32(cooldownInt)
+	}
+
+	// CLI flag overrides env var
+	if c.Int("attestation-subnet-mismatch-cooldown-seconds") >= 0 { // -1 means not set
+		log.Infof("Setting attestation subnet mismatch cooldown from CLI to %d seconds", c.Int("attestation-subnet-mismatch-cooldown-seconds"))
+
+		if cfg.AttestationSubnetCheck == nil {
+			cfg.AttestationSubnetCheck = &config.AttestationSubnetCheck{}
+		}
+
+		cfg.AttestationSubnetCheck.MismatchCooldownSeconds = uint32(c.Int("attestation-subnet-mismatch-cooldown-seconds")) //nolint:gosec // conversion fine.
+	}
+
+	return nil
+}
+
+// applySubnetHighWaterMark applies subnet high water mark configuration.
+func applySubnetHighWaterMark(cfg *config.Config, c *cli.Context) error {
+	// Handle env var
+	if watermark := os.Getenv("CONTRIBUTOOR_ATTESTATION_SUBNET_HIGH_WATER_MARK"); watermark != "" {
+		log.Infof("Setting attestation subnet high water mark from env to %s", watermark)
+
+		watermarkInt, err := strconv.ParseUint(watermark, 10, 32)
+		if err != nil {
+			return errors.Wrap(err, "failed to parse attestation subnet high water mark env var")
+		}
+
+		if cfg.AttestationSubnetCheck == nil {
+			cfg.AttestationSubnetCheck = &config.AttestationSubnetCheck{}
+		}
+
+		cfg.AttestationSubnetCheck.SubnetHighWaterMark = uint32(watermarkInt)
+	}
+
+	// CLI flag overrides env var
+	if c.Int("attestation-subnet-high-water-mark") >= 0 { // -1 means not set
+		log.Infof("Setting attestation subnet high water mark from CLI to %d", c.Int("attestation-subnet-high-water-mark"))
+
+		if cfg.AttestationSubnetCheck == nil {
+			cfg.AttestationSubnetCheck = &config.AttestationSubnetCheck{}
+		}
+
+		cfg.AttestationSubnetCheck.SubnetHighWaterMark = uint32(c.Int("attestation-subnet-high-water-mark")) //nolint:gosec // conversion fine.
+	}
 
 	return nil
 }