From 6365f717caa0c49e73a669132720c3b92d846010 Mon Sep 17 00:00:00 2001 From: Stefan Bratanov Date: Thu, 21 Sep 2023 10:45:26 +0800 Subject: [PATCH] enable fork choice proposer boost uniqueness --- CHANGELOG.md | 3 ++- build.gradle | 2 +- .../tech/pegasys/teku/networks/Eth2NetworkConfiguration.java | 2 +- .../teku/statetransition/forkchoice/ForkChoiceTest.java | 4 +--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ddf7628cda..b7757759150 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,9 +14,10 @@ For information on changes in released versions of Teku, see the [releases page] ### Additions and Improvements - The latest version of [blst](https://github.com/supranational/blst) will automatically use optimized code paths if they are supported. As a result, `JAVA_OPTS="-Dteku.portableBlst=true"` is no longer necessary for some older systems. - The voluntary exit subcommand now accepts `--network=` command line option, using it to load the network specification rather than loading configuration from the rest api, if specified. -- Add `/teku/v1/beacon/blob_sidecars/{slot}` Teku API which returns all blob sidecars (canonical and non-canonical) at a specific slot +- Add `/teku/v1/beacon/blob_sidecars/{slot}` Teku API which returns all blob sidecars (canonical and non-canonical) at a specific slot. This endpoint will become available once Deneb fork is scheduled. - Updated LevelDb native library which is using LevelDb 1.23 using latest Snappy to 1.1.10 for compression (this change doesn't apply to Windows) - Updated holesky configuration with new genesis time of 28th September 12:00 UTC, and fork changes. +- Apply proposer boost to first block in case of equivocation ([spec PR](https://github.com/ethereum/consensus-specs/pull/3352)) ### Bug Fixes - When the rest-api's fail to start up they can now potentially 'fail fast' rather than silently ignoring the issue. \ No newline at end of file diff --git a/build.gradle b/build.gradle index a1390b1ec70..0f4608df2df 100644 --- a/build.gradle +++ b/build.gradle @@ -295,7 +295,7 @@ allprojects { } } -def refTestVersion = 'v1.4.0-beta.2' // Arbitrary change to refresh cache number: 1 +def refTestVersion = 'v1.4.0-beta.2' // Arbitrary change to refresh cache number: 2 def blsRefTestVersion = 'v0.1.2' def refTestBaseUrl = 'https://github.com/ethereum/consensus-spec-tests/releases/download' def blsRefTestBaseUrl = 'https://github.com/ethereum/bls12-381-tests/releases/download' diff --git a/ethereum/networks/src/main/java/tech/pegasys/teku/networks/Eth2NetworkConfiguration.java b/ethereum/networks/src/main/java/tech/pegasys/teku/networks/Eth2NetworkConfiguration.java index e95adb40fe6..3f7a47dc549 100644 --- a/ethereum/networks/src/main/java/tech/pegasys/teku/networks/Eth2NetworkConfiguration.java +++ b/ethereum/networks/src/main/java/tech/pegasys/teku/networks/Eth2NetworkConfiguration.java @@ -48,7 +48,7 @@ public class Eth2NetworkConfiguration { private static final int DEFAULT_STARTUP_TIMEOUT_SECONDS = 30; public static final boolean DEFAULT_FORK_CHOICE_UPDATE_HEAD_ON_BLOCK_IMPORT_ENABLED = false; - public static final boolean DEFAULT_FORK_CHOICE_PROPOSER_BOOST_UNIQUENESS_ENABLED = false; + public static final boolean DEFAULT_FORK_CHOICE_PROPOSER_BOOST_UNIQUENESS_ENABLED = true; public static final String INITIAL_STATE_URL_PATH = "eth/v2/debug/beacon/states/finalized"; // 26 thousand years should be enough diff --git a/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/forkchoice/ForkChoiceTest.java b/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/forkchoice/ForkChoiceTest.java index 52ff4045690..d40b67eaac6 100644 --- a/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/forkchoice/ForkChoiceTest.java +++ b/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/forkchoice/ForkChoiceTest.java @@ -155,9 +155,7 @@ private void setupWithSpec(final Spec spec) { new TickProcessor(spec, recentChainData), transitionBlockValidator, DEFAULT_FORK_CHOICE_UPDATE_HEAD_ON_BLOCK_IMPORT_ENABLED, - // will use DEFAULT_FORK_CHOICE_PROPOSER_BOOST_UNIQUENESS_ENABLED in an upcoming PR - // which will update to the new ref tests and set the const to true - true, + DEFAULT_FORK_CHOICE_PROPOSER_BOOST_UNIQUENESS_ENABLED, metricsSystem); // Starting and mocks