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!: bump ibc-go to v4.3.0 and remove dragonberry replace #2185

Merged
merged 9 commits into from
Apr 24, 2023

Conversation

faddat
Copy link
Contributor

@faddat faddat commented Feb 14, 2023

Removes the now-unnecessary dragonberry replace and updates to ibc-go v4.3.0

Closes #2280

@mpoke
Copy link
Contributor

mpoke commented Mar 16, 2023

Thanks @faddat. I'll close this in favor of the following issue #2280 as the bump to ibc-go v4.3.0 requires multiple changes.

@mpoke mpoke closed this Mar 16, 2023
@mpoke mpoke reopened this Apr 4, 2023
@mpoke mpoke added the state-machine-breaking State machine breaking changes (impacts consensus). label Apr 4, 2023
@mpoke
Copy link
Contributor

mpoke commented Apr 4, 2023

Hi @faddat. Thanks for the PR. Could you please resolve the conflicts?

@mpoke
Copy link
Contributor

mpoke commented Apr 4, 2023

Also, could you please bump packet-forward-middleware to v4.0.5? Thanks.

@faddat
Copy link
Contributor Author

faddat commented Apr 11, 2023

yes absolutely

@faddat
Copy link
Contributor Author

faddat commented Apr 11, 2023

to ensure smoothness, this version of gaia, should depend on a version of ics with this PR merged:

Copy link
Contributor

@mpoke mpoke left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks @faddat

go.mod Outdated

// TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134
github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1

// use cosmos style protobufs
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this change necessary?

Copy link
Contributor

Choose a reason for hiding this comment

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

Ditto, seems an accidental regression.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hey there guys that's not an accidental regression it fixes compatibility issues like big time

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unless I'm just wrong in which case I'm just wrong let's proceed but that extra three there causes stuff to get wonky

Copy link
Contributor

Choose a reason for hiding this comment

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

Could you please share some context on why v1.3.3-alpha.regen.1 is problematic and v1.3.2-alpha.regen.4 is preferred? SDK v0.45.x (the version of SDK for v10) uses the former, see https://github.com/cosmos/cosmos-sdk/blob/b05b6fe651514c11af3d4160f7c75fbaad92d5db/go.mod#L154

Copy link
Contributor

Choose a reason for hiding this comment

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

@faddat please revert this change.

@mpoke mpoke changed the title bumps for gaia main branch deps!: bump ibc-go to v4.3.0 and remove dragonberry replace Apr 12, 2023
@mpoke
Copy link
Contributor

mpoke commented Apr 12, 2023

to ensure smoothness, this version of gaia, should depend on a version of ics with this PR merged:

It's not necessary as the version in the Gaia go.mod will take priority. It is preferable though as ICS 1.1.0 is not tested with SDK v0.45.15-ics. As this change is state breaking, we can fix this in the next major Gaia release, i.e., v10.

@faddat
Copy link
Contributor Author

faddat commented Apr 14, 2023

Where's the branch to Target for version 10 or should we make this that branch?

@faddat faddat closed this Apr 14, 2023
@faddat faddat reopened this Apr 14, 2023
@faddat
Copy link
Contributor Author

faddat commented Apr 19, 2023 via email

@mpoke mpoke self-requested a review April 21, 2023 10:09
Copy link
Contributor

@mpoke mpoke left a comment

Choose a reason for hiding this comment

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

@faddat please revert the regression of github.com/regen-network/protobuf from v1.3.3-alpha.regen.1 to v1.3.2-alpha.regen.4. The SDK version that we use also imports v1.3.3-alpha.regen.1

@faddat
Copy link
Contributor Author

faddat commented Apr 21, 2023

hey sorry about slow! I couldn't find this pr

@faddat
Copy link
Contributor Author

faddat commented Apr 21, 2023

@mpoke nice catch, thank you.

I'd meant to adjust the version not in the replaces but in the main section of go.mod,

Copy link
Contributor

@mpoke mpoke left a comment

Choose a reason for hiding this comment

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

See my comment bellow.

go.mod Outdated
github.com/cosmos/ibc-go/v4 v4.2.0
github.com/cosmos/interchain-security v1.1.0
github.com/cosmos/ibc-go/v4 v4.3.0
github.com/cosmos/interchain-security v1.2.0
Copy link
Contributor

Choose a reason for hiding this comment

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

Please keep the PR contained to one issue. There is no need to bump the version of ICS in the same PR where we bump ibc-go.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

https://github.com/cosmos/interchain-security/blob/6a856d183cd6fc6f24e856e0080989ab53752102/go.mod#L31

there is. At least, while I do understand that gaia's version will dominate, I've seen a lot of kaboomies.

To prevent them I like to ensure that dependencies use the exact same versions of ecosystem libraries

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll revert, but wish to note that I think it is safer to group this stuff

Copy link
Contributor

Choose a reason for hiding this comment

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

@faddat Thank you for sharing your concern. If you think that bumping ibc-go to v4.3.0 requires a bump of ICS as well, please open an issue describing the problem in details. We can discuss your concerns on that issue and decide on how to best address them.

From the description and title of this PR, the goal is to

Removes the now-unnecessary dragonberry replace and updates to ibc-go v4.3.0

Adding multiple changes to the same PR without properly documenting it, will lead to difficulties in maintaining Gaia in the long run. For example, github.com/cosmos/interchain-security v1.2.0 contains multiple changes that need to be properly tested before adding them to Gaia. Moreover, v1.2.0 still uses ibc-go v4.2.0.

Copy link
Contributor

@mpoke mpoke 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

@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! Thanks!

@mpoke mpoke merged commit c267374 into cosmos:main Apr 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
state-machine-breaking State machine breaking changes (impacts consensus).
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bump IBC to v4.3.0 and remove the dragonberry replace
6 participants