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

make execution-endpoint required #5165

Merged
merged 12 commits into from
Nov 1, 2024
Merged

Conversation

zhiqiangxu
Copy link
Contributor

Issue Addressed

This PR addresses this issue.

@zhiqiangxu zhiqiangxu changed the base branch from stable to unstable February 1, 2024 01:27
@michaelsproul michaelsproul added waiting-on-author The reviewer has suggested changes and awaits thier implementation. backwards-incompat Backwards-incompatible API change labels Feb 1, 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 Feb 2, 2024
Copy link
Collaborator

@dapplion dapplion left a comment

Choose a reason for hiding this comment

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

Linking a diff of the code with the same indentation so it's easier to review https://www.diffchecker.com/v81VrtmX/

Change looks good thanks 🙏

@zhiqiangxu zhiqiangxu force-pushed the make_ee_required branch 6 times, most recently from b0f19f1 to a78692d Compare February 26, 2024 05:08
@dapplion
Copy link
Collaborator

@zhiqiangxu can you solve conflicts?

@zhiqiangxu
Copy link
Contributor Author

zhiqiangxu commented Jun 28, 2024

@dapplion Done.

@chong-he
Copy link
Member

The cli-check is failing. You can run make cli-local from the root of the repository and commit the changes

@zhiqiangxu
Copy link
Contributor Author

@chong-he The real problem is the error that happened when running make nextest-release, but I can't run it locally because of this error:

image

@chong-he
Copy link
Member

Probably need to solve the compile issue first

@zhiqiangxu
Copy link
Contributor Author

Probably need to solve the compile issue first

No idea how to solve the compile issue :(

lighthouse/tests/exec.rs Outdated Show resolved Hide resolved
@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
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.

Hijacking this PR a bit sorry @zhiqiangxu

I've fixed the CLI flag tests now.

@@ -2505,13 +2518,13 @@ fn logfile_format_flag() {
fn sync_eth1_chain_default() {
CommandLineTest::new()
.run_with_zero_port()
.with_config(|config| assert_eq!(config.sync_eth1_chain, false));
.with_config(|config| assert_eq!(config.sync_eth1_chain, true));
Copy link
Member

Choose a reason for hiding this comment

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

Note that sync_eth1_chain will now effectively default to true since it is set to true when --execution_endpoint is provided (which will now be all the time).

This may very well deprecate this config value entirely, although it can still technically be set back to false using the --disable-deposit-contract-sync flag.

Copy link
Member

Choose a reason for hiding this comment

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

I think this means we can hide and deprecate the --eth1 flag.

@macladson macladson 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 25, 2024
@michaelsproul michaelsproul added the v6.0.0 New major release for hierarchical state diffs label Oct 31, 2024
@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 1, 2024
@michaelsproul
Copy link
Member

@mergify queue

Copy link

mergify bot commented Nov 1, 2024

queue

🛑 The pull request has been removed from the queue default

Pull request #5165 has been dequeued by a dequeue command.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

mergify bot added a commit that referenced this pull request Nov 1, 2024
@michaelsproul
Copy link
Member

@mergify dequeue

Copy link

mergify bot commented Nov 1, 2024

dequeue

✅ The pull request has been removed from the queue default

@michaelsproul
Copy link
Member

@mergify queue

Copy link

mergify bot commented Nov 1, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 16693b0

@mergify mergify bot merged commit 16693b0 into sigp:unstable Nov 1, 2024
30 checks passed
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.

5 participants