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

fix: Allow ScheduleUpgrade to come from same block #260

Merged
merged 2 commits into from
Jun 10, 2022

Conversation

ValarDragon
Copy link
Member

Cherry-pick of cosmos#11551

That PR had merge conflicts here, so just did the state machine side change.

Allow ScheduleUpgrade to come from same block
@ValarDragon ValarDragon changed the title Allow ScheduleUpgrade to come from same block fix: Allow ScheduleUpgrade to come from same block Jun 9, 2022
@p0mvn p0mvn merged commit a2805f4 into osmosis-main Jun 10, 2022
@p0mvn p0mvn deleted the dev/cherry-pick-upgrade-changes branch June 10, 2022 03:11
mergify bot pushed a commit that referenced this pull request Jun 10, 2022
* Cherry-pick of cosmos#11551

Allow ScheduleUpgrade to come from same block

* Fix test

(cherry picked from commit a2805f4)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants