chore: Revert feat!: ABCI 1.0 Integration 48fe175f983925ff6202d492a363d2b2e3… #483
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
p0mvn
changed the title
PaddyMc
approved these changes
Aug 23, 2023
… (backport cosmos#12374) (cosmos#12437) (#356)" This reverts commit d738efc.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes: #XXX
What is the purpose of the change
Our SDK fork's osmosis-main is incompatible with the osmosis repo.
This is blocking updating the
sdkmathdependencies.The problem stems from ABCI 1.0 PRs that updated some deps, making them incompatible with osmosis: #345
v16.x is fully compatible. So we could either do:
a) Cut osmosis-main-new from v16.x and make it the default branch. Backport my sdkmath changes there
b) Revert the ABCI PR which is going to have some conflicts and a large diff. However, pretty simple to review
I went with option b) right now as it seems the most productive. Open to suggestions if any