Revert "Add Single block provider for Fulu (#10169)" (#10235)

This reverts commit 2246ea0.

Author: rolfyone

beacon/sync/src/main/java/tech/pegasys/teku/beacon/sync/DefaultSyncServiceFactory.java

@@ -42,7 +42,6 @@
 import tech.pegasys.teku.statetransition.blobs.BlobSidecarManager;
 import tech.pegasys.teku.statetransition.blobs.BlockBlobSidecarsTrackersPool;
 import tech.pegasys.teku.statetransition.block.BlockImporter;
-import tech.pegasys.teku.statetransition.datacolumns.DasSamplerBasic;
 import tech.pegasys.teku.statetransition.util.PendingPool;
 import tech.pegasys.teku.statetransition.validation.signatures.SignatureVerificationService;
 import tech.pegasys.teku.storage.api.StorageUpdateChannel;
@@ -73,7 +72,6 @@ public class DefaultSyncServiceFactory implements SyncServiceFactory {
   private final PendingPool<SignedBeaconBlock> pendingBlocks;
   private final PendingPool<ValidatableAttestation> pendingAttestations;
   private final BlockBlobSidecarsTrackersPool blockBlobSidecarsTrackersPool;
-  private final DasSamplerBasic dasBasicSampler;
   private final int getStartupTargetPeerCount;
   private final AsyncBLSSignatureVerifier signatureVerifier;
   private final Duration startupTimeout;
@@ -96,7 +94,6 @@ public DefaultSyncServiceFactory(
       final PendingPool<SignedBeaconBlock> pendingBlocks,
       final PendingPool<ValidatableAttestation> pendingAttestations,
       final BlockBlobSidecarsTrackersPool blockBlobSidecarsTrackersPool,
-      final DasSamplerBasic dasBasicSampler,
       final int getStartupTargetPeerCount,
       final SignatureVerificationService signatureVerifier,
       final Duration startupTimeout,
@@ -117,7 +114,6 @@ public DefaultSyncServiceFactory(
     this.pendingBlocks = pendingBlocks;
     this.pendingAttestations = pendingAttestations;
     this.blockBlobSidecarsTrackersPool = blockBlobSidecarsTrackersPool;
-    this.dasBasicSampler = dasBasicSampler;
     this.getStartupTargetPeerCount = getStartupTargetPeerCount;
     this.signatureVerifier = signatureVerifier;
     this.startupTimeout = startupTimeout;
@@ -140,7 +136,6 @@ public SyncService create(final EventChannels eventChannels) {
             pendingBlocks,
             pendingAttestations,
             blockBlobSidecarsTrackersPool,
-            dasBasicSampler,
             forwardSyncService,
             fetchTaskFactory);
     final RecentBlobSidecarsFetcher recentBlobSidecarsFetcher =

beacon/sync/src/main/java/tech/pegasys/teku/beacon/sync/SyncConfig.java

@@ -16,7 +16,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.OptionalInt;
-import tech.pegasys.teku.infrastructure.exceptions.InvalidConfigurationException;
 import tech.pegasys.teku.networking.eth2.P2PConfig;
 
 public class SyncConfig {
@@ -35,8 +34,6 @@ public class SyncConfig {
   /** Aligned with {@link P2PConfig#DEFAULT_PEER_BLOB_SIDECARS_RATE_LIMIT} */
   public static final int DEFAULT_FORWARD_SYNC_MAX_BLOB_SIDECARS_PER_MINUTE = 2000;
 
-  public static final int DEFAULT_MAX_RECENTLY_SAMPLED_BLOCKS = 64;
-
   private final boolean isEnabled;
   private final boolean isMultiPeerSyncEnabled;
   private final boolean reconstructHistoricStatesEnabled;
@@ -47,7 +44,6 @@ public class SyncConfig {
   private final int forwardSyncMaxBlocksPerMinute;
   private final int forwardSyncMaxBlobSidecarsPerMinute;
   private final OptionalInt forwardSyncMaxDistanceFromHead;
-  private final int maxRecentlySampledBlocks;
 
   private SyncConfig(
       final boolean isEnabled,
@@ -59,8 +55,7 @@ private SyncConfig(
       final int forwardSyncMaxPendingBatches,
       final int forwardSyncMaxBlocksPerMinute,
       final int forwardSyncMaxBlobSidecarsPerMinute,
-      final OptionalInt forwardSyncMaxDistanceFromHead,
-      final int maxRecentlySampledBlocks) {
+      final OptionalInt forwardSyncMaxDistanceFromHead) {
     this.isEnabled = isEnabled;
     this.isMultiPeerSyncEnabled = isMultiPeerSyncEnabled;
     this.reconstructHistoricStatesEnabled = reconstructHistoricStatesEnabled;
@@ -71,7 +66,6 @@ private SyncConfig(
     this.forwardSyncMaxBlocksPerMinute = forwardSyncMaxBlocksPerMinute;
     this.forwardSyncMaxBlobSidecarsPerMinute = forwardSyncMaxBlobSidecarsPerMinute;
     this.forwardSyncMaxDistanceFromHead = forwardSyncMaxDistanceFromHead;
-    this.maxRecentlySampledBlocks = maxRecentlySampledBlocks;
   }
 
   public static Builder builder() {
@@ -118,10 +112,6 @@ public OptionalInt getForwardSyncMaxDistanceFromHead() {
     return forwardSyncMaxDistanceFromHead;
   }
 
-  public int getMaxRecentlySampledBlocks() {
-    return maxRecentlySampledBlocks;
-  }
-
   public static class Builder {
     private Boolean isEnabled;
     private Boolean isMultiPeerSyncEnabled = DEFAULT_MULTI_PEER_SYNC_ENABLED;
@@ -134,7 +124,6 @@ public static class Builder {
     private Integer forwardSyncMaxBlobSidecarsPerMinute =
         DEFAULT_FORWARD_SYNC_MAX_BLOB_SIDECARS_PER_MINUTE;
     private OptionalInt forwardSyncMaxDistanceFromHead = OptionalInt.empty();
-    private Integer maxRecentlySampledBlocks = DEFAULT_MAX_RECENTLY_SAMPLED_BLOCKS;
 
     private Builder() {}
 
@@ -150,8 +139,7 @@ public SyncConfig build() {
           forwardSyncMaxPendingBatches,
           forwardSyncMaxBlocksPerMinute,
           forwardSyncMaxBlobSidecarsPerMinute,
-          forwardSyncMaxDistanceFromHead,
-          maxRecentlySampledBlocks);
+          forwardSyncMaxDistanceFromHead);
     }
 
     private void initMissingDefaults() {
@@ -230,15 +218,5 @@ public Builder fetchAllHistoricBlocks(final boolean fetchAllHistoricBlocks) {
       this.fetchAllHistoricBlocks = fetchAllHistoricBlocks;
       return this;
     }
-
-    public Builder maxRecentlySampledBlocks(final Integer maxRecentlySampledBlocks) {
-      checkNotNull(maxRecentlySampledBlocks);
-      if (maxRecentlySampledBlocks <= 0) {
-        throw new InvalidConfigurationException(
-            String.format("Invalid maxRecentlySampledBlocks: %d", maxRecentlySampledBlocks));
-      }
-      this.maxRecentlySampledBlocks = maxRecentlySampledBlocks;
-      return this;
-    }
   }
 }

beacon/sync/src/main/java/tech/pegasys/teku/beacon/sync/gossip/blocks/RecentBlocksFetchService.java

@@ -26,7 +26,6 @@
 import tech.pegasys.teku.spec.datastructures.attestation.ValidatableAttestation;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.statetransition.blobs.BlockBlobSidecarsTrackersPool;
-import tech.pegasys.teku.statetransition.datacolumns.DasSamplerBasic;
 import tech.pegasys.teku.statetransition.util.PendingPool;
 
 public class RecentBlocksFetchService
@@ -41,7 +40,6 @@ public class RecentBlocksFetchService
   private final PendingPool<SignedBeaconBlock> pendingBlockPool;
   private final PendingPool<ValidatableAttestation> pendingAttestationsPool;
   private final BlockBlobSidecarsTrackersPool blockBlobSidecarsTrackersPool;
-  private final DasSamplerBasic dasBasicSampler;
   private final FetchTaskFactory fetchTaskFactory;
   private final Subscribers<BlockSubscriber> blockSubscribers = Subscribers.create(true);
 
@@ -50,7 +48,6 @@ public class RecentBlocksFetchService
       final PendingPool<SignedBeaconBlock> pendingBlockPool,
       final PendingPool<ValidatableAttestation> pendingAttestationsPool,
       final BlockBlobSidecarsTrackersPool blockBlobSidecarsTrackersPool,
-      final DasSamplerBasic dasBasicSampler,
       final ForwardSync forwardSync,
       final FetchTaskFactory fetchTaskFactory,
       final int maxConcurrentRequests) {
@@ -59,7 +56,6 @@ public class RecentBlocksFetchService
     this.pendingBlockPool = pendingBlockPool;
     this.pendingAttestationsPool = pendingAttestationsPool;
     this.blockBlobSidecarsTrackersPool = blockBlobSidecarsTrackersPool;
-    this.dasBasicSampler = dasBasicSampler;
     this.fetchTaskFactory = fetchTaskFactory;
   }
 
@@ -68,15 +64,13 @@ public static RecentBlocksFetchService create(
       final PendingPool<SignedBeaconBlock> pendingBlocksPool,
       final PendingPool<ValidatableAttestation> pendingAttestations,
       final BlockBlobSidecarsTrackersPool blockBlobSidecarsTrackersPool,
-      final DasSamplerBasic dasBasicSampler,
       final ForwardSync forwardSync,
       final FetchTaskFactory fetchTaskFactory) {
     return new RecentBlocksFetchService(
         asyncRunner,
         pendingBlocksPool,
         pendingAttestations,
         blockBlobSidecarsTrackersPool,
-        dasBasicSampler,
         forwardSync,
         fetchTaskFactory,
         MAX_CONCURRENT_REQUESTS);
@@ -112,10 +106,6 @@ public void requestRecentBlock(final Bytes32 blockRoot) {
       // We already have this block, waiting for blobs
       return;
     }
-    if (dasBasicSampler.containsBlock(blockRoot)) {
-      // We already have this block in DAS sampler
-      return;
-    }
     final FetchBlockTask task = createTask(blockRoot);
     if (allTasks.putIfAbsent(blockRoot, task) != null) {
       // We're already tracking this task

beacon/sync/src/test/java/tech/pegasys/teku/beacon/sync/gossip/blocks/RecentBlocksFetchServiceTest.java

@@ -43,7 +43,6 @@
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.util.DataStructureUtil;
 import tech.pegasys.teku.statetransition.blobs.BlockBlobSidecarsTrackersPool;
-import tech.pegasys.teku.statetransition.datacolumns.DasSamplerBasicImpl;
 import tech.pegasys.teku.statetransition.util.PendingPool;
 
 public class RecentBlocksFetchServiceTest {
@@ -60,7 +59,6 @@ public class RecentBlocksFetchServiceTest {
 
   private final BlockBlobSidecarsTrackersPool blockBlobSidecarsTrackersPool =
       mock(BlockBlobSidecarsTrackersPool.class);
-  private final DasSamplerBasicImpl dasSamplerBasic = mock(DasSamplerBasicImpl.class);
 
   private final FetchTaskFactory fetchTaskFactory = mock(FetchTaskFactory.class);
 
@@ -83,7 +81,6 @@ public void setup() {
             pendingBlockPool,
             pendingAttestationsPool,
             blockBlobSidecarsTrackersPool,
-            dasSamplerBasic,
             forwardSync,
             fetchTaskFactory,
             maxConcurrentRequests);

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

@@ -63,7 +63,6 @@
 import tech.pegasys.teku.statetransition.block.BlockImporter;
 import tech.pegasys.teku.statetransition.block.BlockManager;
 import tech.pegasys.teku.statetransition.block.ReceivedBlockEventsChannel;
-import tech.pegasys.teku.statetransition.datacolumns.DasSamplerBasic;
 import tech.pegasys.teku.statetransition.forkchoice.ForkChoice;
 import tech.pegasys.teku.statetransition.forkchoice.MergeTransitionBlockValidator;
 import tech.pegasys.teku.statetransition.forkchoice.NoopForkChoiceNotifier;
@@ -215,7 +214,6 @@ public static SyncingNodeManager create(
             pendingBlocks,
             pendingAttestations,
             BlockBlobSidecarsTrackersPool.NOOP,
-            DasSamplerBasic.NOOP,
             syncService,
             fetchBlockTaskFactory);
     recentBlocksFetcher.subscribeBlockFetched(blockManager::importBlock);

eth-reference-tests/src/referenceTest/java/tech/pegasys/teku/reference/phase0/forkchoice/ForkChoiceTestExecutor.java

@@ -77,7 +77,7 @@
 import tech.pegasys.teku.spec.logic.common.statetransition.results.BlockImportResult;
 import tech.pegasys.teku.statetransition.datacolumns.CurrentSlotProvider;
 import tech.pegasys.teku.statetransition.datacolumns.DasCustodyStand;
-import tech.pegasys.teku.statetransition.datacolumns.DasSamplerBasicImpl;
+import tech.pegasys.teku.statetransition.datacolumns.DasSamplerBasic;
 import tech.pegasys.teku.statetransition.datacolumns.DataColumnSidecarRecoveringCustody;
 import tech.pegasys.teku.statetransition.datacolumns.retriever.DataColumnSidecarRetrieverStub;
 import tech.pegasys.teku.statetransition.forkchoice.ForkChoice;
@@ -159,8 +159,8 @@ spec, new SignedBlockAndState(anchorBlock, anchorState)),
     final StubBlobSidecarManager blobSidecarManager = new StubBlobSidecarManager(kzg);
     final CurrentSlotProvider currentSlotProvider =
         CurrentSlotProvider.create(spec, recentChainData.getStore());
-    final DasSamplerBasicImpl dasSampler =
-        new DasSamplerBasicImpl(
+    final DasSamplerBasic dasSampler =
+        new DasSamplerBasic(
             spec,
             asyncRunnerFactory.create("das", 1),
             currentSlotProvider,
@@ -170,9 +170,7 @@ spec, new SignedBlockAndState(anchorBlock, anchorState)),
             // using a const for the custody group count here, the test doesn't care
             // and fetching from the config would break when not in fulu
             DasCustodyStand.createCustodyGroupCountManager(4, 8),
-            recentChainData,
-            storageSystem.getMetricsSystem(),
-            64);
+            recentChainData);
     final StubDataColumnSidecarManager dataColumnSidecarManager =
         new StubDataColumnSidecarManager(spec, recentChainData, dasSampler);
     // forkChoiceLateBlockReorgEnabled is true here always because this is the reference test

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

@@ -86,7 +86,7 @@ private void onNewPreImportBlock(final SignedBeaconBlock block) {
         .always(
             () ->
                 sampler
-                    .checkDataAvailability(block)
+                    .checkDataAvailability(block.getSlot(), block.getRoot())
                     .finish(
                         succ ->
                             LOG.debug(