Revert "deps: update to cosmos-sdk v0.52 (Olympus) (#7261)"

This reverts commit 8575743.

.github/workflows/callbacks.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -32,12 +32,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-arch: ['amd64', 'arm64']
+        go-arch: ['amd64', 'arm', 'arm64']
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
       - name: Build callbacks-module
         run: |
           cd modules/apps/callbacks
@@ -49,7 +49,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
       - name: Go Test
         run: |
           cd modules/apps/callbacks

.github/workflows/e2e-compatibility-workflow-call.yaml

@@ -49,7 +49,7 @@ jobs:
           repository: cosmos/ibc-go
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
           cache-dependency-path: 'e2e/go.sum'
       - name: Run e2e Test
         run: |

.github/workflows/e2e-fork.yml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
       - id: set-matrix
         run: |
           output=$(go run cmd/build_test_matrix/main.go)
@@ -55,7 +55,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
           cache-dependency-path: 'e2e/go.sum'
       - name: Run e2e Test
         run: |

.github/workflows/e2e-test-workflow-call.yml

@@ -181,7 +181,7 @@ jobs:
           repository: cosmos/ibc-go
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
       - id: set-matrix
         run: |
           output=$(go run cmd/build_test_matrix/main.go)
@@ -215,7 +215,7 @@ jobs:
           repository: cosmos/ibc-go
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
           cache-dependency-path: 'e2e/go.sum'
       - name: Run e2e Test
         id: e2e_test
@@ -264,7 +264,7 @@ jobs:
           repository: cosmos/ibc-go
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
           cache-dependency-path: 'e2e/go.sum'
       - name: Run e2e Test
         id: e2e_test
@@ -278,4 +278,4 @@ jobs:
         with:
           name: '${{ matrix.entrypoint }}-${{ matrix.test }}'
           path: e2e/diagnostics
-          retention-days: 5
+          retention-days: 5

.github/workflows/e2e.yaml

@@ -33,7 +33,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
       - id: get-tag
         run: |
           if [ -z "${{ github.event.pull_request.number }}" ]

.github/workflows/e2emodule.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
           cache-dependency-path: 'e2e/go.sum'
       - uses: actions/checkout@v4
         with:
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
           cache-dependency-path: 'e2e/go.sum'
       - name: Go Test
         run: |

.github/workflows/golangci-feature.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0

.github/workflows/golangci.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0

.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
       - uses: technote-space/[email protected]
         id: git_diff
         with:
@@ -60,7 +60,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
       - name: Create a file with all the pkgs
         run: go list ./... | grep -v e2e > pkgs.txt
       - name: Split pkgs into 4 files
@@ -94,7 +94,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
       - uses: technote-space/[email protected]
         with:
           PATTERNS: |

.github/workflows/wasm-client.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
       # Install cross compiler for ARM64. Export CC env variable.
       - name: Install compiler for arm64.
         run: |
@@ -55,7 +55,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.22'
       - name: Go Test
         run: |
           cd modules/light-clients/08-wasm

.golangci.yml

@@ -16,26 +16,25 @@ linters:
     - ineffassign
     - misspell
     - nakedret
-    - revive
     - staticcheck
-    - stylecheck
-    - tenv
     - thelper
     - typecheck
+    - stylecheck
+    - revive
+    - typecheck
+    - tenv
     - unconvert
     # Prefer unparam over revive's unused param. It is more thorough in its checking.
     - unparam
     - unused
+    - misspell
 
 issues:
   exclude-rules:
-    - text: "differs only by capitalization to method"
+    - text: 'differs only by capitalization to method'
       linters:
         - revive
-    - text: "Use of weak random number generator"
-      linters:
-        - gosec
-    - text: "G115: integer overflow conversion"
+    - text: 'Use of weak random number generator'
       linters:
         - gosec
     - linters:
@@ -60,25 +59,11 @@ linters-settings:
       - prefix(github.com/cometbft/cometbft)
       - prefix(github.com/cosmos/ibc-go)
     custom-order: true
-  gocritic:
-    disabled-checks:
-      - appendAssign
-  gosec:
-    # Available rules: https://github.com/securego/gosec#available-rules
-    excludes:
-      - G101 # Potential hardcoded credentials
-      - G107 # Potential HTTP request made with variable url
-      - G115 # Integer overflow conversion (used everywhere with int64 -> uint64 block height)
-      - G404 # Use of weak random number generator (math/rand instead of crypto/rand)
-    exclude-generated: true
-    confidence: medium
   revive:
     enable-all-rules: true
     # Do NOT whine about the following, full explanation found in:
     # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#description-of-available-rules
     rules:
-      - name: redundant-import-alias
-        disabled: true
       - name: use-any
         disabled: true
       - name: if-return
@@ -127,7 +112,7 @@ linters-settings:
       - name: unhandled-error
         disabled: false
         arguments:
-          - "fmt.Printf"
-          - "fmt.Print"
-          - "fmt.Println"
-          - "myFunction"
+          - 'fmt.Printf'
+          - 'fmt.Print'
+          - 'fmt.Println'
+          - 'myFunction'

docs/docs/03-light-clients/01-developer-guide/09-setup.md

@@ -44,7 +44,7 @@ func (AppModuleBasic) RegisterLegacyAminoCodec(*codec.LegacyAmino) {}
 
 // RegisterInterfaces registers module concrete types into protobuf Any. This allows core IBC
 // to unmarshal tendermint light client types.
