Bump IAVL version from v0.19.4 -> v0.19.7 #6492

mattverse · 2023-09-22T03:17:09Z

Closes: #XXX

What is the purpose of the change

Bumps IAVL version from v0.19.4 -> v0.19.7.

Also updates sdk commit hash accordingly to the commit that uses the bumped version of IAVL

Documentation and Release Note

Does this pull request introduce a new feature or user-facing behavior changes?
Changelog entry added to Unreleased section of CHANGELOG.md?

Where is the change documented?

Specification (x/{module}/README.md)
Osmosis documentation site
Code comments?
N/A

github-actions · 2023-09-22T03:17:26Z

Important Notice

This PR modifies an in-repo Go module. It is one of:

osmomath
osmoutils
x/ibc-hooks
x/epochs

The dependent Go modules, especially the root one, will have to be
updated to reflect the changes. Failing to do so might cause e2e to fail.

Please follow the instructions below:

Open https://github.com/osmosis-labs/osmosis/actions/workflows/go-mod-auto-bump.yml
Provide the current branch name
On success, confirm if an automated commit corretly updated the go.mod and go.sum files

Please let us know if you need any help.

mattverse · 2023-09-22T03:18:00Z

devbot help

devbot-wizard · 2023-09-22T03:18:02Z

Hi! I'm DevBot, a bot that helps with common tasks in the development process. Commands:

devbot fix: Fix basic errors in the PR. (e.g. imports, changelog conflicts, go mod conflicts)
devbot merge base: Merge the base branch into the PR branch.
devbot add changelog [misc/feat/bug/api/sec] [message]: Add a changelog entry to the PR. (e.g. devbot add changelog feat Added a new feature)
- If message is blank, defaults to PR title.
devbot re-pr: Re-PR the PR, useful for external contributors where we have no edit perms.

mattverse · 2023-09-22T03:18:54Z

devbot add changelog misc bump IAVL version to v0.19.7

mattverse · 2023-09-22T03:20:51Z

nicejob devbot

p0mvn

🚀

pysel

Nice! One thing though that concerns me

pysel · 2023-09-25T19:13:54Z

x/ibc-hooks/go.sum

+<<<<<<< HEAD
+github.com/bytedance/sonic v1.10.0 h1:qtNZduETEIWJVIyDl01BeNxur2rW9OwTQ/yBqFRkKEk=
+github.com/bytedance/sonic v1.10.0/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
+=======
 github.com/bytedance/sonic v1.10.1 h1:7a1wuFXL1cMy7a3f7/VFcEtriuXQnUBhtoVfOZiaysc=
+>>>>>>> main


I think this needs to be resolved, it is weird that CI is green

I will address this. Would like to backport and test this PR this week

As I understand it, Matt pulled code and got conflict but didn't resolve it, then pushed it and Github detected those lines as code. Is this a problem of syntax error check from Github?

I do not think that it is a github problem, I guess the issue is that current linters used in CI are not detecting conflicts in go.sum files (I manually checked, for reference, that they do detect issues in, for example, go mod files).

So if I add a step to check for conflict markers <<<<<<<, =======, >>>>>>> , will this case can be solved?

I am not sure at the moment what would be the best way to handle this problem. For now, I think it would be worth checking if there exists a linter that can catch these errors

If you are interested in what linters are currently enabled, I would suggest checking this file in the repo: https://github.com/osmosis-labs/osmosis/blob/main/.golangci.yml

