chore: update cometbft and cosmos-sdk deps #8179
Merged
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
PaddyMc
added
V:state/compatible/no_backport
|
Important Notice This PR modifies an in-repo Go module. It is one of:
The dependent Go modules, especially the root one, will have to be Please follow the instructions below:
Please let us know if you need any help. |
czarcas7ic
reviewed
May 1, 2024
go.mod
Outdated
| // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.47.5, current branch: osmo/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/2384e2b96adf19abed82f7320da9ab314bcfba98 | ||
| // https://github.com/osmosis-labs/cosmos-sdk/releases/tag/v0.47.5-v24-osmo-5 | ||
| github.com/cosmos/cosmos-sdk => github.com/osmosis-labs/cosmos-sdk v0.47.5-v24-osmo-5 | ||
| // Our cosmos-sdk branch is: https://github.com/osmosis-labs/cosmos-sdk/tree/osmo/v0.47.5, current branch: osmo-v25/v0.47.5. Direct commit link: https://github.com/osmosis-labs/cosmos-sdk/commit/1f2daf3830119a963fc60fd9795314a5ff2c2c78 |
There was a problem hiding this comment.
This is main, so current branch should say osmo/v0.47.5
Then when we backport to v25.x, that entire sentence changes to point to osmo-v25/v0.47.5 (this goes for all the other comments, i usually just ctrl find and replace them all at once
There was a problem hiding this comment.
Oki, nice! Updated in latest commit and I'll update the backport to as well 🙇
czarcas7ic
approved these changes
May 1, 2024
mergify bot
pushed a commit
that referenced
this pull request
May 1, 2024
* chore: update cometbft and cosmos-sdk deps * chore: update comments for cosmos-sdk (cherry picked from commit 1fe593e) # Conflicts: # osmoutils/go.sum
PaddyMc
added a commit
that referenced
this pull request
May 1, 2024
* chore: update cometbft and cosmos-sdk deps (#8179) * chore: update cometbft and cosmos-sdk deps * chore: update comments for cosmos-sdk (cherry picked from commit 1fe593e) # Conflicts: # osmoutils/go.sum * chore: fix merge issues, update comments --------- Co-authored-by: PaddyMc <[email protected]>
czarcas7ic
added a commit
that referenced
this pull request
May 2, 2024
* chore: add v25.x backport tag to mergify github action (#8151) * Try out making a read cache for poolmanager pool modules (#8128) * Try out making a read cache * Make this stored in the keeper to fix tests * Fix test reset caches * Auto: update go.mod after push to dev/test_out_read_cahce that modified dependencies locally * Add changelog --------- Co-authored-by: github-actions <[email protected]> * chore(deps): bump github.com/hashicorp/go-getter from 1.7.1 to 1.7.4 (#8155) Bumps [github.com/hashicorp/go-getter](https://github.com/hashicorp/go-getter) from 1.7.1 to 1.7.4. - [Release notes](https://github.com/hashicorp/go-getter/releases) - [Changelog](https://github.com/hashicorp/go-getter/blob/main/.goreleaser.yml) - [Commits](hashicorp/go-getter@v1.7.1...v1.7.4) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-getter dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump github.com/hashicorp/go-getter in /osmoutils (#8156) Bumps [github.com/hashicorp/go-getter](https://github.com/hashicorp/go-getter) from 1.7.1 to 1.7.4. - [Release notes](https://github.com/hashicorp/go-getter/releases) - [Changelog](https://github.com/hashicorp/go-getter/blob/main/.goreleaser.yml) - [Commits](hashicorp/go-getter@v1.7.1...v1.7.4) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-getter dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump github.com/hashicorp/go-getter in /x/ibc-hooks (#8154) Bumps [github.com/hashicorp/go-getter](https://github.com/hashicorp/go-getter) from 1.7.1 to 1.7.4. - [Release notes](https://github.com/hashicorp/go-getter/releases) - [Changelog](https://github.com/hashicorp/go-getter/blob/main/.goreleaser.yml) - [Commits](hashicorp/go-getter@v1.7.1...v1.7.4) --- updated-dependencies: - dependency-name: github.com/hashicorp/go-getter dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * .5s epoch speedup (#8159) * Speedup protorev by having route calculation phase not unmarshal pools (#8157) * Another expected ~1% state machine speedup * Add changelog * minor other improvement * Reduce addr decoding overhead * chore: Create CI for bumping sdk version via GA (#8162) * Create CI for updating sdk version * Fix some comments * On PR * Use osmo v0.47.5 as default * Fix * Fix 2 * Fix 4 * Fix * Final * Final fix * Fix PR ver * Final * Final * Final * fix: return err if type not in manager (#8170) * chore(deps): bump actions/checkout from 3 to 4 (#8173) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump actions/setup-go from 3 to 5 (#8174) Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3 to 5. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v3...v5) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * auto: update Go import paths to v25 on branch main (#8172) * auto: update Go import paths to v25 * Generated protofile changes * chore: update sqsdomain to v25 * chore: update osmoutils to latest version --------- Co-authored-by: PaddyMc <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: PaddyMc <[email protected]> * chore: don't use hardcoded "uosmo" string (#8145) * check denoms for gauge creation * changelog * extract logic * use uosmo var * initial push of test fixes * fix lint * tidy * tidy * add comments * add test cases * chore: update cometbft and cosmos-sdk deps (#8179) * chore: update cometbft and cosmos-sdk deps * chore: update comments for cosmos-sdk * auto: update asset lists (#8180) Co-authored-by: czarcas7ic <[email protected]> * Properly create the module account for auction (#8178) * properly create the module account for auction * typo * lint * preserve name * updated osmoutils * chore: consensus param change (#8177) * consensus param change * changelog * err * Update upgrades.go --------- Co-authored-by: PaddyMc <[email protected]> * fix: e2e and remove toolchain (#8191) * remove toolchain * remove exclude increment * script * remove build tags * build script * remove build arg * fix: e2e and remove toolchain (#8191) * remove toolchain * remove exclude increment * script * remove build tags * build script * remove build arg (cherry picked from commit 27548cc) # Conflicts: # osmoutils/go.sum # x/ibc-hooks/go.sum * fix conflict * tidy * Revert "tidy" This reverts commit fabe8ea. * Revert "fix conflict" This reverts commit 32031fd. * Revert "Merge branch 'main' into mergify/bp/v25.x/pr-8191" This reverts commit 708dbdf, reversing changes made to 29a0917. * tidy * run script --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: PaddyMc <[email protected]> Co-authored-by: Dev Ojha <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Matt, Park <[email protected]> Co-authored-by: Osmosis <[email protected]> Co-authored-by: PaddyMc <[email protected]> Co-authored-by: Adam Tucker <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: czarcas7ic <[email protected]> Co-authored-by: Nicolas Lara <[email protected]> Co-authored-by: Adam Tucker <[email protected]>
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
Updating the cosmos-sdk dependency to the v25 tag
Updating the cometbft dependancy to the v25 tag