-func (AppModuleBasic) RegisterInterfaces(registry coreregistry.InterfaceRegistrar) {
+func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) {
   RegisterInterfaces(registry)
 }
 

docs/docs/03-light-clients/04-wasm/05-governance.md

@@ -19,7 +19,7 @@ import (
   ...
   "github.com/cosmos/cosmos-sdk/runtime"
   authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-  govtypes "cosmossdk.io/x/gov/types"
+  govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 
   ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper"
   ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types"

docs/docs/05-migrations/06-v4-to-v5.md

@@ -336,7 +336,7 @@ The `MockEmptyAcknowledgement` type has been renamed to `EmptyAcknowledgement` (
 
 The `TestingApp` interface in `testing` has gone through some modifications:
 
-- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"cosmossdk.io/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:
+- The return type of the function `GetStakingKeeper` is not the concrete type `stakingkeeper.Keeper` anymore (where `stakingkeeper` is an import alias for `"github.com/cosmos/cosmos-sdk/x/staking/keeper"`), but it has been changed to the interface `ibctestingtypes.StakingKeeper` (where `ibctestingtypes` is an import alias for `""github.com/cosmos/ibc-go/v5/testing/types"`). See this [PR](https://github.com/cosmos/ibc-go/pull/2028) for more details. The `StakingKeeper` interface is defined as:
 
 ```go
 type StakingKeeper interface {

docs/tutorials/01-fee/04-wire-feeibc-mod.md

@@ -60,7 +60,6 @@ Next, we need to add `fee` module to the module basic manager and define its acc
 		stakingtypes.BondedPoolName:    {authtypes.Burner, authtypes.Staking},
 		stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking},
 		govtypes.ModuleName:            {authtypes.Burner},
-		pooltypes.ModuleName:           nil,
 		ibctransfertypes.ModuleName:    {authtypes.Minter, authtypes.Burner},
 		// plus-diff-line 
 +		ibcfeetypes.ModuleName:         nil,

e2e/README.md

@@ -190,7 +190,7 @@ And providing the git tag.
 To trigger the compatibility tests for a release branch, you can trigger these manually from the Github UI.
 
 This will build an image from the tip of the release branch and run all tests specified in the corresponding
-E2E test annotations.
+json matrix files under [.github/compatibility-test-matrices](../.github/compatibility-test-matrices).
 
 Navigate to `Actions` -> `Compatibility E2E` -> `Run Workflow` -> `release/v8.0.x`
 

e2e/ci-e2e-config.yaml

@@ -2,15 +2,17 @@
 # Many of these fields can be overridden with environment variables.
 # All fields that support this have the corresponding environment variable name in a comment beside the field.
 
+
 # | Environment Variable | Description                               | Default Value                |
 # |----------------------|-------------------------------------------|------------------------------|
 # | CHAIN_IMAGE          | The image that will be used for the chain | ghcr.io/cosmos/ibc-go-simd   |
 # | CHAIN_A_TAG          | The tag used for chain A                  | N/A (must be set)            |
 # | CHAIN_B_TAG          | The tag used for chain B                  | N/A (must be set)            |
 # | CHAIN_BINARY         | The binary used in the container          | simd                         |
-# | RELAYER_TAG          | The tag used for the relayer              | 1.10.4                       |
+# | RELAYER_TAG          | The tag used for the relayer              | 1.10.0                       |
 # | RELAYER_ID           | The type of relayer to use (rly/hermes)   | hermes                       |
 
+
 # see sample.config.yaml for a bare minimum configuration example.
 # set env E2E_CONFIG_PATH to point to this file to use it.
 ---
@@ -35,7 +37,7 @@ activeRelayer: hermes # override with RELAYER_ID
 relayers:
   - id: hermes
     image: ghcr.io/informalsystems/hermes
-    tag: "1.10.4"
+    tag: "1.10.0"
   - id: rly
     image: ghcr.io/cosmos/relayer
     tag: "latest"

e2e/dockerutil/dockerutil.go

@@ -8,7 +8,6 @@ import (
 	"path"
 
 	dockertypes "github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	dockerclient "github.com/docker/docker/client"
 )
@@ -19,7 +18,7 @@ const testLabel = "ibc-test"
 // note: the test suite name must be passed as the chains are created in SetupSuite which will label
 // them with the name of the test suite rather than the test.
 func GetTestContainers(ctx context.Context, suiteName string, dc *dockerclient.Client) ([]dockertypes.Container, error) {
-	testContainers, err := dc.ContainerList(ctx, container.ListOptions{
+	testContainers, err := dc.ContainerList(ctx, dockertypes.ContainerListOptions{
 		All: true,
 		Filters: filters.NewArgs(
 			// see: https://github.com/strangelove-ventures/interchaintest/blob/0bdc194c2aa11aa32479f32b19e1c50304301981/internal/dockerutil/setup.go#L31-L36
@@ -36,7 +35,7 @@ func GetTestContainers(ctx context.Context, suiteName string, dc *dockerclient.C
 
 // GetContainerLogs returns the logs of a container as a byte array.
 func GetContainerLogs(ctx context.Context, dc *dockerclient.Client, containerName string) ([]byte, error) {
-	readCloser, err := dc.ContainerLogs(ctx, containerName, container.LogsOptions{
+	readCloser, err := dc.ContainerLogs(ctx, containerName, dockertypes.ContainerLogsOptions{
 		ShowStdout: true,
 		ShowStderr: true,
 	})