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: merge changes from main into sdk 50 branch #4273

Merged

Conversation

faddat
Copy link
Contributor

@faddat faddat commented Aug 3, 2023

Description

This PR brings changes from main into the sdk 50
branch and updates cosmos-sdk

Commit Message / Changelog Entry

deps: merge main to the sdk 50 branch

see the guidelines for commit messages. (view raw markdown for examples)


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 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/) or specification (x/<module>/spec/).
  • Added relevant godoc comments.
  • Provide a commit message to be used for the changelog entry in the PR description for review.
  • Re-reviewed Files changed in the Github PR explorer.
  • Review Codecov Report in the comment section below once CI passes.

lazyfuhrer and others added 23 commits July 27, 2023 08:38
removed
//nolint:staticcheck from deprecated tags
* docs: added 'tx-encoding.md' file to docs

* feat: added tx encoding to frontend

* docs: improved tx encoding docs

* style(docs): moved tx encoding to bottom

* docs: improved tx encoding

* docs: improved ica tx encoding docs

* docs: in ica tx encoding, added small code blocks around some interface names

* docs: improved ica client docs + reordered tx encoding in sidebar

* docs(ica/cmd): updated docs of 'generate-packet-data'

* docs: improved ica tx encoding docs
…s#4190)

* build(deps): Bump google.golang.org/grpc from 1.56.2 to 1.57.0

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.56.2 to 1.57.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](grpc/grpc-go@v1.56.2...v1.57.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* bump e2e, go mod tidy

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: DimitrisJim <[email protected]>
Co-authored-by: colin axnér <[email protected]>
Co-authored-by: Jim Fasarakis-Hilliard <[email protected]>
…4189)

Co-authored-by: Jim Fasarakis-Hilliard <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
* imp(ica, transfer): added WithICS4Wrapper api function

* docs(ica, transfer): updated 'WithICS4Wrapper's godocs

* docs(adr8): updated godocs for withics4wrapper

* imp(ica/host): removed withics4wrapper from icahost

* style(ica, tranfer): ran golanci-lint

* imp(ica/controller_test): added WithICS4Wrapper test

* imp(transfer_test): added WithICS4Wrapper test

* style(transfer_test, ica/controller_test): added spacing to TestWithICS4Wrapper

* feat(ica/host): implemented 'WithICS4Wrapper'

* feat(fee): implemented 'WithICS4Wrapper'
…nted (cosmos#4188)

* feat(core/port): added PacketDataUnmarshaler interface

* feat(transfer): implemented PacketDataUnmarshaler interface in transfer

* feat(ica/controller): implemented PacketDataUnmarshaler interface

* feat(fee): implemented PacketDataUnmarshaler interface

* feat(mock): implemented PacketDataUnmarshaler interface

* imp(transfer_test): removed explicit use of callbacks in tests

* style(transfer_test): ran golangci-lint

* imp(testing/mock): removed ErrorMock for the upstreamed error

* style(fee_test): improved test readability

* imp(transfer_test): improved test styling and added new test case
* fully enable revive

* revive

* resolve import shadowing by use of suite as a reciever

* unused-receiver

* names in parse.go

* resolve import shadowing

* resolve import shadowing in all places

* disable flag-return revive linter

* remove all unused receivers

* disable modifies-method-receiver

* unused-rec

* unused-rec

* unused-rec

* unused-parameter

* unused

* remove unused-parameter linter

* Revert "unused-parameter"

This reverts commit 55e6862.

* Revert "unused"

This reverts commit f3f5acf.

* revert a spelling issue caused by using us locale

* don't use unused-parameters

* don't use unused-parameters

* fix a few stragglers and focus in on "return in a defer function"

* interfaces -> any.  Disable early-return and defer in revive for now.

* transfer ibc module

* type params

* revert unneeded changes

* revert unneeded changes

* Revert "lint docs same as docs-lint pr"

This reverts commit 7ea500c.

* fix unused parameters (cleanup)

* restore export.go

* restore mock.go

* resolve linting issues in mock.go

* move interchain accounts tests to ica

* complete cleanup

* cleanup parameters

* cleanup parameters

* suite -> s

* further cleanup

* fully cleaned

* tidy capability

* Update e2e/testvalues/values.go

Co-authored-by: Jim Fasarakis-Hilliard <[email protected]>

* make e2e match main

* make .github match main

* Update modules/core/02-client/migrations/v7/solomachine.go

Co-authored-by: Jim Fasarakis-Hilliard <[email protected]>

* make the e2e folder match main

* remove the test instances accidentally added

* name unused parameters

* don't name something "prefix" when using an import named "prefix"

* use string, string instead of named returns, but keep the naming clarity

* finish consistency

* import suite as testifysuite

* Rename suite to testifysuite, fix references.

* s -> suite for controller module.

* s -> suite for host module.

* s -> suite for fee module, clean up additional host references.

* s -> suite for transfer.

* s -> suite for capability.

* s -> suite for 02-client.

* s -> suite for 03-connection.

* s -> suite, missed cases.

* s -> suite, 04-channel.

* s -> suite, 05-port.

* s -> suite, 23-commitment.

* s -> suite, core.

* s -> suite, light-client solomachine

* s -> suite, light-client tendermint

* s -> suite, light-client localhost

* s -> suite, testing folder

* clean up remaining usages of s.

* Add directives to ignore deprecated event attributes.

* Allow usage of interface{}.

* Fix linting issues after rebase.

* Address new linting issues.

* Revert renaming of args. Requires separate issue.

---------

Co-authored-by: Jim Fasarakis-Hilliard <[email protected]>
Co-authored-by: Cian Hatton <[email protected]>
cosmos#4199)

* refactor(core/exported): moved packet interfaces to packet.go

* feat(core/exported): 'PacketDataProvider' interface added

* feat(transfer): PacketDataProvider implemented

* feat(ica): implemented PacketDataProvider

* style(transfer_test, ica_test): improved test name

* docs(core.adr8): updated godocs

* style(ica_test): changed a variable name

* docs(core.adr8): added missing '.'

* imp(transfer): removed type assertion on jsonKey

* fix(transfer_test): removed unused test case parameter

* docs(transfer): updated godocs

* imp(ica): removed type assertion from 'GetCustomPacketData'

* imp(transfer_test): improved tests without type assertion

* imp(ica_test): improved tests without type assertion

* style(transfer_test): changed test case parameter name
…s#4200)

* refactor(core/exported): moved packet interfaces to packet.go

* feat(core/exported): created PacketData interface

* feat(transfer): implemented PacketData for transfer

* feat(ica): implemented PacketData

* docs(transfer.adr8): updated godocs of GetPacketSender

* style(adr8): renamed parameter srcPortID -> sourcePortID

* docs(core.adr8): updated godocs for PacketData interface

* docs(core.adr8): improved godocs for PacketData interface

* docs(core.adr8): updated godocs

* docs(transfer.adr8): updated godocs

* style(ica_test): removed unneeded comment

* docs(ica.adr8): updated godocs

* style(ica): fixed revive linter complaint

* docs(transfer.adr8): updated GetPacketSender's godocs

* style(transfer, ica): ran golangci-lin
…os#4231)

Bumps [go.uber.org/zap](https://github.com/uber-go/zap) from 1.24.0 to 1.25.0.
- [Release notes](https://github.com/uber-go/zap/releases)
- [Changelog](https://github.com/uber-go/zap/blob/master/CHANGELOG.md)
- [Commits](uber-go/zap@v1.24.0...v1.25.0)

---
updated-dependencies:
- dependency-name: go.uber.org/zap
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@faddat faddat requested a review from srdtrk as a code owner August 3, 2023 07:40
@faddat faddat marked this pull request as draft August 3, 2023 07:41
@faddat faddat marked this pull request as ready for review August 3, 2023 08:19
Copy link
Contributor

@colin-axner colin-axner 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

Looks like the sdk bump is in this pr as well, but I guess that's okay. Capability module can be bumped separately on main once there's a beta1 tag

@faddat
Copy link
Contributor Author

faddat commented Aug 4, 2023

@colin-axner -- the sdk bump is here too because I'm passing this PR around as something that I'm using in other upgrades.

I'd meant to note that but seems I forgot.

@colin-axner colin-axner merged commit 4e1d13e into cosmos:feat/upgrade-sdk-v0.50 Aug 7, 2023
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.

7 participants