Merging latest master in das

CHANGELOG.md

@@ -9,7 +9,8 @@
 ### Breaking Changes
 
 ### Additions and Improvements
-- Updated Teku bootnode ENR on Sepolia and Mainnet
-- Scheduled Electra for Mainnet at epoch 364032 (May 7, 2025, 10:05:11am UTC)
+- Added `--p2p-static-peers-url` option to read static peers from a URL or file
+- Added node epoch and computed slot to the sync committee duties failure message for more context about the failure condition.
+- Updated third party libraries.
 
-### Bug Fixes
+### Bug Fixes

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

@@ -16,7 +16,7 @@
 import java.io.IOException;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import tech.pegasys.teku.api.response.v1.EventType;
+import tech.pegasys.teku.api.response.EventType;
 import tech.pegasys.teku.bls.BLSKeyPair;
 import tech.pegasys.teku.ethereum.execution.types.Eth1Address;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;

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

@@ -75,28 +75,22 @@ private static TekuNodeConfigBuilder createTekuNodeBuilderForMilestone(
             .withInteropNumberOfValidators(64)
             .withValidatorProposerDefaultFeeRecipient("0xFE3B557E8Fb62b89F4916B721be55cEb828dBd73");
 
-    switch (specMilestone) {
-      // We do not need to consider PHASE0, ALTAIR or BELLATRIX as they are all pre-Merge
-      // milestones
-      case CAPELLA:
-        tekuNodeConfigBuilder.withCapellaEpoch(UInt64.ZERO);
-        break;
-      case DENEB:
-        tekuNodeConfigBuilder.withCapellaEpoch(UInt64.ZERO);
-        tekuNodeConfigBuilder.withDenebEpoch(UInt64.ZERO);
-        break;
-      case ELECTRA:
-        tekuNodeConfigBuilder.withCapellaEpoch(UInt64.ZERO);
-        tekuNodeConfigBuilder.withDenebEpoch(UInt64.ZERO);
-        tekuNodeConfigBuilder.withElectraEpoch(UInt64.ZERO);
-        break;
-      default:
-        // Test will reach this whenever a new milestone is added and isn't mapped on the switch.
-        // This is a way to force us to always remember to validate that a new milestone can start
-        // from a merged
-        // state.
-        fail("Milestone %s not used on merged genesis interop test", specMilestone);
+    if (specMilestone.isGreaterThanOrEqualTo(SpecMilestone.CAPELLA)) {
+      tekuNodeConfigBuilder.withCapellaEpoch(UInt64.ZERO);
+    }
+    if (specMilestone.isGreaterThanOrEqualTo(SpecMilestone.DENEB)) {
+      tekuNodeConfigBuilder.withDenebEpoch(UInt64.ZERO);
+    }
+    if (specMilestone.isGreaterThanOrEqualTo(SpecMilestone.ELECTRA)) {
+      tekuNodeConfigBuilder.withElectraEpoch(UInt64.ZERO);
     }
+    if (specMilestone.isGreaterThanOrEqualTo(SpecMilestone.FULU)) {
+      tekuNodeConfigBuilder.withFuluEpoch(UInt64.ZERO);
+    }
+    if (specMilestone.isGreaterThan(SpecMilestone.FULU)) {
+      fail("Milestone %s not used on merged genesis interop test", specMilestone);
+    }
+
     return tekuNodeConfigBuilder;
   }
 }

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

@@ -16,7 +16,7 @@
 import java.io.IOException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import tech.pegasys.teku.api.response.v1.EventType;
+import tech.pegasys.teku.api.response.EventType;
 import tech.pegasys.teku.infrastructure.time.SystemTimeProvider;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.test.acceptance.dsl.AcceptanceTestBase;

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

@@ -50,7 +50,7 @@
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
 import tech.pegasys.teku.api.migrated.ValidatorLivenessAtEpoch;
-import tech.pegasys.teku.api.response.v1.EventType;
+import tech.pegasys.teku.api.response.EventType;
 import tech.pegasys.teku.bls.BLS;
 import tech.pegasys.teku.bls.BLSKeyPair;
 import tech.pegasys.teku.bls.BLSSecretKey;

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

@@ -28,7 +28,7 @@
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
 import org.testcontainers.utility.MountableFile;
