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

terminal total difficulty override setting #2587

Merged
merged 11 commits into from
Sep 9, 2021
Merged

terminal total difficulty override setting #2587

merged 11 commits into from
Sep 9, 2021

Conversation

lsankar4033
Copy link
Contributor

This PR introduces a setting for merge clients to override terminal total difficulty (as discussed here).

Follow-up work:

  1. add a EIP 3675 PoS event for changes to terminal_total_difficulty
  2. explore a setting (and relevant spec logic) for a blockhash override

mkalinin
mkalinin approved these changes Sep 9, 2021
View reviewed changes
Copy link
Collaborator

@mkalinin mkalinin left a comment

Choose a reason for hiding this comment

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

Added a couple of comments. Otherwise, looks good to me 👍

specs/merge/client_settings.md Outdated Show resolved Hide resolved
specs/merge/fork.md Outdated Show resolved Hide resolved
djrtwo
djrtwo reviewed Sep 9, 2021
View reviewed changes
Copy link
Contributor

@djrtwo djrtwo left a comment

Choose a reason for hiding this comment

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

nice! just some suggested copy changes

specs/merge/client_settings.md Outdated Show resolved Hide resolved
specs/merge/client_settings.md Outdated Show resolved Hide resolved
specs/merge/client_settings.md Outdated Show resolved Hide resolved
specs/merge/client_settings.md Outdated Show resolved Hide resolved
specs/merge/client_settings.md Outdated Show resolved Hide resolved
specs/merge/client_settings.md Outdated Show resolved Hide resolved
specs/merge/client_settings.md Outdated Show resolved Hide resolved
@djrtwo
Copy link
Contributor

djrtwo commented Sep 9, 2021

You need to run make check_toc twice to get the table of contents build correct

lsankar4033 and others added 7 commits September 9, 2021 08:36
@lsankar4033 @djrtwo
Wording change
10f4ea4 
Co-authored-by: Danny Ryan <dannyjryan@gmail.com>
@lsankar4033 @mkalinin
Wording change
de14875 
Co-authored-by: Mikhail Kalinin <noblesse.knight@gmail.com>
@lsankar4033 @djrtwo
'should' -> 'must'
385ee12 
Co-authored-by: Danny Ryan <dannyjryan@gmail.com>
@lsankar4033 @djrtwo
Stronger language around usage of the setting
771933d 
Co-authored-by: Danny Ryan <dannyjryan@gmail.com>
@lsankar4033 @djrtwo
Wording change
252f4ea 
Co-authored-by: Danny Ryan <dannyjryan@gmail.com>
@lsankar4033 @djrtwo
Apply suggestions from code review
83471fe 
Co-authored-by: Danny Ryan <dannyjryan@gmail.com>
@lsankar4033
Run doctoc
879a60a
@lsankar4033 lsankar4033 merged commit 3978805 into ethereum:dev Sep 9, 2021
@lsankar4033 lsankar4033 deleted the merge-ttd-override branch September 9, 2021 18:47
@lsankar4033 lsankar4033 mentioned this pull request Sep 15, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@djrtwo djrtwo djrtwo left review comments

@mkalinin mkalinin mkalinin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lsankar4033 @djrtwo @mkalinin