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

chore: v50.x up to date #623

Closed
wants to merge 77 commits into from
Closed

Conversation

faddat
Copy link
Member

@faddat faddat commented Sep 9, 2024

Description

This pull request brings the osmosis cosmos-sdk fork current with changes in the mainline cosmos-sdk.

Since a lot of CI doesn't seem to be working, I've run tests manually, they pass for me :).

I did:

make test

We also got some warnings from the dependency checker and since they looked relatively uncool, I upgraded:

  • golang to v1.23
  • hashicorp/go-getter to v1.7.6

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title, you can find examples of the prefixes below:
  • confirmed ! in the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • reviewed "Files changed" and left comments if necessary
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • updated the relevant documentation or specification, including comments for documenting Go code
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

Please see Pull Request Reviewer section in the contributing guide for more information on how to review a pull request.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic, API design and naming, documentation is accurate, tests and test coverage

mergify bot and others added 30 commits May 9, 2024 09:57
…(backport cosmos#20342) (cosmos#20346)

Co-authored-by: Damian Nolan <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
…osmos#20567)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
…osmos#20805)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
…osmos#20836)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
…tGenesis` in simulation test (backport cosmos#18196) (cosmos#20897)

Co-authored-by: Chenqun Lu <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
… for simulation test. (backport cosmos#17911) (cosmos#20909)

Co-authored-by: Chenqun Lu <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
Comment on lines 753 to 763
WithHeaderHash(req.Hash))
}

if err := app.preBlock(req); err != nil {
preblockEvents, err := app.preBlock(req)
if err != nil {
return nil, err
}

events = append(events, preblockEvents...)

beginBlock, err := app.beginBlock(req)
Copy link

Choose a reason for hiding this comment

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

Change potentially affects state.

Call sequence:

(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).internalFinalizeBlock (baseapp/abci.go:692)
(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).FinalizeBlock (baseapp/abci.go:853)

@github-actions github-actions bot added the C:log label Sep 9, 2024
@faddat
Copy link
Member Author

faddat commented Sep 9, 2024

Most of the CI jobs fail because we don't have sonarcloud credentials in github.

Should I remove them?

@PaddyMc
Copy link
Collaborator

PaddyMc commented Sep 9, 2024

Thanks @faddat, the team rn are all testing v26, so this will probs sit here for about a week and a half, I'll come back to it then 🙇

I think I'll see if there's a way to run these with sonarcloud from your branch, if not we may have to cannibalise this PR 😢

@faddat
Copy link
Member Author

faddat commented Sep 10, 2024

@PaddyMc - I think that some fixes have been ninjaed into the upstream v0.50.x branch, and probably they should get in v26. I'd want them if I were you, anyhow :).

I am working with another org right now and we have decided to use this SDK fork -- so if the sonarcloud runs in osmo/v0.50.x but not here, that's totally okay. I will leave the CI config as it currently is in that case, and import from here.

That is also the reason for some of the PRs on osmosis like

Since I can push to branches in the osmosis-labs org then import from the commit, there's no rush on any of this :)

Good luck with the release!

@faddat faddat closed this Oct 1, 2024
@PaddyMc
Copy link
Collaborator

PaddyMc commented Oct 1, 2024

Thanks for this PR, but decided to take this on myself so I had a good understanding what is happening 🙇

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment