fumpt carlos upgrade branch

[faddat]

• fumpting carlos sdk 46 tendermint 35 branch to make reviews of Notional's sdk 46 work easier

Description

This is an ergonomics PR that fumpts carlos sdk 46 branch currently in use on gaia, so that we can spare gaia and her dev team the pain of the middleware refactor.

Intended use:

Merge this <- it fumpts carlos' branch so that it is closer to main
Merge beta-2 pr 1412 <- it updates carlos' branch to be compatible with latest ibc-go and sdk 46 beta 2
Merge sdk-master pr 1413 <- it brings carlos' branch up to date with latest cosmos sdk

---

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.
• Wrote unit and integration tests
• Updated relevant documentation (docs/) or specification (x/<module>/spec/)
• Added relevant godoc comments.
• Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
• Re-reviewed Files changed in the Github PR explorer
• Review Codecov Report in the comment section below once CI passes