Merge branch 'master' into sync-committee-duties

Author: courtneyeh

Diff for: .github/workflows/codeql.yml

@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: adopt
           java-version: 17

Diff for: CHANGELOG.md

@@ -10,9 +10,12 @@ the [releases page](https://github.com/Consensys/teku/releases).
 ## Unreleased Changes
 
 ### Breaking Changes
+- When a lock file is unable to be cleaned up, the (BN or VC) will now exit code 2 in preference to being 'up' but not able to perform duties. This will not self recover and will need intervention from the node operator.
 
 ### Additions and Improvements
 - Improve block rewards calculation performance for `/eth/v3/validator/blocks/{slot}` block production beacon node API.
 - Updated Javalin to v.6 (used by rest-api and keymanager-api).
+- Docker image tags now default to jdk21 images unless a jdk-specific tag is used.
 
 ### Bug Fixes
+- Fixed an issue where stale lock files weren't able to be cleaned up and would effectively park the service (BN or VC) with no user errors or any indication that the service was in a bad state.

Diff for: acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/AddValidatorsAcceptanceTest.java

@@ -16,7 +16,8 @@
 import org.junit.jupiter.api.Test;
 import tech.pegasys.teku.test.acceptance.dsl.AcceptanceTestBase;
 import tech.pegasys.teku.test.acceptance.dsl.GenesisGenerator.InitialStateData;
-import tech.pegasys.teku.test.acceptance.dsl.TekuNode;
+import tech.pegasys.teku.test.acceptance.dsl.TekuBeaconNode;
+import tech.pegasys.teku.test.acceptance.dsl.TekuNodeConfigBuilder;
 import tech.pegasys.teku.test.acceptance.dsl.tools.deposits.ValidatorKeystores;
 
 public class AddValidatorsAcceptanceTest extends AcceptanceTestBase {
@@ -37,13 +38,13 @@ void shouldLoadAdditionalValidatorsWithoutRestart() throws Exception {
             .validatorKeys(initialKeystores, additionalKeystores)
             .generate();
 
-    final TekuNode node =
-        createTekuNode(
-            config ->
-                config
-                    .withNetwork(networkName)
-                    .withInitialState(genesis)
-                    .withValidatorKeystores(initialKeystores));
+    final TekuBeaconNode node =
+        createTekuBeaconNode(
+            TekuNodeConfigBuilder.createBeaconNode()
+                .withNetwork(networkName)
+                .withInitialState(genesis)
+                .withReadOnlyKeystorePath(initialKeystores)
+                .build());
     node.start();
 
     node.waitForOwnedValidatorCount(2);

Diff for: acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/AttestationGossipAcceptanceTest.java

@@ -16,27 +16,30 @@
 import org.junit.jupiter.api.Test;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.test.acceptance.dsl.AcceptanceTestBase;
-import tech.pegasys.teku.test.acceptance.dsl.TekuNode;
+import tech.pegasys.teku.test.acceptance.dsl.TekuBeaconNode;
+import tech.pegasys.teku.test.acceptance.dsl.TekuNodeConfigBuilder;
 
 public class AttestationGossipAcceptanceTest extends AcceptanceTestBase {
   @Test
   public void shouldFinalizeWithTwoNodes() throws Exception {
-    final TekuNode node1 =
-        createTekuNode(
-            config -> config.withRealNetwork().withNetwork("minimal").withInteropValidators(0, 32));
+    final TekuBeaconNode node1 =
+        createTekuBeaconNode(
+            TekuNodeConfigBuilder.createBeaconNode()
+                .withRealNetwork()
+                .withInteropValidators(0, 32)
+                .build());
 
     node1.start();
     final UInt64 genesisTime = node1.getGenesisTime();
 
-    final TekuNode node2 =
-        createTekuNode(
-            config ->
-                config
-                    .withNetwork("minimal")
-                    .withGenesisTime(genesisTime.intValue())
-                    .withRealNetwork()
-                    .withPeers(node1)
-                    .withInteropValidators(32, 32));
+    final TekuBeaconNode node2 =
+        createTekuBeaconNode(
+            TekuNodeConfigBuilder.createBeaconNode()
+                .withGenesisTime(genesisTime.intValue())
+                .withRealNetwork()
+                .withPeers(node1)
+                .withInteropValidators(32, 32)
+                .build());
     node2.start();
 
     node2.waitForAttestationBeingGossiped(32, 64);

Diff for: acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/BellatrixMergeTransitionAcceptanceTest.java

@@ -14,14 +14,16 @@
 package tech.pegasys.teku.test.acceptance;
 
 import com.google.common.io.Resources;
+import java.io.IOException;
 import java.net.URL;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import tech.pegasys.teku.infrastructure.time.SystemTimeProvider;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.test.acceptance.dsl.AcceptanceTestBase;
 import tech.pegasys.teku.test.acceptance.dsl.BesuNode;
-import tech.pegasys.teku.test.acceptance.dsl.TekuNode;
+import tech.pegasys.teku.test.acceptance.dsl.TekuBeaconNode;
+import tech.pegasys.teku.test.acceptance.dsl.TekuNodeConfigBuilder;
 import tech.pegasys.teku.test.acceptance.dsl.tools.deposits.ValidatorKeystores;
 
 public class BellatrixMergeTransitionAcceptanceTest extends AcceptanceTestBase {
@@ -31,7 +33,7 @@ public class BellatrixMergeTransitionAcceptanceTest extends AcceptanceTestBase {
 
   private final SystemTimeProvider timeProvider = new SystemTimeProvider();
   private BesuNode eth1Node;
-  private TekuNode tekuNode;
+  private TekuBeaconNode tekuNode;
 
   @BeforeEach
   void setup() throws Exception {
@@ -50,16 +52,16 @@ void setup() throws Exception {
     final ValidatorKeystores validatorKeystores =
         createTekuDepositSender(NETWORK_NAME).sendValidatorDeposits(eth1Node, totalValidators);
     tekuNode =
-        createTekuNode(
-            config ->
-                configureTekuNode(config, genesisTime)
-                    .withDepositsFrom(eth1Node)
-                    .withStartupTargetPeerCount(0)
-                    .withValidatorKeystores(validatorKeystores)
-                    .withValidatorProposerDefaultFeeRecipient(
-                        "0xFE3B557E8Fb62b89F4916B721be55cEb828dBd73")
-                    .withExecutionEngine(eth1Node)
-                    .withJwtSecretFile(JWT_FILE));
+        createTekuBeaconNode(
+            configureTekuNode(genesisTime)
+                .withDepositsFrom(eth1Node)
+                .withExecutionEngine(eth1Node)
+                .withStartupTargetPeerCount(0)
+                .withReadOnlyKeystorePath(validatorKeystores)
+                .withValidatorProposerDefaultFeeRecipient(
+                    "0xFE3B557E8Fb62b89F4916B721be55cEb828dBd73")
+                .withJwtSecretFile(JWT_FILE)
+                .build());
     tekuNode.start();
   }
 
@@ -71,8 +73,8 @@ void shouldHaveNonDefaultExecutionPayloadAndFinalizeAfterMergeTransition() {
     tekuNode.waitForNewFinalization();
   }
 
-  private TekuNode.Config configureTekuNode(final TekuNode.Config node, final int genesisTime) {
-    return node.withNetwork(NETWORK_NAME)
+  private TekuNodeConfigBuilder configureTekuNode(final int genesisTime) throws IOException {
+    return TekuNodeConfigBuilder.createBeaconNode()
         .withBellatrixEpoch(UInt64.ONE)
         .withTotalTerminalDifficulty(10001)
         .withGenesisTime(genesisTime);

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

@@ -13,6 +13,7 @@
 
 package tech.pegasys.teku.test.acceptance;
 
+import java.io.IOException;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import tech.pegasys.teku.api.response.v1.EventType;
@@ -21,13 +22,11 @@
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.datastructures.interop.MockStartValidatorKeyPairFactory;
 import tech.pegasys.teku.test.acceptance.dsl.AcceptanceTestBase;
-import tech.pegasys.teku.test.acceptance.dsl.TekuNode;
-import tech.pegasys.teku.test.acceptance.dsl.TekuNode.Config;
+import tech.pegasys.teku.test.acceptance.dsl.TekuBeaconNode;
+import tech.pegasys.teku.test.acceptance.dsl.TekuNodeConfigBuilder;
 
 public class BlsToExecutionChangeAcceptanceTest extends AcceptanceTestBase {
 
-  private static final String NETWORK_NAME = "swift";
-
   @Test
   void shouldUpdateWithdrawalCredentials() throws Exception {
     final int validatorIndex = 0;
@@ -39,12 +38,12 @@ void shouldUpdateWithdrawalCredentials() throws Exception {
         Eth1Address.fromHexString("0xFE3B557E8Fb62b89F4916B721be55cEb828dBd73");
     final UInt64 capellaActivationEpoch = UInt64.ONE;
 
-    final TekuNode primaryNode = createPrimaryNode(executionAddress, capellaActivationEpoch);
+    final TekuBeaconNode primaryNode = createPrimaryNode(executionAddress, capellaActivationEpoch);
     primaryNode.start();
     primaryNode.waitForNextEpoch();
     primaryNode.startEventListener(EventType.bls_to_execution_change);
 
-    final TekuNode lateJoiningNode =
+    final TekuBeaconNode lateJoiningNode =
         createLateJoiningNode(capellaActivationEpoch, primaryNode, primaryNode.getGenesisTime());
     lateJoiningNode.start();
     lateJoiningNode.waitUntilInSyncWith(primaryNode);
@@ -57,36 +56,37 @@ void shouldUpdateWithdrawalCredentials() throws Exception {
     lateJoiningNode.waitForBlsToExecutionChangeEventForValidator(0);
   }
 
-  private TekuNode createPrimaryNode(
-      final Eth1Address executionAddress, final UInt64 capellaActivationEpoch) {
-    return createTekuNode(
-        c -> {
-          c.withNetwork(NETWORK_NAME)
-              .withRealNetwork()
-              .withStartupTargetPeerCount(0)
-              .withValidatorProposerDefaultFeeRecipient(executionAddress.toHexString());
-          applyMilestoneConfig(c, capellaActivationEpoch);
-        });
+  private TekuBeaconNode createPrimaryNode(
+      final Eth1Address executionAddress, final UInt64 capellaActivationEpoch) throws IOException {
+    return createTekuBeaconNode(
+        beaconNodeWithMilestones(capellaActivationEpoch)
+            .withStartupTargetPeerCount(0)
+            .withValidatorProposerDefaultFeeRecipient(executionAddress.toHexString())
+            .build());
   }
 
-  private TekuNode createLateJoiningNode(
-      final UInt64 capellaActivationEpoch, final TekuNode primaryNode, final UInt64 genesisTime) {
-    return createTekuNode(
-        c -> {
-          c.withGenesisTime(genesisTime.intValue())
-              .withNetwork(NETWORK_NAME)
-              .withRealNetwork()
-              .withPeers(primaryNode)
-              .withInteropValidators(0, 0);
-          applyMilestoneConfig(c, capellaActivationEpoch);
-        });
+  private TekuBeaconNode createLateJoiningNode(
+      final UInt64 capellaActivationEpoch,
+      final TekuBeaconNode primaryNode,
+      final UInt64 genesisTime)
+      throws IOException {
+    return createTekuBeaconNode(
+        beaconNodeWithMilestones(capellaActivationEpoch)
+            .withPeers(primaryNode)
+            .withGenesisTime(genesisTime.intValue())
+            .withInteropValidators(0, 0)
+            .build());
   }
 
-  private static void applyMilestoneConfig(final Config c, final UInt64 capellaForkEpoch) {
-    c.withAltairEpoch(UInt64.ZERO);
-    c.withBellatrixEpoch(UInt64.ZERO);
-    c.withCapellaEpoch(capellaForkEpoch);
-    c.withTotalTerminalDifficulty(0);
-    c.withStubExecutionEngine("0x14e88057b0b7538a8205cb07726a0de03dd69d9a70e88bcffae15ca3fc6b5215");
+  private static TekuNodeConfigBuilder beaconNodeWithMilestones(final UInt64 capellaActivationEpoch)
+      throws IOException {
+    return TekuNodeConfigBuilder.createBeaconNode()
+        .withRealNetwork()
+        .withAltairEpoch(UInt64.ZERO)
+        .withBellatrixEpoch(UInt64.ZERO)
+        .withCapellaEpoch(capellaActivationEpoch)
+        .withTotalTerminalDifficulty(0)
+        .withStubExecutionEngine(
+            "0x14e88057b0b7538a8205cb07726a0de03dd69d9a70e88bcffae15ca3fc6b5215");
   }
 }

Diff for: acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/CapellaUpgradeAcceptanceTest.java

@@ -24,8 +24,8 @@
 import tech.pegasys.teku.test.acceptance.dsl.AcceptanceTestBase;
 import tech.pegasys.teku.test.acceptance.dsl.BesuDockerVersion;
 import tech.pegasys.teku.test.acceptance.dsl.BesuNode;
-import tech.pegasys.teku.test.acceptance.dsl.TekuNode;
-import tech.pegasys.teku.test.acceptance.dsl.TekuNode.Config;
+import tech.pegasys.teku.test.acceptance.dsl.TekuBeaconNode;
+import tech.pegasys.teku.test.acceptance.dsl.TekuNodeConfigBuilder;
 
 /**
  * The test is based on `shanghaiTime` in Besu EL genesis config as the only option to start
@@ -72,46 +72,40 @@ void shouldUpgradeToCapella() throws Exception {
     secondaryEL.start();
     secondaryEL.addPeer(primaryEL);
 
-    TekuNode primaryNode =
-        createTekuNode(
-            config -> {
-              config
-                  .withGenesisTime(genesisTime)
-                  .withRealNetwork()
-                  .withStartupTargetPeerCount(0)
-                  .withExecutionEngine(primaryEL)
-                  .withJwtSecretFile(JWT_FILE);
-              applyMilestoneConfig(config);
-            });
+    TekuBeaconNode primaryNode =
+        createTekuBeaconNode(
+            beaconNodeConfigWithForks(genesisTime, primaryEL)
+                .withStartupTargetPeerCount(0)
+                .build());
 
     primaryNode.start();
     primaryNode.waitForMilestone(SpecMilestone.CAPELLA);
 
     final int primaryNodeGenesisTime = primaryNode.getGenesisTime().intValue();
 
-    TekuNode lateJoiningNode =
-        createTekuNode(
-            c -> {
-              c.withGenesisTime(primaryNodeGenesisTime)
-                  .withRealNetwork()
-                  .withPeers(primaryNode)
-                  .withInteropValidators(0, 0)
-                  .withExecutionEngine(secondaryEL)
-                  .withJwtSecretFile(JWT_FILE);
-              applyMilestoneConfig(c);
-            });
+    TekuBeaconNode lateJoiningNode =
+        createTekuBeaconNode(
+            beaconNodeConfigWithForks(primaryNodeGenesisTime, secondaryEL)
+                .withPeers(primaryNode)
+                .withInteropValidators(0, 0)
+                .build());
 
     lateJoiningNode.start();
     lateJoiningNode.waitUntilInSyncWith(primaryNode);
 
     primaryNode.waitForNewBlock();
   }
 
-  private static void applyMilestoneConfig(final Config config) {
-    config
+  private static TekuNodeConfigBuilder beaconNodeConfigWithForks(
+      final int genesisTime, final BesuNode besuNode) throws Exception {
+    return TekuNodeConfigBuilder.createBeaconNode()
         .withAltairEpoch(UInt64.ZERO)
         .withBellatrixEpoch(UInt64.ZERO)
         .withCapellaEpoch(UInt64.ONE)
-        .withTotalTerminalDifficulty(0);
+        .withTotalTerminalDifficulty(0)
+        .withGenesisTime(genesisTime)
+        .withExecutionEngine(besuNode)
+        .withJwtSecretFile(JWT_FILE)
+        .withRealNetwork();
   }
 }