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

deps: update several things at once (sdk, ibc-go, btcd) #2498

Merged
merged 9 commits into from
May 18, 2023

Conversation

shaspitz
Copy link
Contributor

@shaspitz shaspitz commented May 17, 2023

Credit to @faddat, original PR here #2490. I just needed to add shaspitz@e2324f2 to make the work mergable

Description

This PR bumps to

  • cosmos-sdk v0.45.16-ics
  • ibc-go v4.4.0

And removes some replace statements

  • the btcd replace is not needed anymore after 45.15
  • the dragonberry replace is not needed any more
  • cosmos-sdk and ibc replaces are not needed since we are importing the right versions directly

Comet stays at 0.34.27 because 0.34.28 seems to have an issue with halting under certain conditions, and 0.34.27 is used by IBC 4.4.0.


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
  • Added ! to 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
  • Followed the guidelines for building SDK modules
  • Included the necessary unit and integration tests
  • Added a changelog entry to CHANGELOG.md
  • Included comments for documenting Go code
  • Updated the relevant documentation or specification
  • Reviewed "Files changed" and left comments if necessary
  • 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.

I have...

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

@shaspitz shaspitz changed the title Faddat/sensible easy cleanups deps: update several things at once (sdk, cometbft, ibc-go, btcd) May 17, 2023
@shaspitz shaspitz marked this pull request as ready for review May 17, 2023 21:54
@shaspitz
Copy link
Contributor Author

shaspitz commented May 17, 2023

Hey @faddat we looked into deps more and it seems that IBC go 4.4 references comet 0.34.27, see here. Are we missing something?

In the meantime we've downgraded comet from 0.34.28 to 0.34.27 in this PR

@shaspitz shaspitz changed the title deps: update several things at once (sdk, cometbft, ibc-go, btcd) deps: update several things at once (sdk, ibc-go, btcd) May 17, 2023
@shaspitz
Copy link
Contributor Author

This PR doesn't work on top of main without bumping comet, which we cannot do because of cometbft/cometbft#773, therefore I'll make this PR a draft, it will most likely be closed.

@shaspitz shaspitz marked this pull request as draft May 18, 2023 00:14
@shaspitz shaspitz marked this pull request as ready for review May 18, 2023 18:44
@shaspitz
Copy link
Contributor Author

The comet issue is not a problem after @MSalopek debugged, I've re-bumped comet to 0.24.28

Copy link
Contributor

@MSalopek MSalopek left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link
Contributor

@jtremback jtremback left a comment

Choose a reason for hiding this comment

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

LGTM, but before we deploy this, I'd really like @glnro @yaruwangway and @mmulji-ic to double check our removal of those replace statements

@jtremback jtremback merged commit 4991414 into cosmos:main May 18, 2023
mergify bot pushed a commit that referenced this pull request May 18, 2023
* bumps

* ibc-go

* ibc-go v4.4.0

* downgrade ICS back to v1.1.1

* Update CHANGELOG.md

* downgrade comet to 0.34.27

* bump comet again

* Update CHANGELOG.md

---------

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
(cherry picked from commit 4991414)

# Conflicts:
#	go.mod
#	go.sum
shaspitz added a commit that referenced this pull request May 18, 2023
…) (#2503)

* deps: update several things at once (sdk, ibc-go, btcd) (#2498)

* bumps

* ibc-go

* ibc-go v4.4.0

* downgrade ICS back to v1.1.1

* Update CHANGELOG.md

* downgrade comet to 0.34.27

* bump comet again

* Update CHANGELOG.md

---------

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
(cherry picked from commit 4991414)

# Conflicts:
#	go.mod
#	go.sum

* fix conflicts

---------

Co-authored-by: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com>
@mmulji-ic
Copy link
Contributor

LGTM, but before we deploy this, I'd really like @glnro @yaruwangway and @mmulji-ic to double check our removal of those replace statements

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants