Revert "Schedule deneb for mainnet (Consensys#7966)"

This reverts commit 49e8e07.
lucassaldanha · Feb 19, 2024 · 04064ea · 04064ea
1 parent 2ae4fb1
commit 04064ea
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,13 @@ the [releases page](/~https://github.com/Consensys/teku/releases).
 
 ### Breaking Changes
 
-### Additions and Improvements
-- Improve block rewards calculation performance for `/eth/v3/validator/blocks/{slot}` block production beacon node API.
+- The CLI options `--beacon-events-block-notify-when-validated-enabled` and
+  `--beacon-events-block-notify-when-imported-enabled` have been removed. This change was made due
+  to redundancy, as the functionality of these options is now covered by the new `block_gossip` and
+  the existing `block` SSE events.
 
+### Additions and Improvements
+- Improved compatibility with `/eth/v3/validator/blocks/{slot}` experimental beacon API for block production. It can now respond with blinded and unblinded content based on the block production flow. It also supports the `builder_boost_factor` parameter.
+- Add `block_gossip` SSE event as per /~https://github.com/ethereum/beacon-APIs/pull/405
+- - Deposit tree snapshots will be downloaded from checkpoint-sync-url when available [#7715](/~https://github.com/Consensys/teku/issues/7715)
 ### Bug Fixes
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/mainnet.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/mainnet.yaml
@@ -49,7 +49,7 @@ CAPELLA_FORK_VERSION: 0x03000000
 CAPELLA_FORK_EPOCH: 194048  # April 12, 2023, 10:27:35pm UTC
 # Deneb
 DENEB_FORK_VERSION: 0x04000000
-DENEB_FORK_EPOCH: 269568  # March 13, 2024, 01:55:35pm UTC
+DENEB_FORK_EPOCH: 18446744073709551615
 # EIP6110
 EIP6110_FORK_VERSION: 0x05000000  # temporary stub
 EIP6110_FORK_EPOCH: 18446744073709551615

diff --git a/ethereum/spec/src/test/java/tech/pegasys/teku/spec/SpecFactoryTest.java b/ethereum/spec/src/test/java/tech/pegasys/teku/spec/SpecFactoryTest.java
@@ -39,16 +39,16 @@ public class SpecFactoryTest {
 
   private static final Set<String> NON_BELLATRIX_NETWORKS = Set.of("swift", "less-swift");
 
-  private static final Set<String> CAPELLA_NETWORKS = Set.of("lukso");
+  private static final Set<String> CAPELLA_NETWORKS = Set.of("mainnet", "gnosis", "lukso");
 
   private static final Set<String> DENEB_NETWORKS =
-      Set.of("prater", "gnosis", "chiado", "sepolia", "holesky", "mainnet");
+      Set.of("prater", "chiado", "sepolia", "holesky");
 
   @Test
-  public void defaultFactoryShouldScheduleBellatrixCapellaAndDenebForMainNet() {
+  public void defaultFactoryShouldScheduleBellatrixAndCapellaForMainNet() {
     final Spec spec = SpecFactory.create("mainnet");
     assertThat(spec.getForkSchedule().getSupportedMilestones())
-        .containsExactly(PHASE0, ALTAIR, BELLATRIX, CAPELLA, DENEB);
+        .containsExactly(PHASE0, ALTAIR, BELLATRIX, CAPELLA);
   }
 
   @ParameterizedTest(name = "{0}")

diff --git a/teku/src/test/java/tech/pegasys/teku/cli/options/Eth2NetworkOptionsTest.java b/teku/src/test/java/tech/pegasys/teku/cli/options/Eth2NetworkOptionsTest.java
@@ -34,11 +34,11 @@
 
 class Eth2NetworkOptionsTest extends AbstractBeaconNodeCommandTest {
   @Test
-  void shouldEnableDenebByDefault() {
+  void shouldEnableCapellaByDefault() {
     final TekuConfiguration config = getTekuConfigurationFromArguments();
     final Spec spec = config.eth2NetworkConfiguration().getSpec();
     assertThat(spec.getForkSchedule().getHighestSupportedMilestone())
-        .isEqualTo(SpecMilestone.DENEB);
+        .isEqualTo(SpecMilestone.CAPELLA);
   }
 
   @Test

diff --git a/teku/src/test/java/tech/pegasys/teku/cli/options/P2POptionsTest.java b/teku/src/test/java/tech/pegasys/teku/cli/options/P2POptionsTest.java
@@ -319,14 +319,14 @@ public void forwardSyncRateLimit_shouldBeSettable() {
   public void forwardSyncBatchSize_greaterThanMessageSizeShouldThrowException() {
     assertThatThrownBy(() -> createConfigBuilder().sync(s -> s.forwardSyncBatchSize(3000)).build())
         .isInstanceOf(InvalidConfigurationException.class)
-        .hasMessage("Forward sync batch size cannot be greater than 128");
+        .hasMessage("Forward sync batch size cannot be greater than 1024");
   }
 
   @Test
   public void historicalSyncBatchSize_greaterThanMessageSizeShouldThrowException() {
     assertThatThrownBy(
             () -> createConfigBuilder().sync(s -> s.historicalSyncBatchSize(3000)).build())
         .isInstanceOf(InvalidConfigurationException.class)
-        .hasMessage("Historical sync batch size cannot be greater than 128");
+        .hasMessage("Historical sync batch size cannot be greater than 1024");
   }
 }