Skip to content

[Merged by Bors] - Schedule gnosis merge #3729

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
Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - Schedule gnosis merge #3729

wants to merge 2 commits into from

Conversation

@dapplion
Copy link
Collaborator

@dapplion dapplion commented Nov 15, 2022

Issue Addressed

N/A

Proposed Changes

Schedule Gnosis merge

Additional Info

N/A

michaelsproul
michaelsproul requested changes Nov 15, 2022
View reviewed changes
Copy link
Member

@michaelsproul michaelsproul left a comment

Choose a reason for hiding this comment

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

We also need to update the ChainSpec::gnosis function to match.

You can run cargo test --release in common/eth2_network_config to check everything matches

@michaelsproul
Copy link
Member

michaelsproul commented Nov 15, 2022 •
edited
Loading

Hmm, seems I was wrong. There's no test in eth2_network_config that catches this 😦. I think there might be a preset test, but that's unlikely to be sufficient.

I'll fix this up and push to your branch if you don't mind?

@dapplion
Copy link
Collaborator Author

dapplion commented Nov 15, 2022

Hmm, seems I was wrong. There's no test in eth2_network_config that catches this frowning. I think there might be a preset test, but that's unlikely to be sufficient.

I'll fix this up and push to your branch if you don't mind?

Yes please, take over the branch, thank you!

michaelsproul
michaelsproul reviewed Nov 15, 2022
View reviewed changes
@michaelsproul michaelsproul added ready-for-review The code is ready for review A0 v3.3.0 Minor release following v3.2.0 labels Nov 15, 2022
@michaelsproul
Copy link
Member

michaelsproul commented Nov 18, 2022

Confirmed that this works on my Gnosis node (with Nethermind's master branch) 😎

Nov 18 05:36:37.503 INFO Ready for the merge current_difficulty: 8519301852020543110622850477420385442753109103, terminal_total_difficulty: 8626000000000000000000058750000000000000000000, service: slot_notifier

Will get one more sanity check from a Lighthouse dev then we can merge 🎉

@paulhauner paulhauner self-assigned this Nov 21, 2022
paulhauner
paulhauner approved these changes Nov 21, 2022
View reviewed changes
Copy link
Member

@paulhauner paulhauner 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 to me! Let's mergeeee 🎉 Props to @dapplion for being the Danny Ryan of Gnosis ❤️

@paulhauner paulhauner added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review labels Nov 21, 2022
@paulhauner
Copy link
Member

paulhauner commented Nov 21, 2022

bors r+

bors bot pushed a commit that referenced this pull request Nov 21, 2022
@dapplion @michaelsproul
Schedule gnosis merge (#3729)
e372953 
## Issue Addressed

N/A

## Proposed Changes

Schedule Gnosis merge
- Upstream config PR: gnosischain/configs#3
- Nethermind PR: NethermindEth/nethermind#4901
- Public announcement: https://twitter.com/gnosischain/status/1592589482641223682

## Additional Info

N/A

Co-authored-by: Michael Sproul <michael@sigmaprime.io>
@bors
Copy link

bors bot commented Nov 21, 2022

Pull request successfully merged into unstable.

Build succeeded:

@bors bors bot changed the title Schedule gnosis merge [Merged by Bors] - Schedule gnosis merge Nov 21, 2022
@bors bors bot closed this Nov 21, 2022
macladson pushed a commit to macladson/lighthouse that referenced this pull request Jan 5, 2023
@dapplion @michaelsproul @macladson
Schedule gnosis merge (sigp#3729)
826bd38 
## Issue Addressed

N/A

## Proposed Changes

Schedule Gnosis merge
- Upstream config PR: gnosischain/configs#3
- Nethermind PR: NethermindEth/nethermind#4901
- Public announcement: https://twitter.com/gnosischain/status/1592589482641223682

## Additional Info

N/A

Co-authored-by: Michael Sproul <michael@sigmaprime.io>
Woodpile37 pushed a commit to Woodpile37/lighthouse that referenced this pull request Jan 6, 2024
@dapplion @michaelsproul @Woodpile37
Schedule gnosis merge (sigp#3729)
e759a5e 
## Issue Addressed

N/A

## Proposed Changes

Schedule Gnosis merge
- Upstream config PR: gnosischain/configs#3
- Nethermind PR: NethermindEth/nethermind#4901
- Public announcement: https://twitter.com/gnosischain/status/1592589482641223682

## Additional Info

N/A

Co-authored-by: Michael Sproul <michael@sigmaprime.io>
@dapplion dapplion deleted the gnosis-ttd branch January 24, 2025 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@michaelsproul michaelsproul michaelsproul approved these changes

@paulhauner paulhauner paulhauner approved these changes

Assignees

@paulhauner paulhauner

Labels

A0 ready-for-merge This PR is ready to merge. v3.3.0 Minor release following v3.2.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@dapplion @michaelsproul @paulhauner