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.

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

Feature/remove experimental merge flag #3875

Conversation

garyschulte
Copy link
Contributor

PR description

removes merge specific flags and defers to genesis configuration to enable or disable merge transition and engine api

  • deprecates --Xmerge-support
  • deprecates --engine-rpc-enabled

Fixed Issue(s)

fixed remainder of #3838

Documentation

  • I thought about documentation and added the doc-change-required label to this PR if
    updates are required.

Changelog

Copy link
Contributor

@macfarla macfarla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. couple of comments

@@ -569,8 +567,9 @@ static class GraphQlOptionGroup {
static class EngineRPCOptionGroup {
@Option(
names = {"--engine-rpc-enabled"},
description = "Set to start the Engine JSON-RPC service (default: ${DEFAULT-VALUE})")
private final Boolean isEngineRpcEnabled = false;
description = "deprected parameter, do not use.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/deprected/deprecated

CHANGELOG.md Outdated
@@ -7,6 +7,7 @@
- multi-arch docker builds for amd64 and arm64 [#2954](https://github.com/hyperledger/besu/pull/2954)
- Filter Netty native lib errors likewise the pure Java implementation [#3807](https://github.com/hyperledger/besu/pull/3807)
- Add ropsten terminal total difficulty config [#3871](https://github.com/hyperledger/besu/pull/3871)
- Deprecate experimental merge flag and engine-rpc-enabled flag [#3875](https://github.com/hyperledger/besu/pull/3875)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will need to move to 22.4.2

Signed-off-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: garyschulte <garyschulte@gmail.com>
@garyschulte garyschulte force-pushed the feature/remove-experimental-merge-flag branch from 45a41ef to 3e69200 Compare May 20, 2022 23:05
@garyschulte garyschulte enabled auto-merge (squash) May 20, 2022 23:06
@sonarcloud
Copy link

sonarcloud bot commented May 20, 2022

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 2 Code Smells

76.9% 76.9% Coverage
0.0% 0.0% Duplication

@garyschulte garyschulte merged commit 20daaf4 into hyperledger:main May 20, 2022
@garyschulte garyschulte deleted the feature/remove-experimental-merge-flag branch May 20, 2022 23:29
@fab-10
Copy link
Contributor

fab-10 commented May 23, 2022

Even if the flag was experimental, some users that are still referring to previous instructions are confused since Besu does not start, so probably some documentation needs to be updated as consequence of this.

sharad-develop pushed a commit to sharad-develop/besu that referenced this pull request May 27, 2022
* deprecate Xmerge-support and engine-rpc-enabled cli params

Signed-off-by: garyschulte <garyschulte@gmail.com>
Signed-off-by: Sharad Gulati <sharad.develop@gmail.com>
eum602 pushed a commit to lacchain/besu that referenced this pull request Nov 3, 2023
* deprecate Xmerge-support and engine-rpc-enabled cli params

Signed-off-by: garyschulte <garyschulte@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants