Skip to content

Remove TTD flags and safe-slots-to-import-* #6489

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

Merged
merged 8 commits into from
Oct 21, 2024

Conversation

michaelsproul
Copy link
Member

Proposed Changes

Start deleting some merge logic and flags. We don't need to carry this stuff around forever.

  • Delete all traces of SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY. This concept was removed from the spec, so this was just dead code.
  • Delete CLI flags related to terminal total difficulty.

Ripping out the TTD logic more thoroughly proved to be more involved. A lot of our tests still depend on doing the merge transition, which is annoying. I have another branch where I started that work, but will submit it separately.

@michaelsproul michaelsproul added ready-for-review The code is ready for review code-quality backwards-incompat Backwards-incompatible API change v6.0.0 New major release for hierarchical state diffs labels Oct 15, 2024
@michaelsproul michaelsproul changed the title Remove merge flags Remove TTD flags and safe-slots-to-import-* Oct 15, 2024
Copy link
Member

@macladson macladson left a comment

Choose a reason for hiding this comment

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

I can't seem to comment on the files directly but there's a few more references to safe_slots in the consensus/types/presets files and also book/src/api-vc-endpoints that I think we can remove.

@macladson macladson added waiting-on-author The reviewer has suggested changes and awaits thier implementation. and removed ready-for-review The code is ready for review labels Oct 17, 2024
@michaelsproul michaelsproul added ready-for-review The code is ready for review and removed waiting-on-author The reviewer has suggested changes and awaits thier implementation. labels Oct 18, 2024
@michaelsproul
Copy link
Member Author

Updated thanks

Copy link
Member

@macladson macladson left a comment

Choose a reason for hiding this comment

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

LGTM!

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

@mergify queue

Copy link

mergify bot commented Oct 21, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at a732a87

mergify bot added a commit that referenced this pull request Oct 21, 2024
@mergify mergify bot merged commit a732a87 into sigp:unstable Oct 21, 2024
30 checks passed
@michaelsproul michaelsproul deleted the remove-merge-flags branch October 21, 2024 02:27
chong-he pushed a commit to chong-he/lighthouse that referenced this pull request Nov 26, 2024
* Delete SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY

* Update fork choice tests

* Remove TTD related flags

* Add deprecation warning

* Remove more dead code

* Delete EF on_merge_block tests

* Remove even more dead code

* Address Mac's review comments
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 code-quality 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