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

Shapella upgrade #786

Merged
merged 6 commits into from
Mar 22, 2023
Merged

Shapella upgrade #786

merged 6 commits into from
Mar 22, 2023

Conversation

yrong
Copy link
Contributor

@yrong yrong commented Mar 7, 2023

No description provided.

claravanstaden
claravanstaden reviewed Mar 7, 2023
View reviewed changes
Copy link
Contributor

@claravanstaden claravanstaden left a comment

Choose a reason for hiding this comment

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

Looks great so far! 👏

core/packages/test/scripts/deploy-ethereum.sh Show resolved Hide resolved
core/packages/test/scripts/deploy-ethereum.sh Show resolved Hide resolved
core/packages/test/scripts/build-binary.sh Outdated Show resolved Hide resolved
parachain/pallets/ethereum-beacon-client/src/lib.rs Outdated Show resolved Hide resolved
relayer/relays/beacon/header/syncer/syncer.go Show resolved Hide resolved
relayer/relays/beacon/state/beacon.go Outdated Show resolved Hide resolved
relayer/relays/beacon/state/beacon.go Show resolved Hide resolved
@claravanstaden claravanstaden mentioned this pull request Mar 10, 2023
Merged
@yrong yrong marked this pull request as ready for review March 14, 2023 01:13
@yrong yrong requested review from vgeddes and doubledup March 14, 2023 08:37
vgeddes
vgeddes reviewed Mar 14, 2023
View reviewed changes
flake.nix Show resolved Hide resolved
alistair-singh
alistair-singh reviewed Mar 14, 2023
View reviewed changes
relayer/testdata/curl.sh Outdated Show resolved Hide resolved
relayer/relays/beefy/ethereum-writer.go Outdated Show resolved Hide resolved
vgeddes
vgeddes reviewed Mar 16, 2023
View reviewed changes
Copy link
Collaborator

@vgeddes vgeddes left a comment

Choose a reason for hiding this comment

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

I took a deeper look at this and I think the current approach to versioning adds a lot of duplicated code.

Is there a way we can use generics to mitigate this problem?

parachain/primitives/beacon/src/lib.rs Outdated Show resolved Hide resolved
parachain/pallets/ethereum-beacon-client/src/merkleization.rs Outdated Show resolved Hide resolved
parachain/pallets/ethereum-beacon-client/src/lib.rs Outdated Show resolved Hide resolved
@yrong
Copy link
Contributor Author

yrong commented Mar 20, 2023 •
edited
Loading

@claravanstaden After some sync with Vincent offline, upgrade from Bellatrix is not nessessary for us and the previous implementation with versioning support is somewhat incomplete. To make things simple I change scope of this PR focus on Capella support only.

@claravanstaden
Copy link
Contributor

Hey @yrong! That sounds good, I think keeping it simple is the correct way to go. However, even if we don't do the versioning now we still need to remember that it will be necessary for future prod cases when a hardfork is released.

vgeddes
vgeddes reviewed Mar 20, 2023
View reviewed changes
Copy link
Collaborator

@vgeddes vgeddes left a comment

Choose a reason for hiding this comment

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

Looks much better 🙌

Just need to remove the unnecessary Capella from some struct names, please.

parachain/primitives/beacon/src/lib.rs Outdated Show resolved Hide resolved
parachain/primitives/beacon/src/lib.rs Outdated Show resolved Hide resolved
parachain/pallets/ethereum-beacon-client/src/merkleization.rs Outdated Show resolved Hide resolved
parachain/pallets/ethereum-beacon-client/src/ssz.rs Outdated Show resolved Hide resolved
alistair-singh
alistair-singh approved these changes Mar 21, 2023
View reviewed changes
Copy link
Contributor

@alistair-singh alistair-singh left a comment

Choose a reason for hiding this comment

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

🚢

claravanstaden
claravanstaden reviewed Mar 21, 2023
View reviewed changes
Copy link
Contributor

@claravanstaden claravanstaden left a comment

Choose a reason for hiding this comment

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

Looks great @yrong! 🥳

parachain/README.md Show resolved Hide resolved
parachain/pallets/ethereum-beacon-client/src/merkleization.rs Show resolved Hide resolved
parachain/runtime/snowbase/src/lib.rs Show resolved Hide resolved
relayer/relays/beacon/config/config.go Outdated Show resolved Hide resolved
relayer/relays/beacon/config/config.go Outdated Show resolved Hide resolved
claravanstaden
claravanstaden approved these changes Mar 22, 2023
View reviewed changes
Copy link
Contributor

@claravanstaden claravanstaden left a comment

Choose a reason for hiding this comment

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

Good to go! 🚀

@yrong yrong merged commit ca228cd into main Mar 22, 2023
@yrong yrong deleted the ron/capella branch March 22, 2023 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alistair-singh alistair-singh alistair-singh approved these changes

@claravanstaden claravanstaden claravanstaden approved these changes

@vgeddes vgeddes vgeddes approved these changes

@doubledup doubledup Awaiting requested review from doubledup

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

Successfully merging this pull request may close these issues.
5 participants
@yrong @claravanstaden @vgeddes @alistair-singh @doubledup