-import tech.pegasys.teku.api.response.v1.EventType;
+import tech.pegasys.teku.api.response.EventType;
 
 public abstract class TekuNode extends Node {
   public static final int VALIDATOR_API_PORT = 9052;

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

@@ -173,6 +173,18 @@ public TekuNodeConfigBuilder withElectraEpoch(final UInt64 electraForkEpoch) {
     return this;
   }
 
+  public TekuNodeConfigBuilder withFuluEpoch(final UInt64 fuluForkEpoch) {
+    mustBe(NodeType.BEACON_NODE);
+    LOG.debug("Xnetwork-fulu-fork-epoch={}", fuluForkEpoch);
+    configMap.put("Xnetwork-fulu-fork-epoch", fuluForkEpoch.toString());
+    specConfigModifier =
+        specConfigModifier.andThen(
+            specConfigBuilder ->
+                specConfigBuilder.fuluBuilder(
+                    fuluBuilder -> fuluBuilder.fuluForkEpoch(fuluForkEpoch)));
+    return this;
+  }
+
   public TekuNodeConfigBuilder withTrustedSetupFromClasspath(final String trustedSetup)
       throws Exception {
     mustBe(NodeType.BEACON_NODE);
@@ -224,19 +236,6 @@ public TekuNodeConfigBuilder withTerminalBlockHash(
     return this;
   }
 
-  public TekuNodeConfigBuilder withFuluEpoch(final UInt64 fuluForkEpoch) {
-
-    mustBe(NodeType.BEACON_NODE);
-    LOG.debug("Xnetwork-fulu-fork-epoch={}", fuluForkEpoch);
-    configMap.put("Xnetwork-fulu-fork-epoch", fuluForkEpoch.toString());
-    specConfigModifier =
-        specConfigModifier.andThen(
-            specConfigBuilder ->
-                specConfigBuilder.fuluBuilder(
-                    fuluBuilder -> fuluBuilder.fuluForkEpoch(fuluForkEpoch)));
-    return this;
-  }
-
   public TekuNodeConfigBuilder withTotalTerminalDifficulty(final long totalTerminalDifficulty) {
     return withTotalTerminalDifficulty(UInt256.valueOf(totalTerminalDifficulty));
   }
@@ -560,6 +559,13 @@ public TekuNodeConfigBuilder withPeers(final TekuBeaconNode... nodes) {
     return this;
   }
 
+  public TekuNodeConfigBuilder withPeersUrl(final String peersUrl) {
+    mustBe(NodeType.BEACON_NODE);
+    LOG.debug("p2p-static-peers-url={}", peersUrl);
+    configMap.put("p2p-static-peers-url", peersUrl);
+    return this;
+  }
+
   public TekuNodeConfigBuilder withExternalSignerUrl(final String externalSignerUrl) {
     LOG.debug("validators-external-signer-url={}", externalSignerUrl);
     configMap.put("validators-external-signer-url", externalSignerUrl);

beacon/validator/build.gradle

@@ -45,6 +45,7 @@ dependencies {
   testImplementation testFixtures(project(':infrastructure:logging'))
   testImplementation testFixtures(project(':infrastructure:metrics'))
   testImplementation testFixtures(project(':infrastructure:time'))
+  testImplementation testFixtures(project(':infrastructure:kzg'))
 
   integrationTestImplementation testFixtures(project(':ethereum:spec'))
   integrationTestImplementation testFixtures(project(':infrastructure:async'))

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

@@ -505,8 +505,7 @@ public SafeFuture<Optional<Attestation>> createAggregate(
     return SafeFuture.completedFuture(
         attestationPool
             .createAggregateFor(attestationHashTreeRoot, committeeIndex)
-            .filter(attestation -> attestation.getData().getSlot().equals(slot))
-            .map(ValidatableAttestation::getAttestation));
+            .filter(attestation -> attestation.getData().getSlot().equals(slot)));
   }
 
   @Override
@@ -802,15 +801,17 @@ private SafeFuture<Optional<BeaconState>> getStateForCommitteeDuties(
                 return SafeFuture.completedFuture(Optional.of(bestState));
               }
 
-              final UInt64 lastQueryableEpoch =
+              final UInt64 maxQueryableEpoch =
                   syncCommitteeUtil.computeLastEpochOfNextSyncCommitteePeriod(
                       combinedChainDataClient.getCurrentEpoch());
-              if (lastQueryableEpoch.isLessThan(epoch)) {
+              if (maxQueryableEpoch.isLessThan(epoch)) {
+                final Optional<UInt64> networkCurrentSlot =
+                    chainDataProvider.getNetworkCurrentSlot();
                 return SafeFuture.failedFuture(
                     new IllegalArgumentException(
-                        "Cannot calculate sync committee duties for epoch "
-                            + epoch
-                            + " because it is not within the current or next sync committee periods"));
+                        String.format(
+                            "Cannot calculate sync committee duties for epoch %s because it is not within the current or next sync committee periods (node current epoch %s, computed current slot %s)",
+                            epoch, combinedChainDataClient.getCurrentEpoch(), networkCurrentSlot)));
               }
 
               final UInt64 requiredEpoch;

beacon/validator/src/test/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactoryTestFulu.java

@@ -41,6 +41,7 @@
 import tech.pegasys.teku.infrastructure.ssz.SszList;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.kzg.KZG;
+import tech.pegasys.teku.kzg.NoOpKZG;
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.fulu.DataColumnSidecar;
@@ -339,7 +340,9 @@ void shouldCreateDataColumnSidecarsForBlockContents() {
 
     assertThatThrownBy(
             () ->
-                factory.createDataColumnSidecarsSelector(KZG.NOOP).apply(signedBlindedBeaconBlock))
+                factory
+                    .createDataColumnSidecarsSelector(NoOpKZG.INSTANCE)
+                    .apply(signedBlindedBeaconBlock))
         .isInstanceOf(IllegalStateException.class)
         .hasMessage(
             "Commitments in the builder BlobsCellBundle don't match the commitments in the block");
@@ -362,7 +365,9 @@ void shouldFailCreatingBlobSidecarsIfBuilderBlobsBundleProofsIsNotConsistent() {
 
     assertThatThrownBy(
             () ->
-                factory.createDataColumnSidecarsSelector(KZG.NOOP).apply(signedBlindedBeaconBlock))
+                factory
+                    .createDataColumnSidecarsSelector(NoOpKZG.INSTANCE)
+                    .apply(signedBlindedBeaconBlock))
         .isInstanceOf(IllegalStateException.class)
         .hasMessage(
             "The number of blobs in the builder BlobsCellBundle doesn't match the number of commitments in the block");
@@ -385,7 +390,9 @@ void shouldFailCreatingDataColumnSidecarsIfBuilderBlobsBundleBlobsIsNotConsisten
 
     assertThatThrownBy(
             () ->
-                factory.createDataColumnSidecarsSelector(KZG.NOOP).apply(signedBlindedBeaconBlock))
+                factory
+                    .createDataColumnSidecarsSelector(NoOpKZG.INSTANCE)
+                    .apply(signedBlindedBeaconBlock))
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessage("Expected 128 proofs but got 3");
   }

