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
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: https://github.com/osmosis-labs/cosmos-sdk/pull/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