Skip to content

Conversation

@damiannolan
Copy link
Contributor

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

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

@julienrbrt
Copy link
Contributor

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
@sonarqubecloud
Copy link

sonarqubecloud 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
@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 <[email protected]>
(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 <[email protected]>
(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 <[email protected]>
Co-authored-by: DimitrisJim <[email protected]>
bznein pushed 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: DimitrisJim <[email protected]>
Co-authored-by: colin axnér <[email protected]>
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 <[email protected]>
(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 <[email protected]>
(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 <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
arnabmitra added a commit to provenance-io/ibc-go that referenced this pull request Mar 5, 2025
* Update CHANGELOG.md

* fix(ica-host): refactor newModuleQuerySafeAllowList to avoid panic (backport cosmos#6436) (cosmos#6520)

* fix(ica-host): refactor newModuleQuerySafeAllowList to avoid panic (cosmos#6436)

* fix(ica-host): refactor newModuleQuerySafeAllowList to avoid panic due to AllowUnresolvable field

* add changelog entry

* Apply suggestions from code review

Co-authored-by: colin axnér <[email protected]>

---------

Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: DimitrisJim <[email protected]>
Co-authored-by: colin axnér <[email protected]>
(cherry picked from commit a16c549)

# Conflicts:
#	CHANGELOG.md

* fix conflicts in changelog.

---------

Co-authored-by: Tom <[email protected]>
Co-authored-by: DimitrisJim <[email protected]>

* deps(release/v8.3.x): bump SDK to v0.50.7 (cosmos#6614)

* deps: bump SDK to v0.50.7

* add changelog

* update changelog before v8.3.2 release

* Update CHANGELOG.md

* events: add channel ordering to write acknowledgement event (cosmos#6867) (cosmos#6871)

* docs: remove ordering from write ack event and non-hex data atrributes

* rever doc changes

* add ordering to write acknowledgement event

* Update events.md

(cherry picked from commit 352ba6e)

Co-authored-by: Carlos Rodriguez <[email protected]>

* (feat) Add possibility to transfer entire balance. (backport cosmos#6877) (cosmos#6930)

* (feat) Add possibility to transfer entire balance. (cosmos#6877)

* Add possibility to transfer entire balance.

* Added entry to the Changelog.

* Added e2e test

* Added forwarding

* Update modules/apps/transfer/keeper/relay.go

Co-authored-by: DimitrisJim <[email protected]>

* Move UnboundedSpendLimit to token.go

* add documentation

* add test to compatibility matrices

* PR Feedback.

---------

Co-authored-by: DimitrisJim <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
(cherry picked from commit 92e1f38)

# Conflicts:
#	.github/compatibility-test-matrices/main/transfer-v2-multidenom-chain-a.json
#	.github/compatibility-test-matrices/release-v9.0.x/transfer-v2-multidenom-chain-a.json
#	.github/compatibility-test-matrices/unreleased/transfer-v2-multidenom.json
#	CHANGELOG.md
#	docs/docs/02-apps/01-transfer/04-messages.md
#	docs/docs/02-apps/01-transfer/10-ICS20-v1/04-messages.md
#	e2e/tests/transfer/base_test.go
#	modules/apps/transfer/keeper/relay.go
#	modules/apps/transfer/keeper/relay_test.go
#	modules/apps/transfer/types/token.go
#	modules/apps/transfer/types/transfer_authorization.go

* fix conflicts

* remove unused code

---------

Co-authored-by: Nikolas De Giorgis <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>

* fix(state!): check upgrade compatibility in channel upgrade confirm (backport cosmos#6935) (cosmos#6944)

* fix(state!): check upgrade compatibility in channel upgrade confirm (cosmos#6935)

(cherry picked from commit 3a192be)

# Conflicts:
#	CHANGELOG.md

* fix conflicts

---------

Co-authored-by: Carlos Rodriguez <[email protected]>

* update changelog before v8.4.0 release

* retract v8.2.x and v8.3.x (cosmos#6965)

Co-authored-by: DimitrisJim <[email protected]>

* backport-v8.5.x: self client/consensus state removal from connection handshake (cosmos#7129)

* refactor: remove client/consensus state validation from connection handshake

* chore: generate proto deprecation notice

* add changelog

* refactor: remove unpacking from msg server

* deps(release/v8.5.x): bump ics23 to v0.11.0 (cosmos#7222)

* deps: bump ics23 to v0.11.0-rc.0

* deps: bump ics23 to v0.11.0

* deps: bump cosmos-sdk to v0.50.9 (backport cosmos#6828) (cosmos#7227)

* deps: bump cosmos-sdk to v0.50.9 (cosmos#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 <[email protected]>
(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 <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>

* Update CHANGELOG.md

* Update CHANGELOG.md

* fix: attempt to fix panics for unresolvable imports by using GogoResolver (backport cosmos#7277) (cosmos#7281)

* fix: attempt to fix panics for unresolvable imports by using GogoResolver (cosmos#7277)

* fix: attempt to fix panics for unresolvable imports by using GogoResolver

* chore: add changelog

* chore: amend changelog

(cherry picked from commit 79ddda5)

# Conflicts:
#	CHANGELOG.md

* chore: address merge conflicts in changelog

---------

Co-authored-by: Damian Nolan <[email protected]>

* prepare changelog for v8.5.1 release

* Update CHANGELOG.md

* fix: avoid invalid identifier error when validate genesis (backport cosmos#7397) (cosmos#7403)

* fix: avoid invalid identifier error when validate genesis (cosmos#7397)

* fix: avoid invalid identifier error when validate genesis

that contains localhost client

* Apply suggestions from code review

* skip

(cherry picked from commit ff2b668)

# Conflicts:
#	CHANGELOG.md
#	modules/core/03-connection/types/genesis.go
#	modules/core/03-connection/types/genesis_test.go

* chore: changelog cleanup

* chore: fix imports

---------

Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Colin Axnér <[email protected]>

* test: update block proposer in testing (backport cosmos#7430) (cosmos#7453)

* test: update block proposer in testing (cosmos#7430)

* Introduce two following changes to the `commitBlock` method in testing:
* increment the proposer priority of validators
* update the proposer address in the current header

* fix linter

(cherry picked from commit 64f33e0)

# Conflicts:
#	testing/chain.go

* why did you fail us here, mergify my boy

---------

Co-authored-by: Simon Noetzlin <[email protected]>
Co-authored-by: DimitrisJim <[email protected]>

* Updating changelog for v8.5.2 (cosmos#7536)

* chore: backport json tags for Height for ibc client proto (cosmos#7868)

* chore: update changelog for v8.5.3 (cosmos#7876)

* Chore/revert ibc proto updates (cosmos#7887)

* Revert "chore: update changelog for v8.5.3 (cosmos#7876)"

This reverts commit c3af326.

* Revert "chore: backport json tags for Height for ibc client proto (cosmos#7868)"

This reverts commit b589a85.

* chore: retract v8.5.3 (cosmos#7888)

* chore: retract v8.5.3

* fix retract statement

* chore: update changelog and redact

* Merge commit from fork

rm test case

* chore: update redacted

* fix: remove packet data remarshaling (cosmos#8065)

* fix: remove packet data remarshaling

* chore: update upload artifact

* chore: update download artifact

* redact 8.6.0

* ignoring packages that have no tests, else make test and make test-all fail.

---------

Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Tom <[email protected]>
Co-authored-by: DimitrisJim <[email protected]>
Co-authored-by: Nikolas De Giorgis <[email protected]>
Co-authored-by: colin axnér <[email protected]>
Co-authored-by: Damian Nolan <[email protected]>
Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Simon Noetzlin <[email protected]>
Co-authored-by: Cian Hatton <[email protected]>
Co-authored-by: PaddyMc <[email protected]>
Co-authored-by: Gjermund Garaba <[email protected]>
Co-authored-by: Aditya <[email protected]>
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.

6 participants