From db60fa04e19f32cd2f89ea35c8974b5e04152ad4 Mon Sep 17 00:00:00 2001 From: Stefan Bratanov Date: Tue, 19 Sep 2023 18:14:40 +0800 Subject: [PATCH] set cli option to default to false --- CHANGELOG.md | 1 - .../tech/pegasys/teku/networks/Eth2NetworkConfiguration.java | 2 +- .../teku/statetransition/forkchoice/ForkChoiceTest.java | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 527af834460..51dbc9e4316 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,6 @@ For information on changes in released versions of Teku, see the [releases page] - 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 - 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) -- 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/ethereum/networks/src/main/java/tech/pegasys/teku/networks/Eth2NetworkConfiguration.java b/ethereum/networks/src/main/java/tech/pegasys/teku/networks/Eth2NetworkConfiguration.java index 7773dbe1a80..fc4736cdddc 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 = true; + public static final boolean DEFAULT_FORK_CHOICE_PROPOSER_BOOST_UNIQUENESS_ENABLED = false; 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 d2ef9a3cc64..2a659d77d45 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,7 +155,9 @@ private void setupWithSpec(final Spec spec) { new TickProcessor(spec, recentChainData), transitionBlockValidator, DEFAULT_FORK_CHOICE_UPDATE_HEAD_ON_BLOCK_IMPORT_ENABLED, - DEFAULT_FORK_CHOICE_PROPOSER_BOOST_UNIQUENESS_ENABLED, + // will use the static const parameter in an upcoming PR which will update the ref tests + // and set the const to true + true, metricsSystem); // Starting and mocks