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 cosmos-sdk to v0.50.9 #6828

Merged
merged 10 commits into from
Aug 7, 2024
Merged

deps: bump cosmos-sdk to v0.50.9 #6828

merged 10 commits into from
Aug 7, 2024

Conversation

damiannolan
Copy link
Member

@damiannolan damiannolan commented Jul 15, 2024

Description

closes: #6822 #6825 #6827 #6826 #6824 #6823


Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

  • Targeted PR against the correct branch (see CONTRIBUTING.md).
  • Linked to GitHub issue with discussion and accepted design, OR link to spec that describes this work.
  • Code follows the module structure standards and Go style guide.
  • Wrote unit and integration tests.
  • Updated relevant documentation (docs/).
  • Added relevant godoc comments.
  • Provide a conventional commit message to follow the repository standards.
  • Include a descriptive changelog entry when appropriate. This may be left to the discretion of the PR reviewers. (e.g. chores should be omitted from changelog)
  • Re-reviewed Files changed in the GitHub PR explorer.
  • Review SonarCloud Report in the comment section below once CI passes.

@damiannolan
Copy link
Member Author

There looks to be some failing unit tests here

Copy link
Contributor

@crodriguezvega crodriguezvega left a comment

Choose a reason for hiding this comment

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

Thanks, @damiannolan!

@damiannolan
Copy link
Member Author

damiannolan commented Jul 15, 2024

Let's hold off on merging this until we understand why this change broke our tests:

image

cc. @julienrbrt @tac0turtle

I'm unsure what the implications of this change really means, so would be nice to understand it better. (edit: I see this is for supporting nested any's from the perspective of multisig keys. Seems like there is not symmetry between LegacyAminoPubKey when created with kmultisig.NewLegacyAminoPubKey() (packPubKeys) and unmarshalled LegacyAminoPubKey which use the AnyUnpacker interface.).

I could get the tests passing again with:

diff --git a/crypto/keys/multisig/multisig.go b/crypto/keys/multisig/multisig.go
index e28aa012d8..e31a48170b 100644
--- a/crypto/keys/multisig/multisig.go
+++ b/crypto/keys/multisig/multisig.go
@@ -156,6 +156,12 @@ func (m *LegacyAminoPubKey) UnpackInterfaces(unpacker types.AnyUnpacker) error {
                if err != nil {
                        return err
                }
+
+               if pk != nil {
+                       if err = any.UnmarshalAmino(pk.Bytes()); err != nil {
+                               return err
+                       }
+               }
        }
        return nil
 }
(END)

