Nicolas/v19.x backport hist queries #6425
Closed
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
reviewed
Sep 18, 2023
| @@ -92,8 +92,8 @@ require ( | |||
| ) | |||
|
|
|||
| replace ( | |||
| // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk, current branch: v16.x. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/ed4eb883f2a65bd5343e9d2f6186060f45294cb2 | |||
| github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.45.0-rc1.0.20230703010110-ed4eb883f2a6 | |||
| // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk, current branch: osmosis-main. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/05346fa12992 | |||
There was a problem hiding this comment.
OK - I see what the issue is.
We should be using the v16.x branch here as osmosis-main is only compatible with main
However, latest commit on v16.x is blocked on this PR: #6341
2 options to resolve:
- Wait until refactor(deps): switch to cosmossdk.io/math from fork math (backport #6238) #6341
- Use this commit specifically: osmosis-labs/cosmos-sdk@313b4ba
- the 2 commits above it have math changes so they would be blocked on refactor(deps): switch to cosmossdk.io/math from fork math (backport #6238) #6341
There was a problem hiding this comment.
I think I tried option #2 and it had the same issue, but we can try again. If that works, it seems like that's the easiest path forward
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.
What is the purpose of the change
backport of #6362
Testing and Verifying
all tests should pass
Documentation and Release Note
Unreleasedsection ofCHANGELOG.md?Where is the change documented?
x/{module}/README.md)