beacon/validator/src/test/java/tech/pegasys/teku/validator/coordinator/ValidatorApiHandlerTest.java

@@ -57,7 +57,7 @@
 import tech.pegasys.teku.api.NetworkDataProvider;
 import tech.pegasys.teku.api.NodeDataProvider;
 import tech.pegasys.teku.api.migrated.ValidatorLivenessAtEpoch;
-import tech.pegasys.teku.api.response.v1.beacon.ValidatorStatus;
+import tech.pegasys.teku.api.response.ValidatorStatus;
 import tech.pegasys.teku.beacon.sync.events.SyncState;
 import tech.pegasys.teku.beacon.sync.events.SyncStateProvider;
 import tech.pegasys.teku.bls.BLSPublicKey;
@@ -734,7 +734,7 @@ public void createAggregate_shouldReturnAggregateFromAttestationPool() {
     final Optional<Attestation> aggregate = Optional.of(dataStructureUtil.randomAttestation());
     when(attestationPool.createAggregateFor(
             eq(attestationData.hashTreeRoot()), eq(Optional.empty())))
-        .thenReturn(aggregate.map(attestation -> ValidatableAttestation.from(spec, attestation)));
+        .thenReturn(aggregate);
 
     assertThat(
             validatorApiHandler.createAggregate(

build.gradle

@@ -21,11 +21,11 @@ buildscript {
 }
 
 plugins {
-  id 'com.diffplug.spotless' version '7.0.2'
+  id 'com.diffplug.spotless' version '7.0.3'
   id 'com.github.ben-manes.versions' version '0.52.0'
   id 'com.github.jk1.dependency-license-report' version '2.9'
   id 'io.spring.dependency-management' version '1.1.7'
-  id 'net.ltgt.errorprone' version '4.1.0' apply false
+  id 'net.ltgt.errorprone' version '4.2.0' apply false
   id 'de.undercouch.download' version '5.6.0'
   id 'org.ajoberstar.grgit' version '5.3.0'
 }
@@ -249,6 +249,9 @@ allprojects {
       check('BannedMethod', net.ltgt.gradle.errorprone.CheckSeverity.OFF)
       check('ExperimentalCliOptionMustBeCorrectlyDisplayed', net.ltgt.gradle.errorprone.CheckSeverity.OFF)
 
+      // ignore PatternMatchingInstanceof for now
+      check("PatternMatchingInstanceof", net.ltgt.gradle.errorprone.CheckSeverity.OFF)
+
       // These are experimental checks that we want enabled
       check('ClassName', net.ltgt.gradle.errorprone.CheckSeverity.WARN)
       check('DeduplicateConstants', net.ltgt.gradle.errorprone.CheckSeverity.WARN)
@@ -324,7 +327,7 @@ allprojects {
 }
 
 def nightly = System.getenv("NIGHTLY") != null
-def refTestVersion = nightly ? "nightly" : "v1.5.0-beta.4"
+def refTestVersion = nightly ? "nightly" : "v1.5.0"
 def blsRefTestVersion = 'v0.1.2'
 def slashingProtectionInterchangeRefTestVersion = 'v5.3.0'
 def refTestBaseUrl = 'https://github.com/ethereum/consensus-spec-tests/releases/download'

data/beaconrestapi/src/integration-test/java/tech/pegasys/teku/beaconrestapi/beacon/SwaggerUiTest.java

@@ -18,7 +18,7 @@
 import static tech.pegasys.teku.infrastructure.restapi.SwaggerUIBuilder.SWAGGER_INITIALIZER_JS;
 
 import java.io.IOException;
-import java.net.URL;
+import java.net.URI;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
@@ -79,18 +79,18 @@ private static Set<String> findAssets(final String url) throws IOException {
     Document doc =
         Jsoup.connect(url).data("query", "Java").userAgent("Mozilla").timeout(3000).get();
 
-    final URL baseUrl = new URL(url);
+    final URI baseUrl = URI.create(url);
 
     // Resources
     Elements resources = doc.select("link[href]");
     for (Element element : resources) {
-      links.add(new URL(baseUrl, element.attr("href")).getPath());
+      links.add(baseUrl.resolve(element.attr("href")).getPath());
     }
 
     // Scripts
     Elements scripts = doc.select("script");
     for (Element element : scripts) {
-      links.add(new URL(baseUrl, element.attr("src")).getPath());
+      links.add(baseUrl.resolve(element.attr("src")).getPath());
     }
 
     return links;

data/beaconrestapi/src/integration-test/java/tech/pegasys/teku/beaconrestapi/tekuv1/beacon/GetEth1DataCacheIntegrationTest.java

@@ -26,11 +26,11 @@
 import org.apache.tuweni.bytes.Bytes32;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import tech.pegasys.teku.api.schema.Eth1Data;
 import tech.pegasys.teku.beaconrestapi.AbstractDataBackedRestAPIIntegrationTest;
 import tech.pegasys.teku.beaconrestapi.handlers.tekuv1.beacon.GetEth1DataCache;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.SpecMilestone;
+import tech.pegasys.teku.spec.datastructures.blocks.Eth1Data;
 import tech.pegasys.teku.spec.util.DataStructureUtil;
 
 public class GetEth1DataCacheIntegrationTest extends AbstractDataBackedRestAPIIntegrationTest {
@@ -45,15 +45,11 @@ public void setup() {
 
   @Test
   public void shouldReturnAllEth1BlocksFromCache() throws IOException {
-    List<tech.pegasys.teku.spec.datastructures.blocks.Eth1Data> eth1DataCacheList =
-        new ArrayList<>();
+    final List<Eth1Data> eth1DataCacheList = new ArrayList<>();
     for (int i = 0; i < 5; i++) {
       eth1DataCacheList.add(dataStructureUtil.randomEth1Data());
     }
-    List<Eth1Data> eth1DataCacheBlocks = new ArrayList<>();
-    eth1DataCacheList.stream()
-        .map(Eth1Data::new)
-        .forEach(eth1Block -> eth1DataCacheBlocks.add(eth1Block));
+    final List<Eth1Data> eth1DataCacheBlocks = new ArrayList<>(eth1DataCacheList);
     when(eth1DataProvider.getEth1CachedBlocks()).thenReturn(eth1DataCacheList);
     final Response response = get();
     assertThat(response.code()).isEqualTo(SC_OK);
@@ -63,11 +59,11 @@ public void shouldReturnAllEth1BlocksFromCache() throws IOException {
       final JsonNode block = data.get(i);
       final Eth1Data eth1Data = eth1DataCacheBlocks.get(i);
       assertThat(Bytes32.fromHexString(block.get("deposit_root").asText()))
-          .isEqualTo(eth1Data.deposit_root);
+          .isEqualTo(eth1Data.getDepositRoot());
       assertThat(UInt64.valueOf(block.get("deposit_count").asText()))
-          .isEqualTo(eth1Data.deposit_count);
+          .isEqualTo(eth1Data.getDepositCount());
       assertThat(Bytes32.fromHexString(block.get("block_hash").asText()))
-          .isEqualTo(eth1Data.block_hash);
+          .isEqualTo(eth1Data.getBlockHash());
     }
   }
 

data/beaconrestapi/src/integration-test/java/tech/pegasys/teku/beaconrestapi/v1/beacon/GetBlindedBlockIntegrationTest.java

@@ -23,7 +23,6 @@
 import okhttp3.Response;
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.jupiter.api.Test;
-import tech.pegasys.teku.api.schema.Version;
 import tech.pegasys.teku.beaconrestapi.AbstractDataBackedRestAPIIntegrationTest;
 import tech.pegasys.teku.beaconrestapi.handlers.v1.beacon.GetBlindedBlock;
 import tech.pegasys.teku.ethereum.json.types.SharedApiTypes;
@@ -46,7 +45,8 @@ public void shouldGetBlindedPhase0Block() throws IOException {
     assertThat(result.isBlinded()).isFalse();
     assertThat(result).isEqualTo(created.get(0).getBlock());
     assertThat(result.hashTreeRoot()).isEqualTo(created.get(0).getBlock().hashTreeRoot());
-    assertThat(response.header(HEADER_CONSENSUS_VERSION)).isEqualTo(Version.phase0.name());
+    assertThat(response.header(HEADER_CONSENSUS_VERSION))
+        .isEqualTo(SpecMilestone.PHASE0.lowerCaseName());
   }
 
   @Test
@@ -59,7 +59,8 @@ public void shouldGetBlindedBellatrixBlock() throws IOException {
 
     assertThat(result.isBlinded()).isTrue();
     assertThat(result.hashTreeRoot()).isEqualTo(created.get(0).getBlock().hashTreeRoot());
-    assertThat(response.header(HEADER_CONSENSUS_VERSION)).isEqualTo(Version.bellatrix.name());
+    assertThat(response.header(HEADER_CONSENSUS_VERSION))
+        .isEqualTo(SpecMilestone.BELLATRIX.lowerCaseName());
   }
 
   @Test
@@ -75,7 +76,8 @@ public void shouldGetBellatrixBlockAsSsz() throws IOException {
             .sszDeserialize(Bytes.of(response.body().bytes()));
     assertThat(result.isBlinded()).isTrue();
     assertThat(result.hashTreeRoot()).isEqualTo(created.get(0).getBlock().hashTreeRoot());
-    assertThat(response.header(HEADER_CONSENSUS_VERSION)).isEqualTo(Version.bellatrix.name());
+    assertThat(response.header(HEADER_CONSENSUS_VERSION))
+        .isEqualTo(SpecMilestone.BELLATRIX.lowerCaseName());
   }
 
   public Response get(final String blockIdString, final String contentType) throws IOException {