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

Deprecate eth1 and dummy-eth1 flags #6566

Merged
merged 3 commits into from
Nov 18, 2024

Conversation

michaelsproul
Copy link
Member

Proposed Changes

Deprecate the following beacon node flags:

  • --eth1: No longer required because it is enabled by default. The deposit contract sync can be disabled via a separate flag --disable-deposit-contract-sync, which has existed since the merge.
  • --dummy-eth1: Very rarely used and of limited utility.

@michaelsproul michaelsproul added work-in-progress PR is a work-in-progress v6.0.0 New major release for hierarchical state diffs labels Nov 5, 2024
@michaelsproul michaelsproul changed the title Deprecate eth1 flag Deprecate eth1 and dummy-eth1 flags Nov 5, 2024
@michaelsproul michaelsproul added ready-for-review The code is ready for review backwards-incompat Backwards-incompatible API change and removed work-in-progress PR is a work-in-progress labels Nov 6, 2024
Copy link
Collaborator

@eserilev eserilev left a comment

Choose a reason for hiding this comment

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

nit

// Always follow the deposit contract when there is an execution endpoint.
//
// This is wasteful for non-staking nodes as they have no need to process deposit contract
// logs and build an "eth1" cache. The alternative is to explicitly require the `--eth1` or
// `--staking` flags, however that poses a risk to stakers since they cannot produce blocks
// without "eth1".
//
// The waste for non-staking nodes is relatively small so we err on the side of safety for
// stakers. The merge is already complicated enough.
client_config.sync_eth1_chain = true;

since sync_eth1_chain is now true by default, I think this line is redundant. Also the comments about the deprecated --eth-1 flag might no longer be relevant.

EDIT:

also this line here may be redundant

client_config.sync_eth1_chain = true;

@michaelsproul
Copy link
Member Author

Nice catch, thanks @eserilev. I've removed that redundant code and also added a conflicts_with for --staking and --disable-deposit-contract-sync. Other than the conflicts_with clause, staking is basically identical to http now, but this may not remain the case forever, and I think our users appreciate this flag.

Copy link
Collaborator

@eserilev eserilev left a comment

Choose a reason for hiding this comment

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

LGTM!

@michaelsproul michaelsproul added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review labels Nov 18, 2024
@michaelsproul
Copy link
Member Author

@mergify queue

Copy link

mergify bot commented Nov 18, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at c5007ea

mergify bot added a commit that referenced this pull request Nov 18, 2024
@mergify mergify bot merged commit c5007ea into sigp:unstable Nov 18, 2024
29 of 30 checks passed
@michaelsproul michaelsproul deleted the deprecate-eth1-flag branch November 18, 2024 09:57
chong-he pushed a commit to chong-he/lighthouse that referenced this pull request Nov 26, 2024
* Deprecate eth1/dummy-eth1 flags

* Update book

* Simplify + make staking conflict with disable-deposit-contract
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backwards-incompat Backwards-incompatible API change ready-for-merge This PR is ready to merge. v6.0.0 New major release for hierarchical state diffs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants