Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Sep 27, 2023
Merged

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

merged 5 commits into from
Sep 27, 2023

Conversation

mattverse
Copy link
Member

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

@mattverse 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
@github-actions
Copy link
Contributor

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:

  1. Open https://github.com/osmosis-labs/osmosis/actions/workflows/go-mod-auto-bump.yml
  2. Provide the current branch name
  3. 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
Copy link
Member Author

devbot help

@devbot-wizard
Copy link
Collaborator

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
Copy link
Member Author

devbot add changelog misc bump IAVL version to v0.19.7

@mattverse
Copy link
Member Author

nicejob devbot

Copy link
Member

@p0mvn p0mvn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

pysel
pysel previously requested changes Sep 25, 2023
Copy link
Member

@pysel pysel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! One thing though that concerns me

Comment on lines 151 to 156
<<<<<<< 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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).

Copy link

@hakuno2000 hakuno2000 Oct 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

@pysel pysel Oct 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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).

Copy link

@hakuno2000 hakuno2000 Oct 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Member

@pysel pysel Oct 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 p0mvn marked this pull request as draft September 26, 2023 22:45
@p0mvn
Copy link
Member

p0mvn commented Sep 26, 2023

Currently running a node on v19 release line

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

p0mvn commented Sep 27, 2023

The nodee synched over epoch - merging

@p0mvn p0mvn requested a review from pysel September 27, 2023 02:08
@p0mvn p0mvn merged commit 57d5923 into main Sep 27, 2023
1 check passed
@p0mvn p0mvn deleted the mattverse/bump-iavl-v branch September 27, 2023 02:09
mergify bot pushed a commit that referenced this pull request Sep 27, 2023
* Bump sdk and IAVL version

* update changelog

* conflict

---------

Co-authored-by: devbot-wizard <[email protected]>
Co-authored-by: roman <[email protected]>
(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
mattverse pushed a commit that referenced this pull request Sep 27, 2023
pysel pushed a commit that referenced this pull request Sep 27, 2023
* Bump sdk and IAVL version

* update changelog

* conflict

---------

Co-authored-by: devbot-wizard <[email protected]>
Co-authored-by: roman <[email protected]>
@github-actions github-actions bot mentioned this pull request Apr 1, 2024
@github-actions github-actions bot mentioned this pull request May 1, 2024
@github-actions github-actions bot mentioned this pull request May 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:backport/v19.x backport patches to v19.x branch C:x/epochs V:state/compatible/no_backport State machine compatible PR, depends on prior breaks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants