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

Revert "Proper initialization of the bridge pot account balances in genesis (#698)" #728

Merged
merged 3 commits into from
Aug 16, 2023
Merged

Revert "Proper initialization of the bridge pot account balances in genesis (#698)" #728

merged 3 commits into from
Aug 16, 2023

Conversation

dmitrylavrenov
Copy link
Contributor

This reverts commit #698.

The new one genesis bridges logic has been implemented at #716 and #719

@dmitrylavrenov dmitrylavrenov requested a review from MOZGIII August 16, 2023 05:52
@MOZGIII
Copy link
Contributor

MOZGIII commented Aug 16, 2023

Not sure if a simple rollback is the correct approach here. It will most definitely have conflicts with #719. Maybe doing it manually would be more accurate.

@dmitrylavrenov
Copy link
Contributor Author

Not sure if a simple rollback is the correct approach here. It will most definitely have conflicts with #719. Maybe doing it manually would be more accurate.

It looks working as I've checked tests and build locally. All that I need now is fixing feature snapshot.

@MOZGIII
Copy link
Contributor

MOZGIII commented Aug 16, 2023 •
edited
Loading

Did you test on top of #719?
On master without #719 it will merge without issues for obvious reasons.

@dmitrylavrenov
Copy link
Contributor Author

Did you test on top of #719?
On master without #719 it will merge without issues for obvious reasons.

The conflicts have been resolved.

@dmitrylavrenov dmitrylavrenov added this pull request to the merge queue Aug 16, 2023
Merged via the queue into master with commit 265483a Aug 16, 2023
@dmitrylavrenov dmitrylavrenov deleted the revert-698 branch August 16, 2023 07:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MOZGIII MOZGIII MOZGIII approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dmitrylavrenov @MOZGIII