just one more thought: if running go mod tidy solves this issue (i.e. it overwrites conflicts), we could add some workflow that would automatically run tidy for every module in the repository (as a matter of fact, we already have an optimized command for doing that: #6535).

If I a command to run tidy in submodules after checkout step in build.yml like

steps: - name: Check out repository code uses: actions/checkout@v4 - name: Run go mod tidy in all submodules working-directory: ./ run: make tidy-workspace

will it work like when we manually run make tidy-workspace?

I do not think build is the best place to do this, since tidy-workspace might change something in the repository, which is not the purpose of the build workflow.

Ideally, we should solve the bug by adding a linter that can catch it, a global go mod tidy is a way we should go with if a linter option does not work

p0mvn · 2023-09-26T22:46:03Z

Currently running a node on v19 release line

p0mvn · 2023-09-27T02:08:33Z

The nodee synched over epoch - merging

fixed

* Bump sdk and IAVL version * update changelog * conflict --------- Co-authored-by: devbot-wizard <141283918+devbot-wizard@users.noreply.github.com> Co-authored-by: roman <roman@osmosis.team> (cherry picked from commit 57d5923) # Conflicts: # CHANGELOG.md # go.mod # go.sum # osmomath/go.mod # osmomath/go.sum # osmoutils/go.mod # osmoutils/go.sum # tests/cl-genesis-positions/go.mod # tests/cl-genesis-positions/go.sum # tests/cl-go-client/go.mod # tests/cl-go-client/go.sum # x/epochs/go.mod # x/epochs/go.sum # x/ibc-hooks/go.mod # x/ibc-hooks/go.sum

Co-authored-by: roman <roman@osmosis.team>

* Bump sdk and IAVL version * update changelog * conflict --------- Co-authored-by: devbot-wizard <141283918+devbot-wizard@users.noreply.github.com> Co-authored-by: roman <roman@osmosis.team>

Bump sdk and IAVL version

ff68af5

mattverse added V:state/compatible/no_backport State machine compatible PR, depends on prior breaks A:backport/v19.x backport patches to v19.x branch labels Sep 22, 2023

mattverse requested a review from nicolaslara as a code owner September 22, 2023 03:17

github-actions bot added the C:x/epochs label Sep 22, 2023

update changelog

90dd5cf

p0mvn approved these changes Sep 22, 2023

View reviewed changes

Merge branch 'main' into mattverse/bump-iavl-v

c3b3a9c

pysel previously requested changes Sep 25, 2023

View reviewed changes

pysel mentioned this pull request Sep 25, 2023

CI does not catch conflicts in go.sum files #6538

Open

p0mvn added 2 commits September 26, 2023 18:05

Merge branch 'main' into mattverse/bump-iavl-v

20a7bd1

conflict

18d223b

p0mvn marked this pull request as draft September 26, 2023 22:45

p0mvn marked this pull request as ready for review September 27, 2023 02:08

p0mvn approved these changes Sep 27, 2023

View reviewed changes

p0mvn requested a review from pysel September 27, 2023 02:08

p0mvn merged commit 57d5923 into main Sep 27, 2023
1 check passed

p0mvn deleted the mattverse/bump-iavl-v branch September 27, 2023 02:09

mergify bot mentioned this pull request Sep 27, 2023

Bump IAVL version from v0.19.4 -> v0.19.7 (backport #6492) #6549

Merged

p0mvn added a commit that referenced this pull request Sep 27, 2023

Bump IAVL version from v0.19.4 -> v0.19.7 (backport #6492)

4efa7ac

mattverse pushed a commit that referenced this pull request Sep 27, 2023

Bump IAVL version from v0.19.4 -> v0.19.7 (backport #6492) (#6549)

6e63173

Co-authored-by: roman <roman@osmosis.team>

github-actions bot mentioned this pull request Apr 1, 2024

Broken Links Detected #7903

Closed

github-actions bot mentioned this pull request May 1, 2024

Broken Links Detected #8183

Closed

github-actions bot mentioned this pull request May 15, 2024

Broken Links Detected #8269

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump IAVL version from v0.19.4 -> v0.19.7 #6492

Bump IAVL version from v0.19.4 -> v0.19.7 #6492

mattverse commented Sep 22, 2023

github-actions bot commented Sep 22, 2023

mattverse commented Sep 22, 2023

devbot-wizard commented Sep 22, 2023

mattverse commented Sep 22, 2023

mattverse commented Sep 22, 2023

p0mvn left a comment

pysel left a comment

pysel Sep 25, 2023

pysel Sep 25, 2023

p0mvn Sep 26, 2023

hakuno2000 Oct 4, 2023

pysel Oct 4, 2023

hakuno2000 Oct 4, 2023 •

edited

Loading

pysel Oct 4, 2023 •

edited

Loading

pysel Oct 4, 2023

hakuno2000 Oct 5, 2023 •

edited

Loading

pysel Oct 5, 2023 •

edited

Loading

p0mvn commented Sep 26, 2023

p0mvn commented Sep 27, 2023

Bump IAVL version from v0.19.4 -> v0.19.7 #6492

Bump IAVL version from v0.19.4 -> v0.19.7 #6492

Conversation

mattverse commented Sep 22, 2023

What is the purpose of the change

Documentation and Release Note

github-actions bot commented Sep 22, 2023

mattverse commented Sep 22, 2023

devbot-wizard commented Sep 22, 2023

mattverse commented Sep 22, 2023

mattverse commented Sep 22, 2023

p0mvn left a comment

Choose a reason for hiding this comment

pysel left a comment

Choose a reason for hiding this comment

pysel Sep 25, 2023

Choose a reason for hiding this comment

pysel Sep 25, 2023

Choose a reason for hiding this comment

p0mvn Sep 26, 2023

Choose a reason for hiding this comment

hakuno2000 Oct 4, 2023

Choose a reason for hiding this comment

pysel Oct 4, 2023

Choose a reason for hiding this comment

hakuno2000 Oct 4, 2023 • edited Loading

Choose a reason for hiding this comment

pysel Oct 4, 2023 • edited Loading

Choose a reason for hiding this comment

pysel Oct 4, 2023

Choose a reason for hiding this comment

hakuno2000 Oct 5, 2023 • edited Loading

Choose a reason for hiding this comment

pysel Oct 5, 2023 • edited Loading

Choose a reason for hiding this comment

p0mvn commented Sep 26, 2023

p0mvn commented Sep 27, 2023

hakuno2000 Oct 4, 2023 •

edited

Loading

pysel Oct 4, 2023 •

edited

Loading

hakuno2000 Oct 5, 2023 •

edited

Loading

pysel Oct 5, 2023 •

edited

Loading