PeerDAS

acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/BlockProposalAcceptanceTest.java

@@ -22,7 +22,7 @@
 import java.util.Locale;
 import org.apache.tuweni.bytes.Bytes32;
 import org.junit.jupiter.api.Test;
-import tech.pegasys.teku.api.schema.bellatrix.SignedBeaconBlockBellatrix;
+import tech.pegasys.teku.api.schema.eip7594.SignedBeaconBlockEip7594;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.test.acceptance.dsl.AcceptanceTestBase;
 import tech.pegasys.teku.test.acceptance.dsl.GenesisGenerator.InitialStateData;
@@ -45,7 +45,10 @@ void shouldHaveCorrectFeeRecipientAndGraffiti() throws Exception {
  createGenesisGenerator()
  .network(networkName)
  .withAltairEpoch(UInt64.ZERO)
- .withBellatrixEpoch(UInt64.ZERO)
+ .withBellatrixEpoch(UInt64.ONE)
+ .withCapellaEpoch(UInt64.valueOf(2))
+ .withDenebEpoch(UInt64.valueOf(3))
+ .withEip7594Epoch(UInt64.valueOf(4))
  .validatorKeys(validatorKeystores, validatorKeystores)
  .generate();
 
@@ -58,8 +61,14 @@ void shouldHaveCorrectFeeRecipientAndGraffiti() throws Exception {
  .withJwtSecretFile(JWT_FILE)
  .withNetwork(networkName)
  .withInitialState(genesis)
+ .withRealNetwork()
  .withAltairEpoch(UInt64.ZERO)
- .withBellatrixEpoch(UInt64.ZERO)
+ .withBellatrixEpoch(UInt64.ONE)
+ .withCapellaEpoch(UInt64.valueOf(2))
+ .withDenebEpoch(UInt64.valueOf(3))
+ .withEip7594Epoch(UInt64.valueOf(4))
+ .withTotalTerminalDifficulty(0)
+ .withTrustedSetupFromClasspath("mainnet-trusted-setup.txt")
  .withValidatorProposerDefaultFeeRecipient(defaultFeeRecipient)
  .build());
  final TekuValidatorNode validatorClient =
@@ -76,14 +85,15 @@ void shouldHaveCorrectFeeRecipientAndGraffiti() throws Exception {
  beaconNode.start();
  validatorClient.start();
 
+ beaconNode.waitForEpochAtOrAbove(4);
  beaconNode.waitForBlockSatisfying(
  block -> {
- assertThat(block).isInstanceOf(SignedBeaconBlockBellatrix.class);
- final SignedBeaconBlockBellatrix bellatrixBlock = (SignedBeaconBlockBellatrix) block;
+ assertThat(block).isInstanceOf(SignedBeaconBlockEip7594.class);
+ final SignedBeaconBlockEip7594 eip7594Block = (SignedBeaconBlockEip7594) block;
  assertThat(
- bellatrixBlock.getMessage().getBody().executionPayload.feeRecipient.toHexString())
+ eip7594Block.getMessage().getBody().executionPayload.feeRecipient.toHexString())
  .isEqualTo(defaultFeeRecipient.toLowerCase(Locale.ROOT));
- final Bytes32 graffiti = bellatrixBlock.getMessage().getBody().graffiti;
+ final Bytes32 graffiti = eip7594Block.getMessage().getBody().graffiti;
  final String graffitiMessage =
  new String(
  Arrays.copyOfRange(

acceptance-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/GenesisGenerator.java

@@ -71,6 +71,24 @@ public GenesisGenerator withCapellaEpoch(final UInt64 capellaForkEpoch) {
  return this;
  }
 
+ public GenesisGenerator withDenebEpoch(final UInt64 denebForkEpoch) {
+ specConfigModifier =
+ specConfigModifier.andThen(
+ specConfigBuilder ->
+ specConfigBuilder.denebBuilder(
+ denebBuilder -> denebBuilder.denebForkEpoch(denebForkEpoch)));
+ return this;
+ }
+
+ public GenesisGenerator withEip7594Epoch(final UInt64 eip7594ForkEpoch) {
+ specConfigModifier =
+ specConfigModifier.andThen(
+ specConfigBuilder ->
+ specConfigBuilder.eip7594Builder(
+ eip7594Builder -> eip7594Builder.eip7594ForkEpoch(eip7594ForkEpoch)));
+ return this;
+ }
+
  public GenesisGenerator withTotalTerminalDifficulty(final long totalTerminalDifficulty) {
  return withTotalTerminalDifficulty(UInt256.valueOf(totalTerminalDifficulty));
  }

acceptance-tests/src/testFixtures/java/tech/pegasys/teku/test/acceptance/dsl/TekuNodeConfigBuilder.java

@@ -184,6 +184,19 @@ public TekuNodeConfigBuilder withDenebEpoch(final UInt64 denebForkEpoch) {
  return this;
  }
 
+ public TekuNodeConfigBuilder withEip7594Epoch(final UInt64 eip7594ForkEpoch) {
+
+ mustBe(NodeType.BEACON_NODE);
+ LOG.debug("Xnetwork-das-fork-epoch={}", eip7594ForkEpoch);
+ configMap.put("Xnetwork-das-fork-epoch", eip7594ForkEpoch.toString());
+ specConfigModifier =
+ specConfigModifier.andThen(
+ specConfigBuilder ->
+ specConfigBuilder.eip7594Builder(
+ eip7594Builder -> eip7594Builder.eip7594ForkEpoch(eip7594ForkEpoch)));
+ return this;
+ }
+
  public TekuNodeConfigBuilder withTotalTerminalDifficulty(final long totalTerminalDifficulty) {
  return withTotalTerminalDifficulty(UInt256.valueOf(totalTerminalDifficulty));
  }

beacon/sync/src/main/java/tech/pegasys/teku/beacon/sync/forward/multipeer/chains/SyncSourceFactory.java

@@ -46,12 +46,20 @@ public SyncSource getOrCreateSyncSource(final Eth2Peer peer, final Spec spec) {
  final int maxBlocksPerMinute = this.maxBlocksPerMinute - batchSize - 1;
  final Optional<Integer> maxBlobSidecarsPerMinute =
  spec.getMaxBlobsPerBlock().map(maxBlobsPerBlock -> maxBlocksPerMinute * maxBlobsPerBlock);
+ final Optional<Integer> maxDataColumnSidecarsPerMinute =
+ spec.getNumberOfDataColumns()
+ .map(dataColumnsPerBlock -> maxBlocksPerMinute * dataColumnsPerBlock.intValue());
 
  return syncSourcesByPeer.computeIfAbsent(
  peer,
  source ->
  new ThrottlingSyncSource(
- asyncRunner, timeProvider, source, maxBlocksPerMinute, maxBlobSidecarsPerMinute));
+ asyncRunner,
+ timeProvider,
+ source,
+ maxBlocksPerMinute,
+ maxBlobSidecarsPerMinute,
+ maxDataColumnSidecarsPerMinute));
  }
 
  public void onPeerDisconnected(final Eth2Peer peer) {

beacon/sync/src/main/java/tech/pegasys/teku/beacon/sync/forward/multipeer/chains/ThrottlingSyncSource.java

@@ -14,6 +14,7 @@
 package tech.pegasys.teku.beacon.sync.forward.multipeer.chains;
 
 import java.time.Duration;
+import java.util.List;
 import java.util.Optional;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -27,6 +28,7 @@
 import tech.pegasys.teku.networking.p2p.reputation.ReputationAdjustment;
 import tech.pegasys.teku.networking.p2p.rpc.RpcResponseListener;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobSidecar;
+import tech.pegasys.teku.spec.datastructures.blobs.versions.eip7594.DataColumnSidecar;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 
 public class ThrottlingSyncSource implements SyncSource {
@@ -38,21 +40,35 @@ public class ThrottlingSyncSource implements SyncSource {
 
  private final RateTracker blocksRateTracker;
  private final RateTracker blobSidecarsRateTracker;
+ private final RateTracker dataColumnSidecarsRateTracker;
 
  public ThrottlingSyncSource(
  final AsyncRunner asyncRunner,
  final TimeProvider timeProvider,
  final SyncSource delegate,
  final int maxBlocksPerMinute,
- final Optional<Integer> maybeMaxBlobSidecarsPerMinute) {
+ final Optional<Integer> maybeMaxBlobSidecarsPerMinute,
+ final Optional<Integer> maybeMaxDataColumnSidecarsPerMinute) {
  this.asyncRunner = asyncRunner;
  this.delegate = delegate;
- this.blocksRateTracker = RateTracker.create(maxBlocksPerMinute, TIME_OUT, timeProvider);
+ this.blocksRateTracker =
+ RateTracker.create(maxBlocksPerMinute, TIME_OUT, timeProvider, "throttling-blocks");
  this.blobSidecarsRateTracker =
  maybeMaxBlobSidecarsPerMinute
  .map(
  maxBlobSidecarsPerMinute ->
- RateTracker.create(maxBlobSidecarsPerMinute, TIME_OUT, timeProvider))
+ RateTracker.create(
+ maxBlobSidecarsPerMinute, TIME_OUT, timeProvider, "throttling-blobs"))
+ .orElse(RateTracker.NOOP);
+ this.dataColumnSidecarsRateTracker =
+ maybeMaxDataColumnSidecarsPerMinute
+ .map(
+ maxDataColumnSidecarsPerMinute ->
+ RateTracker.create(
+ maxDataColumnSidecarsPerMinute,
+ TIME_OUT,
+ timeProvider,
+ "throttling-dataColumn"))
  .orElse(RateTracker.NOOP);
  }
 
@@ -82,6 +98,22 @@ public SafeFuture<Void> requestBlobSidecarsByRange(
  }
  }
 
+ @Override
+ public SafeFuture<Void> requestDataColumnSidecarsByRange(
+ final UInt64 startSlot,
+ final UInt64 count,
+ final List<UInt64> columns,
+ final RpcResponseListener<DataColumnSidecar> listener) {
+ if (dataColumnSidecarsRateTracker.approveObjectsRequest(count.longValue()).isPresent()) {
+ LOG.debug("Sending request for {} data column sidecars on {} columns", count, columns.size());
+ return delegate.requestDataColumnSidecarsByRange(startSlot, count, columns, listener);
+ } else {
+ return asyncRunner.runAfterDelay(
+ () -> requestDataColumnSidecarsByRange(startSlot, count, columns, listener),
+ PEER_REQUEST_DELAY);
+ }
+ }
+
  @Override
  public SafeFuture<Void> disconnectCleanly(final DisconnectReason reason) {
  return delegate.disconnectCleanly(reason);

beacon/sync/src/test/java/tech/pegasys/teku/beacon/sync/forward/multipeer/chains/ThrottlingSyncSourceTest.java

@@ -54,7 +54,8 @@ class ThrottlingSyncSourceTest {
  timeProvider,
  delegate,
  MAX_BLOCKS_PER_MINUTE,
- Optional.of(MAX_BLOB_SIDECARS_PER_MINUTE));
+ Optional.of(MAX_BLOB_SIDECARS_PER_MINUTE),
+ Optional.empty());
 
  @Test
  void shouldDelegateDisconnectImmediately() {

beacon/validator/src/integrationTest/java/tech/pegasys/teku/validator/coordinator/ValidatorApiHandlerIntegrationTest.java

@@ -29,14 +29,15 @@
 import tech.pegasys.teku.beacon.sync.events.SyncState;
 import tech.pegasys.teku.beacon.sync.events.SyncStateProvider;
 import tech.pegasys.teku.beacon.sync.events.SyncStateTracker;
-import tech.pegasys.teku.ethereum.performance.trackers.BlockProductionPerformanceFactory;
+import tech.pegasys.teku.ethereum.performance.trackers.BlockProductionAndPublishingPerformanceFactory;
 import tech.pegasys.teku.infrastructure.async.SafeFuture;
 import tech.pegasys.teku.infrastructure.metrics.StubMetricsSystem;
 import tech.pegasys.teku.infrastructure.metrics.Validator.ValidatorDutyMetricUtils;
 import tech.pegasys.teku.infrastructure.time.SystemTimeProvider;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.networking.eth2.gossip.BlobSidecarGossipChannel;
 import tech.pegasys.teku.networking.eth2.gossip.BlockGossipChannel;
+import tech.pegasys.teku.networking.eth2.gossip.DataColumnSidecarGossipChannel;
 import tech.pegasys.teku.networking.eth2.gossip.subnets.AttestationTopicSubscriber;
 import tech.pegasys.teku.networking.eth2.gossip.subnets.SyncCommitteeSubscriptionManager;
 import tech.pegasys.teku.spec.Spec;
@@ -84,6 +85,8 @@ public class ValidatorApiHandlerIntegrationTest {
  mock(BlockBlobSidecarsTrackersPool.class);
  private final BlobSidecarGossipChannel blobSidecarGossipChannel =
  mock(BlobSidecarGossipChannel.class);
+ private final DataColumnSidecarGossipChannel dataColumnSidecarGossipChannel =
+ mock(DataColumnSidecarGossipChannel.class);
  private final ChainDataProvider chainDataProvider = mock(ChainDataProvider.class);
  private final NodeDataProvider nodeDataProvider = mock(NodeDataProvider.class);
  private final ForkChoiceTrigger forkChoiceTrigger = mock(ForkChoiceTrigger.class);
@@ -109,6 +112,7 @@ public class ValidatorApiHandlerIntegrationTest {
  blockGossipChannel,
  blockBlobSidecarsTrackersPool,
  blobSidecarGossipChannel,
+ dataColumnSidecarGossipChannel,
  attestationPool,
  attestationManager,
  attestationTopicSubscriber,
@@ -121,7 +125,8 @@ public class ValidatorApiHandlerIntegrationTest {
  syncCommitteeMessagePool,
  syncCommitteeContributionPool,
  syncCommitteeSubscriptionManager,
- new BlockProductionPerformanceFactory(new SystemTimeProvider(), true, 0));
+ new BlockProductionAndPublishingPerformanceFactory(
+ new SystemTimeProvider(), __ -> UInt64.ZERO, true, 0, 0));
 
  @BeforeEach
  public void setup() {

beacon/validator/src/jmh/java/tech/pegasys/teku/validator/coordinator/DepositProviderBenchmark.java

@@ -68,7 +68,7 @@ public class DepositProviderBenchmark {
  new DepositProvider(
  metricsSystem,
  mock(RecentChainData.class),
- new Eth1DataCache(spec, metricsSystem, new Eth1VotingPeriod(spec)),
+ new Eth1DataCache(metricsSystem, new Eth1VotingPeriod(spec)),
  mock(StorageUpdateChannel.class),
  mock(Eth1DepositStorageChannel.class),
  spec,

beacon/validator/src/main/java/tech/pegasys/teku/validator/coordinator/BlockFactory.java

@@ -18,9 +18,12 @@
 import org.apache.tuweni.bytes.Bytes32;
 import tech.pegasys.teku.bls.BLSSignature;
 import tech.pegasys.teku.ethereum.performance.trackers.BlockProductionPerformance;
+import tech.pegasys.teku.ethereum.performance.trackers.BlockPublishingPerformance;
 import tech.pegasys.teku.infrastructure.async.SafeFuture;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
+import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.Blob;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobSidecar;
+import tech.pegasys.teku.spec.datastructures.blobs.versions.eip7594.DataColumnSidecar;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBlockContainer;
 import tech.pegasys.teku.spec.datastructures.metadata.BlockContainerAndMetaData;
@@ -37,7 +40,12 @@ SafeFuture<BlockContainerAndMetaData> createUnsignedBlock(
  Optional<UInt64> requestedBuilderBoostFactor,
  BlockProductionPerformance blockProductionPerformance);
 
- SafeFuture<SignedBeaconBlock> unblindSignedBlockIfBlinded(SignedBeaconBlock maybeBlindedBlock);
+ SafeFuture<SignedBeaconBlock> unblindSignedBlockIfBlinded(
+ SignedBeaconBlock maybeBlindedBlock, BlockPublishingPerformance blockPublishingPerformance);
 
- List<BlobSidecar> createBlobSidecars(SignedBlockContainer blockContainer);
+ List<BlobSidecar> createBlobSidecars(
+ SignedBlockContainer blockContainer, BlockPublishingPerformance blockPublishingPerformance);
+
+ List<DataColumnSidecar> createDataColumnSidecars(
+ SignedBlockContainer blockContainer, List<Blob> blobs);
 }

beacon/validator/src/main/java/tech/pegasys/teku/validator/coordinator/BlockFactoryDeneb.java

@@ -18,6 +18,7 @@
 import org.apache.tuweni.bytes.Bytes32;
 import tech.pegasys.teku.bls.BLSSignature;
 import tech.pegasys.teku.ethereum.performance.trackers.BlockProductionPerformance;
+import tech.pegasys.teku.ethereum.performance.trackers.BlockPublishingPerformance;
 import tech.pegasys.teku.infrastructure.async.SafeFuture;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.Spec;
@@ -70,8 +71,12 @@ public SafeFuture<BlockContainerAndMetaData> createUnsignedBlock(
  }
 
  @Override
- public List<BlobSidecar> createBlobSidecars(final SignedBlockContainer blockContainer) {
- return operationSelector.createBlobSidecarsSelector().apply(blockContainer);
+ public List<BlobSidecar> createBlobSidecars(
+ final SignedBlockContainer blockContainer,
+ final BlockPublishingPerformance blockPublishingPerformance) {
+ return operationSelector
+ .createBlobSidecarsSelector(blockPublishingPerformance)
+ .apply(blockContainer);
  }
 
  private BlockContents createBlockContents(

beacon/validator/src/main/java/tech/pegasys/teku/validator/coordinator/BlockFactoryEip7594.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright Consensys Software Inc., 2023
+ *
+ * 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.validator.coordinator;
+
+import java.util.List;
+import tech.pegasys.teku.kzg.KZG;
+import tech.pegasys.teku.spec.Spec;
+import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.Blob;
+import tech.pegasys.teku.spec.datastructures.blobs.versions.eip7594.DataColumnSidecar;
+import tech.pegasys.teku.spec.datastructures.blocks.SignedBlockContainer;
+import tech.pegasys.teku.spec.logic.versions.eip7594.helpers.MiscHelpersEip7594;
+
+public class BlockFactoryEip7594 extends BlockFactoryDeneb {
+ private final KZG kzg;
+
+ public BlockFactoryEip7594(
+ final Spec spec, final BlockOperationSelectorFactory operationSelector, final KZG kzg) {
+ super(spec, operationSelector);
+ this.kzg = kzg;
+ }
+
+ @Override
+ public List<DataColumnSidecar> createDataColumnSidecars(
+ final SignedBlockContainer blockContainer, List<Blob> blobs) {
+ final MiscHelpersEip7594 miscHelpersEip7594 =
+ MiscHelpersEip7594.required(spec.atSlot(blockContainer.getSlot()).miscHelpers());
+ return miscHelpersEip7594.constructDataColumnSidecars(
+ blockContainer.getSignedBlock(), blobs, kzg);
+ }
+}