Skip to content

Add block ban flag --invalid-block-roots #7042

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
Merged
mergify merged 14 commits into from
Mar 17, 2025
Merged

Add block ban flag --invalid-block-roots #7042

mergify merged 14 commits into from
Mar 17, 2025

Conversation

@eserilev
Copy link
Member

@eserilev eserilev commented Feb 26, 2025

Add a new flag that allows users to ban block roots listed in a file. Also make sure the hardcoded invalid block root is only considered on holesky

@michaelsproul michaelsproul added the v7.0.0-beta.clean Clean release post Holesky rescue label Feb 26, 2025
This was referenced Feb 26, 2025
Closed
Closed
jimmygchen
jimmygchen approved these changes Feb 26, 2025
View reviewed changes
Copy link
Member

@jimmygchen jimmygchen left a comment

Choose a reason for hiding this comment

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

Nice, LGTM!

@michaelsproul michaelsproul changed the base branch from holesky-rescue to release-v7.0.0 February 26, 2025 07:06
@michaelsproul michaelsproul requested a review from jxs as a code owner February 26, 2025 07:06
@michaelsproul
Copy link
Member

michaelsproul commented Feb 26, 2025

I've cherry-picked all the block ban related changes to this PR and rebased on release-v7.0.0 so we can have a clean history with each feature in its own PR.

@michaelsproul
Copy link
Member

michaelsproul commented Feb 26, 2025 •
edited
Loading

I reverted the ignore for the tests, because they were caused by the fork choice invalidation changes, which we do not want to keep.

@michaelsproul michaelsproul changed the title Add Block ban flag Add block ban flag --invalid-block-roots Feb 26, 2025
@michaelsproul michaelsproul added the ready-for-review The code is ready for review label Feb 26, 2025
jimmygchen
jimmygchen approved these changes Feb 26, 2025
View reviewed changes
Copy link
Member

@jimmygchen jimmygchen left a comment

Choose a reason for hiding this comment

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

Looks good 👍

dapplion
dapplion reviewed Feb 26, 2025
View reviewed changes
dapplion
dapplion reviewed Feb 26, 2025
View reviewed changes
dapplion
dapplion reviewed Feb 26, 2025
View reviewed changes
@mergify
Copy link

mergify bot commented Feb 26, 2025

This pull request has merge conflicts. Could you please resolve them @eserilev? 🙏

jimmygchen
jimmygchen approved these changes Feb 27, 2025
View reviewed changes
Copy link
Member

@jimmygchen jimmygchen left a comment

Choose a reason for hiding this comment

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

Re-reviewed, looks good!

@jimmygchen
Copy link
Member

jimmygchen commented Feb 27, 2025

I'm going to move the invalid block check so it happens sooner.

michaelsproul
michaelsproul requested changes Mar 4, 2025
View reviewed changes
@mergify
Copy link

mergify bot commented Mar 11, 2025

This pull request has merge conflicts. Could you please resolve them @eserilev? 🙏

michaelsproul
michaelsproul reviewed Mar 11, 2025
View reviewed changes
@michaelsproul michaelsproul added under-review A reviewer has only partially completed a review. and removed ready-for-review The code is ready for review labels Mar 11, 2025
@eserilev eserilev added ready-for-review The code is ready for review v7.0.0 New release c. Q1 2025 and removed under-review A reviewer has only partially completed a review. labels Mar 12, 2025
dapplion
dapplion reviewed Mar 17, 2025
View reviewed changes
dapplion
dapplion reviewed Mar 17, 2025
View reviewed changes
@michaelsproul michaelsproul added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review labels Mar 17, 2025
mergify bot added a commit that referenced this pull request Mar 17, 2025
@mergify
Merge of #7042
b38a328
@mergify mergify bot mentioned this pull request Mar 17, 2025
Closed
6 tasks
@mergify
Copy link

mergify bot commented Mar 17, 2025

This pull request has been removed from the queue for the following reason: checks failed.

The merge conditions cannot be satisfied due to failing checks:

You may have to fix your CI before adding the pull request to the queue again.

If you want to requeue this pull request, you can post a @mergifyio requeue comment.

@michaelsproul
Copy link
Member

michaelsproul commented Mar 17, 2025

@Mergifyio requeue

@mergify
Copy link

mergify bot commented Mar 17, 2025

requeue

✅ The queue state of this pull request has been cleaned. It can be re-embarked automatically

mergify bot added a commit that referenced this pull request Mar 17, 2025
@mergify
Merge of #7042
de7e258
@mergify mergify bot mentioned this pull request Mar 17, 2025
Closed
6 tasks
@mergify mergify bot merged commit 8ce9edc into sigp:release-v7.0.0 Mar 17, 2025
31 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jimmygchen jimmygchen jimmygchen approved these changes

@realbigsean realbigsean realbigsean left review comments

@dapplion dapplion dapplion left review comments

@michaelsproul michaelsproul michaelsproul approved these changes

@jxs jxs Awaiting requested review from jxs

Assignees

No one assigned

Labels

ready-for-merge This PR is ready to merge. v7.0.0-beta.clean Clean release post Holesky rescue v7.0.0 New release c. Q1 2025

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@eserilev @michaelsproul @jimmygchen @realbigsean @dapplion