Avoid dropping sidecars tracker on block import in Gloas

beacon/sync/src/testFixtures/java/tech/pegasys/teku/beacon/sync/SyncingNodeManager.java

@@ -179,6 +179,7 @@ public static SyncingNodeManager create(
             recentChainData,
             blockImporter,
             blockEventsListenerRouter,
+            () -> DataAvailabilitySampler.NOOP,
             pendingBlockPool,
             futureBlocks,
             invalidBlockRoots,

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/statetransition/availability/AvailabilityChecker.java

@@ -16,6 +16,7 @@
 import static tech.pegasys.teku.spec.logic.common.statetransition.availability.DataAndValidationResult.notRequiredResultFuture;
 
 import java.util.Optional;
+import org.apache.logging.log4j.Logger;
 import tech.pegasys.teku.infrastructure.async.SafeFuture;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobSidecar;
@@ -36,6 +37,12 @@ public boolean initiateDataAvailabilityCheck() {
     public SafeFuture<DataAndValidationResult<Data>> getAvailabilityCheckResult() {
       return notRequiredResultFuture();
     }
+
+    @Override
+    public SafeFuture<DataAndValidationResult<Data>> getAndLogAvailabilityCheckResult(
+        final Logger log) {
+      return getAvailabilityCheckResult();
+    }
   }
 
   AvailabilityChecker<?> NOOP = new NOOP<>();
@@ -53,4 +60,14 @@ public SafeFuture<DataAndValidationResult<Data>> getAvailabilityCheckResult() {
   boolean initiateDataAvailabilityCheck();
 
   SafeFuture<DataAndValidationResult<Data>> getAvailabilityCheckResult();
+
+  default SafeFuture<DataAndValidationResult<Data>> getAndLogAvailabilityCheckResult(
+      final Logger log) {
+    return getAvailabilityCheckResult().thenPeek(result -> logAvailabilityCheckResult(log, result));
+  }
+
+  default void logAvailabilityCheckResult(
+      final Logger log, final DataAndValidationResult<Data> result) {
+    log.debug("Data availability check result: {}", result.toLogString());
+  }
 }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/statetransition/availability/AvailabilityCheckerFactory.java

@@ -16,6 +16,7 @@
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobSidecar;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
+import tech.pegasys.teku.spec.datastructures.epbs.versions.gloas.SignedExecutionPayloadEnvelope;
 
 @FunctionalInterface
 public interface AvailabilityCheckerFactory<T> {
@@ -25,4 +26,9 @@ public interface AvailabilityCheckerFactory<T> {
       block -> AvailabilityChecker.NOOP_DATACOLUMN_SIDECAR;
 
   AvailabilityChecker<T> createAvailabilityChecker(SignedBeaconBlock block);
+
+  default AvailabilityChecker<T> createAvailabilityChecker(
+      final SignedBeaconBlock block, final SignedExecutionPayloadEnvelope signedEnvelope) {
+    return createAvailabilityChecker(block);
+  }
 }

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/util/ForkChoiceUtil.java

@@ -875,10 +875,14 @@ public AvailabilityChecker<?> createAvailabilityCheckerOnBlock(final SignedBeaco
   }
 
   public AvailabilityChecker<?> createAvailabilityCheckerOnExecutionPayloadEnvelope(
-      final SignedBeaconBlock block) {
+      final SignedBeaconBlock block, final SignedExecutionPayloadEnvelope signedEnvelope) {
     return AvailabilityChecker.NOOP;
   }
 
+  public boolean isDataAvailabilityCheckDeferredToExecutionPayloadEnvelope() {
+    return false;
+  }
+
   // Used for computing committee indices when producing attestations.
   public int computeCommitteeIndexForAttestation(
       final UInt64 slot,

ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/versions/gloas/util/ForkChoiceUtilGloas.java

@@ -164,14 +164,19 @@ public AvailabilityChecker<?> createAvailabilityCheckerOnBlock(final SignedBeaco
 
   @Override
   public AvailabilityChecker<?> createAvailabilityCheckerOnExecutionPayloadEnvelope(
-      final SignedBeaconBlock block) {
+      final SignedBeaconBlock block, final SignedExecutionPayloadEnvelope signedEnvelope) {
     final AvailabilityCheckerFactory<UInt64> factory =
         this.dataColumnSidecarAvailabilityCheckerFactory;
     if (factory == null) {
       throw new IllegalStateException(
           "DataColumnSidecarAvailabilityCheckerFactory not initialized");
     }
-    return factory.createAvailabilityChecker(block);
+    return factory.createAvailabilityChecker(block, signedEnvelope);
+  }
+
+  @Override
+  public boolean isDataAvailabilityCheckDeferredToExecutionPayloadEnvelope() {
+    return true;
   }
 
   @Override

ethereum/spec/src/test/java/tech/pegasys/teku/spec/logic/common/util/ForkChoiceUtilTest.java

@@ -44,6 +44,7 @@
 import tech.pegasys.teku.spec.datastructures.blocks.BlockCheckpoints;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBlockAndState;
+import tech.pegasys.teku.spec.datastructures.epbs.versions.gloas.SignedExecutionPayloadEnvelope;
 import tech.pegasys.teku.spec.datastructures.forkchoice.ForkChoiceNode;
 import tech.pegasys.teku.spec.datastructures.forkchoice.ForkChoiceReorgContext;
 import tech.pegasys.teku.spec.datastructures.forkchoice.MutableStore;
@@ -72,6 +73,12 @@ class ForkChoiceUtilTest {
 
   private final ForkChoiceUtil forkChoiceUtil = spec.getGenesisSpec().getForkChoiceUtil();
 
+  @Test
+  void isDataAvailabilityCheckDeferredToExecutionPayloadEnvelope_shouldDefaultToFalse() {
+    assertThat(forkChoiceUtil.isDataAvailabilityCheckDeferredToExecutionPayloadEnvelope())
+        .isFalse();
+  }
+
   @Test
   void getAncestors_shouldGetSimpleSequenceOfAncestors() {
     chainBuilder.generateBlocksUpToSlot(10);
@@ -332,20 +339,23 @@ void createAvailabilityCheckerOnExecutionPayloadEnvelope_shouldCreateExpectedAva
         mock(AvailabilityCheckerFactory.class);
 
     final SignedBeaconBlock block = mock(SignedBeaconBlock.class);
+    final SignedExecutionPayloadEnvelope signedEnvelope =
+        mock(SignedExecutionPayloadEnvelope.class);
 
     spec.reinitializeForTesting(
         blobSidecarAvailabilityCheckerFactory,
         dataColumnSidecarAvailabilityCheckerFactory,
         KZG.DISABLED);
 
     final AvailabilityChecker<?> availabilityChecker =
-        util.createAvailabilityCheckerOnExecutionPayloadEnvelope(block);
+        util.createAvailabilityCheckerOnExecutionPayloadEnvelope(block, signedEnvelope);
 
     switch (milestone) {
       case PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB, ELECTRA, FULU ->
           assertThat(availabilityChecker).isSameAs(AvailabilityChecker.NOOP);
       case GLOAS, HEZE ->
-          verify(dataColumnSidecarAvailabilityCheckerFactory).createAvailabilityChecker(block);
+          verify(dataColumnSidecarAvailabilityCheckerFactory)
+              .createAvailabilityChecker(block, signedEnvelope);
       default -> throw new IllegalStateException("Unexpected milestone " + milestone);
     }
   }

ethereum/spec/src/test/java/tech/pegasys/teku/spec/logic/versions/gloas/util/ForkChoiceUtilGloasTest.java

@@ -70,6 +70,11 @@ void setUp() {
     justifiedState = dataStructureUtil.randomBeaconState(gloasSlot);
   }
 
+  @Test
+  void isDataAvailabilityCheckDeferredToExecutionPayloadEnvelope_shouldReturnTrue() {
+    assertThat(forkChoiceUtil.isDataAvailabilityCheckDeferredToExecutionPayloadEnvelope()).isTrue();
+  }
+
   @Test
   void getPayloadAttributeWithdrawalsUsesEffectiveState() {
     final UInt64 stateSlot = gloasSlot.plus(spec.getSlotsPerEpoch(gloasSlot));

ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/blobs/BlockEventsListener.java

@@ -35,5 +35,9 @@ public void enableBlockImportOnCompletion(final SignedBeaconBlock block) {}
 
   void removeAllForBlock(SlotAndBlockRoot slotAndBlockRoot);
 
+  default void onBlockImported(final SignedBeaconBlock block) {
+    removeAllForBlock(block.getSlotAndBlockRoot());
+  }
+
   void enableBlockImportOnCompletion(SignedBeaconBlock block);
 }

ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/blobs/BlockEventsListenerRouter.java

@@ -64,6 +64,11 @@ public void removeAllForBlock(final SlotAndBlockRoot slotAndBlockRoot) {
     lookupBlockEventsListener(slotAndBlockRoot.getSlot()).removeAllForBlock(slotAndBlockRoot);
   }
 
+  @Override
+  public void onBlockImported(final SignedBeaconBlock block) {
+    lookupBlockEventsListener(block.getSlot()).onBlockImported(block);
+  }
+
   @Override
   public void enableBlockImportOnCompletion(final SignedBeaconBlock block) {
     lookupBlockEventsListener(block.getSlot()).enableBlockImportOnCompletion(block);

ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/block/BlockManager.java

@@ -18,6 +18,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.RejectedExecutionException;
+import java.util.function.Supplier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.tuweni.bytes.Bytes32;
@@ -38,6 +39,7 @@
 import tech.pegasys.teku.spec.logic.common.statetransition.results.BlockImportResult.FailureReason;
 import tech.pegasys.teku.statetransition.blobs.BlockEventsListener;
 import tech.pegasys.teku.statetransition.blobs.RemoteOrigin;
+import tech.pegasys.teku.statetransition.execution.ExecutionPayloadEventsListener;
 import tech.pegasys.teku.statetransition.execution.ReceivedExecutionPayloadEventsChannel;
 import tech.pegasys.teku.statetransition.util.FutureItems;
 import tech.pegasys.teku.statetransition.util.PendingBlockPool;
@@ -56,6 +58,7 @@ public class BlockManager extends Service
   private final RecentChainData recentChainData;
   private final BlockImporter blockImporter;
   private final BlockEventsListener blockEventsListener;
+  private final Supplier<ExecutionPayloadEventsListener> executionPayloadEventsListenerSupplier;
   private final PendingBlockPool pendingBlockPool;
   private final BlockValidator blockValidator;
   private final TimeProvider timeProvider;
@@ -79,6 +82,7 @@ public BlockManager(
       final RecentChainData recentChainData,
       final BlockImporter blockImporter,
       final BlockEventsListener blockEventsListener,
+      final Supplier<ExecutionPayloadEventsListener> executionPayloadEventsListenerSupplier,
       final PendingBlockPool pendingBlockPool,
       final FutureItems<SignedBeaconBlock> futureBlocks,
       final Map<Bytes32, BlockImportResult> invalidBlockRoots,
@@ -89,6 +93,7 @@ public BlockManager(
     this.recentChainData = recentChainData;
     this.blockImporter = blockImporter;
     this.blockEventsListener = blockEventsListener;
+    this.executionPayloadEventsListenerSupplier = executionPayloadEventsListenerSupplier;
     this.pendingBlockPool = pendingBlockPool;
     this.futureBlocks = futureBlocks;
     this.invalidBlockRoots = invalidBlockRoots;
@@ -206,7 +211,7 @@ public void onBlockValidated(final SignedBeaconBlock block) {
 
   @Override
   public void onBlockImported(final SignedBeaconBlock block, final boolean executionOptimistic) {
-    blockEventsListener.removeAllForBlock(block.getSlotAndBlockRoot());
+    blockEventsListener.onBlockImported(block);
     pendingBlockPool.remove(block);
     // Check if any pending blocks can now be imported
     final List<SignedBeaconBlock> children =
@@ -222,6 +227,9 @@ public void onExecutionPayloadValidated(final SignedExecutionPayloadEnvelope exe
   @Override
   public void onExecutionPayloadImported(
       final SignedExecutionPayloadEnvelope executionPayload, final boolean executionOptimistic) {
+    executionPayloadEventsListenerSupplier
+        .get()
+        .onExecutionPayloadImported(executionPayload.getSlotAndBlockRoot());
     final ParentExecutionPayloadDependency parentExecutionPayloadDependency =
         new ParentExecutionPayloadDependency(
             executionPayload.getBeaconBlockRoot(),

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

@@ -255,8 +255,19 @@ public void onSlot(final UInt64 slot) {
         .values()
         .removeIf(
             tracker -> {
-              if (tracker.slot().isLessThan(firstNonFinalizedSlot)
-                  || recentChainData.containsBlock(tracker.blockRoot())) {
+              final boolean isCleanupDue;
+              if (tracker.slot().isLessThan(firstNonFinalizedSlot)) {
+                isCleanupDue = true;
+              } else {
+                final boolean blockImported = recentChainData.containsBlock(tracker.blockRoot());
+                final boolean isDataAvailabilityDeferred =
+                    spec.atSlot(tracker.slot())
+                        .getForkChoiceUtil()
+                        .isDataAvailabilityCheckDeferredToExecutionPayloadEnvelope();
+                isCleanupDue = blockImported && !isDataAvailabilityDeferred;
+              }
+
+              if (isCleanupDue) {
                 // Outdated
                 if (!tracker.completionFuture().isDone()) {
                   // make sure the future releases any pending waiters
@@ -285,6 +296,16 @@ public void onNewBlock(final SignedBeaconBlock block, final Optional<RemoteOrigi
     }
   }
 
+  @Override
+  public void onBlockImported(final SignedBeaconBlock block) {
+    if (spec.atSlot(block.getSlot())
+        .getForkChoiceUtil()
+        .isDataAvailabilityCheckDeferredToExecutionPayloadEnvelope()) {
+      return;
+    }
+    removeAllForBlock(block.getSlotAndBlockRoot());
+  }
+
   @Override
   public void removeAllForBlock(final SlotAndBlockRoot slotAndBlockRoot) {
     final DataColumnSamplingTracker removed =

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

@@ -17,6 +17,7 @@
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
+import tech.pegasys.teku.spec.datastructures.epbs.versions.gloas.SignedExecutionPayloadEnvelope;
 import tech.pegasys.teku.spec.logic.common.statetransition.availability.AvailabilityCheckerFactory;
 import tech.pegasys.teku.statetransition.forkchoice.DataColumnSidecarAvailabilityChecker;
 import tech.pegasys.teku.storage.client.RecentChainData;
@@ -42,4 +43,11 @@ public DataColumnSidecarAvailabilityChecker createAvailabilityChecker(
     return new DataColumnSidecarAvailabilityChecker(
         dataAvailabilitySamplerSupplier.get(), spec, recentChainData, block);
   }
+
+  @Override
+  public DataColumnSidecarAvailabilityChecker createAvailabilityChecker(
+      final SignedBeaconBlock block, final SignedExecutionPayloadEnvelope signedEnvelope) {
+    return new DataColumnSidecarAvailabilityChecker(
+        dataAvailabilitySamplerSupplier.get(), spec, recentChainData, block, signedEnvelope);
+  }
 }

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

@@ -25,8 +25,10 @@
 import tech.pegasys.teku.spec.datastructures.util.DataColumnSlotAndIdentifier;
 import tech.pegasys.teku.statetransition.blobs.BlockEventsListener;
 import tech.pegasys.teku.statetransition.blobs.RemoteOrigin;
+import tech.pegasys.teku.statetransition.execution.ExecutionPayloadEventsListener;
 
-public interface DataAvailabilitySampler extends BlockEventsListener {
+public interface DataAvailabilitySampler
+    extends BlockEventsListener, ExecutionPayloadEventsListener {
 
   enum SamplingEligibilityStatus {
     NOT_REQUIRED_OLD_EPOCH,
@@ -61,6 +63,9 @@ public void onNewBlock(
         @Override
         public void removeAllForBlock(final SlotAndBlockRoot slotAndBlockRoot) {}
 
+        @Override
+        public void onExecutionPayloadImported(final SlotAndBlockRoot slotAndBlockRoot) {}
+
         @Override
         public void enableBlockImportOnCompletion(final SignedBeaconBlock block) {}
       };
@@ -86,4 +91,9 @@ default void onNewValidatedDataColumnSidecar(
     onNewValidatedDataColumnSidecar(
         DataColumnSlotAndIdentifier.fromDataColumn(dataColumnSidecar), remoteOrigin);
   }
+
+  @Override
+  default void onExecutionPayloadImported(final SlotAndBlockRoot slotAndBlockRoot) {
+    removeAllForBlock(slotAndBlockRoot);
+  }
 }

ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/execution/DefaultExecutionPayloadManager.java

@@ -125,6 +125,7 @@ public SafeFuture<InternalValidationResult> validateAndImportExecutionPayload(
     final UInt64 earliestExecutionPayloadArrivalTimestamp =
         recordExecutionPayloadArrivalTimestamp(
             signedExecutionPayload, executionPayloadArrivalTimestamp);
+    final Bytes32 beaconBlockRoot = signedExecutionPayload.getBeaconBlockRoot();
     final Bytes32 executionPayloadEnvelopeRoot = signedExecutionPayload.hashTreeRoot();
     final SafeFuture<InternalValidationResult> validationResult =
         executionPayloadGossipValidator.validate(signedExecutionPayload);
@@ -135,8 +136,7 @@ public SafeFuture<InternalValidationResult> validateAndImportExecutionPayload(
               receivedExecutionPayloadEventsChannelPublisher.onExecutionPayloadValidated(
                   signedExecutionPayload);
               acceptedExecutionPayloadEnvelopeRoots.add(executionPayloadEnvelopeRoot);
-              // cache the seen `beacon_block_root` when the gossip checks pass
-              recentSeenExecutionPayloads.add(signedExecutionPayload.getBeaconBlockRoot());
+              recentSeenExecutionPayloads.add(beaconBlockRoot);
               recordExecutionPayloadAvailability(
                   signedExecutionPayload, earliestExecutionPayloadArrivalTimestamp);
               importExecutionPayload(signedExecutionPayload).finishError(LOG);
@@ -190,6 +190,7 @@ public SafeFuture<ExecutionPayloadImportResult> importExecutionPayload(
                 receivedExecutionPayloadEventsChannelPublisher.onExecutionPayloadImported(
                     signedExecutionPayload, result.isImportedOptimistically());
               } else {
+                recentSeenExecutionPayloads.remove(signedExecutionPayload.getBeaconBlockRoot());
                 switch (result.getFailureReason()) {
                   case FAILED_EXECUTION -> {
                     LOG.error(
@@ -211,6 +212,7 @@ public SafeFuture<ExecutionPayloadImportResult> importExecutionPayload(
             })
         .exceptionally(
             ex -> {
+              recentSeenExecutionPayloads.remove(signedExecutionPayload.getBeaconBlockRoot());
               final String internalErrorMessage =
                   String.format(
                       "Internal error while importing execution payload: %s. Execution payload content: %s",

ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/execution/ExecutionPayloadEventsListener.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright Consensys Software Inc., 2026
+ *
+ * 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.statetransition.execution;
+
+import tech.pegasys.teku.spec.datastructures.blocks.SlotAndBlockRoot;
+
+public interface ExecutionPayloadEventsListener {
+  ExecutionPayloadEventsListener NOOP = slotAndBlockRoot -> {};
+
+  void onExecutionPayloadImported(SlotAndBlockRoot slotAndBlockRoot);
+}