Add a hidden flag for configuring data column sidecar recovery delay (#9678)

* Add a hidden flag for configuring the recovery delay

* add tests

---------

Co-authored-by: Enrico Del Fante <[email protected]>

Author: jtraglia

ethereum/networks/src/main/java/tech/pegasys/teku/networks/Eth2NetworkConfiguration.java

@@ -36,6 +36,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.OptionalInt;
+import java.util.OptionalLong;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes32;
@@ -128,6 +129,7 @@ public class Eth2NetworkConfiguration {
   private final int pendingAttestationsMaxQueue;
   private final boolean rustKzgEnabled;
   private final int kzgPrecompute;
+  private final OptionalLong dataColumnSidecarRecoveryMaxDelayMillis;
   private final boolean aggregatingAttestationPoolV2Enabled;
   private final boolean aggregatingAttestationPoolProfilingEnabled;
   private final int aggregatingAttestationPoolV2BlockAggregationTimeLimit;
@@ -163,6 +165,7 @@ private Eth2NetworkConfiguration(
       final int pendingAttestationsMaxQueue,
       final boolean rustKzgEnabled,
       final int kzgPrecompute,
+      final OptionalLong dataColumnSidecarRecoveryMaxDelayMillis,
       final boolean aggregatingAttestationPoolV2Enabled,
       final boolean aggregatingAttestationPoolProfilingEnabled,
       final int aggregatingAttestationPoolV2BlockAggregationTimeLimit,
@@ -200,6 +203,7 @@ private Eth2NetworkConfiguration(
     this.pendingAttestationsMaxQueue = pendingAttestationsMaxQueue;
     this.rustKzgEnabled = rustKzgEnabled;
     this.kzgPrecompute = kzgPrecompute;
+    this.dataColumnSidecarRecoveryMaxDelayMillis = dataColumnSidecarRecoveryMaxDelayMillis;
     this.aggregatingAttestationPoolV2Enabled = aggregatingAttestationPoolV2Enabled;
     this.aggregatingAttestationPoolProfilingEnabled = aggregatingAttestationPoolProfilingEnabled;
     this.aggregatingAttestationPoolV2BlockAggregationTimeLimit =
@@ -352,6 +356,10 @@ public int getKzgPrecompute() {
     return kzgPrecompute;
   }
 
+  public OptionalLong getDataColumnSidecarRecoveryMaxDelayMillis() {
+    return dataColumnSidecarRecoveryMaxDelayMillis;
+  }
+
   @Override
   public String toString() {
     return constants;
@@ -472,6 +480,7 @@ public static class Builder {
     private OptionalInt pendingAttestationsMaxQueue = OptionalInt.empty();
     private boolean rustKzgEnabled = DEFAULT_RUST_KZG_ENABLED;
     private int kzgPrecompute = DEFAULT_KZG_PRECOMPUTE;
+    private OptionalLong dataColumnSidecarRecoveryMaxDelayMillis = OptionalLong.empty();
     private boolean strictConfigLoadingEnabled;
     private boolean aggregatingAttestationPoolV2Enabled =
         DEFAULT_AGGREGATING_ATTESTATION_POOL_V2_ENABLED;
@@ -584,6 +593,7 @@ public Eth2NetworkConfiguration build() {
           pendingAttestationsMaxQueue.orElse(DEFAULT_MAX_QUEUE_PENDING_ATTESTATIONS),
           rustKzgEnabled,
           kzgPrecompute,
+          dataColumnSidecarRecoveryMaxDelayMillis,
           aggregatingAttestationPoolV2Enabled,
           aggregatingAttestationPoolProfilingEnabled,
           aggregatingAttestationPoolV2BlockAggregationTimeLimit,
@@ -836,6 +846,13 @@ public Builder kzgPrecompute(final int kzgPrecompute) {
       return this;
     }
 
+    public Builder dataColumnSidecarRecoveryMaxDelayMillis(
+        final Long dataColumnSidecarRecoveryMaxDelayMillis) {
+      this.dataColumnSidecarRecoveryMaxDelayMillis =
+          OptionalLong.of(dataColumnSidecarRecoveryMaxDelayMillis);
+      return this;
+    }
+
     public Builder applyNetworkDefaults(final String networkName) {
       Eth2Network.fromStringLenient(networkName)
           .ifPresentOrElse(

ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/datacolumns/DataColumnSidecarRecoveringCustodyImpl.java

@@ -250,7 +250,7 @@ private void initiateRecovery(
     list.thenAccept(
             sidecars -> {
               LOG.debug(
-                  "Recovery for block: {}. DatacolumnSidecars found: {}",
+                  "Recovery for block: {}. DataColumnSidecars found: {}",
                   block.getSlotAndBlockRoot(),
                   sidecars.size());
               final List<DataColumnSidecar> recoveredSidecars =

services/beaconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainController.java

@@ -820,7 +820,14 @@ protected void initDasCustody() {
             custodyGroupCountManagerLateInit,
             specConfigFulu.getNumberOfColumns(),
             specConfigFulu.getNumberOfCustodyGroups(),
-            slot -> Duration.ofMillis(spec.getMillisPerSlot(slot).dividedBy(3).longValue()),
+            slot -> {
+              final long dataColumnSidecarRecoveryMaxDelayMillis =
+                  beaconConfig
+                      .eth2NetworkConfig()
+                      .getDataColumnSidecarRecoveryMaxDelayMillis()
+                      .orElse(spec.getMillisPerSlot(slot).dividedBy(3).longValue());
+              return Duration.ofMillis(dataColumnSidecarRecoveryMaxDelayMillis);
+            },
             metricsSystem,
             timeProvider);
     eventChannels.subscribe(SlotEventsChannel.class, dataColumnSidecarRecoveringCustody);

teku/src/main/java/tech/pegasys/teku/cli/converter/OptionalLongConverter.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright Consensys Software Inc., 2025
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package tech.pegasys.teku.cli.converter;
+
+import java.util.OptionalLong;
+import picocli.CommandLine;
+
+public class OptionalLongConverter implements CommandLine.ITypeConverter<OptionalLong> {
+
+  @Override
+  public OptionalLong convert(final String s) throws Exception {
+    return OptionalLong.of(Long.parseLong(s));
+  }
+}

teku/src/main/java/tech/pegasys/teku/cli/options/Eth2NetworkOptions.java

@@ -18,6 +18,7 @@
 import static tech.pegasys.teku.spec.constants.NetworkConstants.DEFAULT_SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY;
 
 import java.util.OptionalInt;
+import java.util.OptionalLong;
 import java.util.function.Consumer;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tuweni.bytes.Bytes32;
@@ -27,6 +28,7 @@
 import picocli.CommandLine.Option;
 import tech.pegasys.teku.cli.converter.Bytes32Converter;
 import tech.pegasys.teku.cli.converter.OptionalIntConverter;
+import tech.pegasys.teku.cli.converter.OptionalLongConverter;
 import tech.pegasys.teku.cli.converter.UInt256Converter;
 import tech.pegasys.teku.config.TekuConfiguration;
 import tech.pegasys.teku.infrastructure.exceptions.InvalidConfigurationException;
@@ -118,6 +120,16 @@ public class Eth2NetworkOptions {
       hidden = true)
   private int kzgPrecompute = Eth2NetworkConfiguration.DEFAULT_KZG_PRECOMPUTE;
 
+  @Option(
+      names = {"--Xdata-column-sidecar-recovery-max-delay"},
+      paramLabel = "<MILLISECONDS>",
+      description =
+          "Maximum delay in milliseconds for a supernode to begin data column sidecar recovery.",
+      arity = "1",
+      converter = OptionalLongConverter.class,
+      hidden = true)
+  private OptionalLong dataColumnSidecarRecoveryMaxDelayMillis = OptionalLong.empty();
+
   @Option(
       names = {"--Xfork-choice-late-block-reorg-enabled"},
       paramLabel = "<BOOLEAN>",
@@ -466,6 +478,8 @@ private void configureEth2Network(final Eth2NetworkConfiguration.Builder builder
         .forkChoiceUpdatedAlwaysSendPayloadAttributes(forkChoiceUpdatedAlwaysSendPayloadAttributes)
         .rustKzgEnabled(rustKzgEnabled)
         .kzgPrecompute(kzgPrecompute);
+    dataColumnSidecarRecoveryMaxDelayMillis.ifPresent(
+        builder::dataColumnSidecarRecoveryMaxDelayMillis);
     asyncP2pMaxQueue.ifPresent(builder::asyncP2pMaxQueue);
     pendingAttestationsMaxQueue.ifPresent(builder::pendingAttestationsMaxQueue);
     asyncBeaconChainMaxQueue.ifPresent(builder::asyncBeaconChainMaxQueue);

teku/src/test/java/tech/pegasys/teku/cli/options/Eth2NetworkOptionsTest.java

@@ -21,6 +21,7 @@
 
 import java.math.BigInteger;
 import java.util.Optional;
+import java.util.OptionalLong;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.junit.jupiter.api.Test;
@@ -272,4 +273,32 @@ public void rustKzgFlagCanBeUsedToToggleRustKzgOn() {
     final TekuConfiguration config = getTekuConfigurationFromArguments("--Xrust-kzg-enabled");
     assertThat(config.eth2NetworkConfiguration().isRustKzgEnabled()).isTrue();
   }
+
+  @Test
+  void shouldUseSetDataColumnSidecarRecoveryDelay() {
+    final TekuConfiguration config =
+        getTekuConfigurationFromArguments("--Xdata-column-sidecar-recovery-max-delay", "2300");
+    final OptionalLong maxDelayMillis =
+        config.eth2NetworkConfiguration().getDataColumnSidecarRecoveryMaxDelayMillis();
+    assertThat(maxDelayMillis).hasValue(2300L);
+  }
+
+  @Test
+  void dataColumnSidecarRecoveryDelayEmptyByDefault() {
+    final TekuConfiguration config = getTekuConfigurationFromArguments();
+    final OptionalLong maxDelayMillis =
+        config.eth2NetworkConfiguration().getDataColumnSidecarRecoveryMaxDelayMillis();
+    assertThat(maxDelayMillis).isEmpty();
+  }
+
+  @Test
+  void invalidDataColumnSidecarRecoveryDelayShouldThrow() {
+    assertThatThrownBy(
+            () ->
+                getTekuConfigurationFromArguments(
+                    "--Xdata-column-sidecar-recovery-max-delay", "invalid"))
+        .isInstanceOf(AssertionError.class)
+        .hasMessageContaining(
+            "Invalid value for option '--Xdata-column-sidecar-recovery-max-delay'");
+  }
 }