Would like to get a better understanding of any.compat, I see it gets unset here explicitly too (https://github.com/cosmos/cosmos-sdk/blob/v0.50.8/codec/types/compat.go#L98-L100)

@crodriguezvega
Copy link
Contributor

I will close in the meantime the other dependabot PRs to reduce the noise...

@DimitrisJim
Copy link
Contributor

well shit, that did not work, changelog for tx mentioned reversion cosmos/cosmos-sdk@564cc4d which I thought was issue?

at least I addressed the conflicts, commit that Damian was using before was github.com/cosmos/cosmos-sdk v0.50.9-0.20240722112539-25d481f797ca (dropping here just in case)

@julienrbrt
Copy link
Member

Could you try out with the latest commit from release/v0.50.x? 3f6796fba413cca7f2ea9a7e03d7965e7eda7378

@julienrbrt
Copy link
Member

Once you confirm it works, we can release v0.50.9.

@DimitrisJim
Copy link
Contributor

@julienrbrt all seems green in the run. Thanks for the fix and ping!

@DimitrisJim DimitrisJim changed the title deps: bump cosmos-sdk to v0.50.8 deps: bump cosmos-sdk to v0.50.9 Aug 7, 2024
CHANGELOG.md Outdated Show resolved Hide resolved
Copy link

sonarcloud bot commented Aug 7, 2024

@DimitrisJim DimitrisJim added this pull request to the merge queue Aug 7, 2024
Merged via the queue into main with commit 3425726 Aug 7, 2024
76 of 78 checks passed
@DimitrisJim DimitrisJim deleted the deps/sdk-bump branch August 7, 2024 10:42
mergify bot pushed a commit that referenced this pull request Aug 7, 2024
* deps: bump cosmos-sdk to v0.50.8

* chore: update changelog

* deps: bump cosmossdk.io/client to v2.0.0-beta.3. bump x/upgrade to v0.1.4

* chore: make tidy-all

* test: bump to 3f6796fba413cca for testing purposes.

* deps: bump cosmos sdk to 0.50.9

* Update CHANGELOG.md

* chore: update CHANGELOG for submodules.

---------

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
(cherry picked from commit 3425726)

# Conflicts:
#	e2e/go.mod
#	e2e/go.sum
#	modules/light-clients/08-wasm/CHANGELOG.md
colin-axner pushed a commit that referenced this pull request Aug 7, 2024
* deps: bump cosmos-sdk to v0.50.9 (#6828)

* deps: bump cosmos-sdk to v0.50.8

* chore: update changelog

* deps: bump cosmossdk.io/client to v2.0.0-beta.3. bump x/upgrade to v0.1.4

* chore: make tidy-all

* test: bump to 3f6796fba413cca for testing purposes.

* deps: bump cosmos sdk to 0.50.9

* Update CHANGELOG.md

* chore: update CHANGELOG for submodules.

---------

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
(cherry picked from commit 3425726)

# Conflicts:
#	e2e/go.mod
#	e2e/go.sum
#	modules/light-clients/08-wasm/CHANGELOG.md

* remove e2e folder

* chore: fix 08-wasm CHANGELOG conflict.

---------

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
bznein added a commit that referenced this pull request Aug 8, 2024
* deps: bump cosmos-sdk to v0.50.9 (#6828)

* deps: bump cosmos-sdk to v0.50.8

* chore: update changelog

* deps: bump cosmossdk.io/client to v2.0.0-beta.3. bump x/upgrade to v0.1.4

* chore: make tidy-all

* test: bump to 3f6796fba413cca for testing purposes.

* deps: bump cosmos sdk to 0.50.9

* Update CHANGELOG.md

* chore: update CHANGELOG for submodules.

---------

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>

* chore(api!): move checks from Transfer to OnSendPacket

* Fix merge error

* fix to test

* Add Require() back

* Update modules/apps/transfer/ibc_module.go

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>

* Linter

* Removed wrong merge results

* reintroduce test

* Move check for isSendEnabledCoins to keeper

* new tests

* fixed test

* linter

* Removed checks and added comment

* removed extra parentheses

* Revert "Merge remote-tracking branch 'origin' into bznein/6949/msgTransferWrapperToSendPacket"

This reverts commit be9f558, reversing
changes made to 36e4b05.

* Delete commented out code

---------

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
mergify bot pushed a commit that referenced this pull request Aug 29, 2024
* deps: bump cosmos-sdk to v0.50.8

* chore: update changelog

* deps: bump cosmossdk.io/client to v2.0.0-beta.3. bump x/upgrade to v0.1.4

* chore: make tidy-all

* test: bump to 3f6796fba413cca for testing purposes.

* deps: bump cosmos sdk to 0.50.9

* Update CHANGELOG.md

* chore: update CHANGELOG for submodules.

---------

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
(cherry picked from commit 3425726)

# Conflicts:
#	CHANGELOG.md
#	e2e/go.mod
#	e2e/go.sum
#	go.mod
#	go.sum
#	modules/apps/callbacks/CHANGELOG.md
#	modules/apps/callbacks/go.mod
#	modules/apps/callbacks/go.sum
#	modules/capability/CHANGELOG.md
#	modules/capability/go.mod
#	modules/light-clients/08-wasm/CHANGELOG.md
#	modules/light-clients/08-wasm/go.mod
#	modules/light-clients/08-wasm/go.sum
#	simapp/go.mod
#	simapp/go.sum
crodriguezvega added a commit that referenced this pull request Aug 30, 2024
* deps: bump cosmos-sdk to v0.50.9 (#6828)

* deps: bump cosmos-sdk to v0.50.8

* chore: update changelog

* deps: bump cosmossdk.io/client to v2.0.0-beta.3. bump x/upgrade to v0.1.4

* chore: make tidy-all

* test: bump to 3f6796fba413cca for testing purposes.

* deps: bump cosmos sdk to 0.50.9

* Update CHANGELOG.md

* chore: update CHANGELOG for submodules.

---------

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
(cherry picked from commit 3425726)

# Conflicts:
#	CHANGELOG.md
#	e2e/go.mod
#	e2e/go.sum
#	go.mod
#	go.sum
#	modules/apps/callbacks/CHANGELOG.md
#	modules/apps/callbacks/go.mod
#	modules/apps/callbacks/go.sum
#	modules/capability/CHANGELOG.md
#	modules/capability/go.mod
#	modules/light-clients/08-wasm/CHANGELOG.md
#	modules/light-clients/08-wasm/go.mod
#	modules/light-clients/08-wasm/go.sum
#	simapp/go.mod
#	simapp/go.sum

* fix conflicts

* callbacks: go mod tidy

* tidy

---------

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants