Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set DEFAULT_BUILDER_BID_COMPARE_FACTOR to 90 #8108

Merged
merged 6 commits into from
Mar 21, 2024
Merged

Set DEFAULT_BUILDER_BID_COMPARE_FACTOR to 90 #8108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5468206
Set DEFAULT_BUILDER_BID_COMPARE_FACTOR to 90
fredriksvantes Mar 19, 2024
d7de293
Update CHANGELOG.md to include new builder bid default
fredriksvantes Mar 19, 2024
0ba5953
removed import of BUILDER_BOOST_FACTOR_MAX_PROFIT;
fredriksvantes Mar 19, 2024
6244369
Changed DEFAULT_BUILDER_BID_COMPARE_FACTOR value to uint64
fredriksvantes Mar 19, 2024
4803075
fix test
tbenr Mar 21, 2024
c7a4b96
Merge branch 'master' into patch-4
tbenr Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ the [releases page](https://github.com/Consensys/teku/releases).
- `—p2p-private-key-file` command line option supports reading a binary private key file.
- Updated libp2p seen cache configuration to reflect EIP-7045 spec changes. This reduces CPU and network bandwidth consumption.
- Increased the attestation cache capacity to allow teku a bigger pool of attestations when block building.
- Set DEFAULT_BUILDER_BID_COMPARE_FACTOR to 90. This makes it necessary for external block builders to give at least 10% additional profit compared to a local build before being taken into consideration. If you would like to go back to the previous default, execute the client with --builder-bid-compare-factor=100

### Bug Fixes
3 changes: 1 addition & 2 deletions .../src/main/java/tech/pegasys/teku/services/executionlayer/ExecutionLayerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package tech.pegasys.teku.services.executionlayer;

import static com.google.common.base.Preconditions.checkState;
import static tech.pegasys.teku.ethereum.executionlayer.ExecutionBuilderModule.BUILDER_BOOST_FACTOR_MAX_PROFIT;
import static tech.pegasys.teku.ethereum.executionlayer.ExecutionBuilderModule.BUILDER_BOOST_FACTOR_PREFER_BUILDER;
import static tech.pegasys.teku.spec.executionlayer.ExecutionLayerChannel.STUB_ENDPOINT_PREFIX;

Expand All @@ -35,7 +34,7 @@ public class ExecutionLayerConfiguration {
public static final int DEFAULT_BUILDER_CIRCUIT_BREAKER_ALLOWED_FAULTS = 5;
public static final int DEFAULT_BUILDER_CIRCUIT_BREAKER_ALLOWED_CONSECUTIVE_FAULTS = 3;
public static final int BUILDER_CIRCUIT_BREAKER_WINDOW_HARD_CAP = 64;
public static final UInt64 DEFAULT_BUILDER_BID_COMPARE_FACTOR = BUILDER_BOOST_FACTOR_MAX_PROFIT;
public static final UInt64 DEFAULT_BUILDER_BID_COMPARE_FACTOR = UInt64.valueOf(90);
public static final boolean DEFAULT_BUILDER_SET_USER_AGENT_HEADER = true;
public static final boolean DEFAULT_USE_SHOULD_OVERRIDE_BUILDER_FLAG = true;
public static final boolean DEFAULT_EXCHANGE_CAPABILITIES_MONITORING_ENABLED = true;
Expand Down
4 changes: 2 additions & 2 deletions .../test/java/tech/pegasys/teku/services/executionlayer/ExecutionLayerConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;
import static tech.pegasys.teku.ethereum.executionlayer.ExecutionBuilderModule.BUILDER_BOOST_FACTOR_MAX_PROFIT;
import static tech.pegasys.teku.ethereum.executionlayer.ExecutionBuilderModule.BUILDER_BOOST_FACTOR_PREFER_BUILDER;
import static tech.pegasys.teku.services.executionlayer.ExecutionLayerConfiguration.BUILDER_ALWAYS_KEYWORD;
import static tech.pegasys.teku.services.executionlayer.ExecutionLayerConfiguration.DEFAULT_BUILDER_BID_COMPARE_FACTOR;

import org.junit.jupiter.api.Test;
import tech.pegasys.teku.infrastructure.exceptions.InvalidConfigurationException;
Expand Down Expand Up @@ -87,7 +87,7 @@ public void shouldParseBuilderBidCompareFactor() {
public void shouldHaveCorrectDefaultBuilderBidCompareFactor() {
final ExecutionLayerConfiguration.Builder builder1 = configBuilder.specProvider(bellatrixSpec);
assertThat(builder1.build().getBuilderBidCompareFactor())
.isEqualByComparingTo(BUILDER_BOOST_FACTOR_MAX_PROFIT);
.isEqualByComparingTo(DEFAULT_BUILDER_BID_COMPARE_FACTOR);
}

@Test
Expand Down