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

* go mod changes * remove cometabci direct dep * fix all errors * appmodule & simapp cleanup * 08wasm fixes * get 08-wasm compiling * another simapp * another simapp * pass in environment * fix compilation errors * some fixes * build * fix other simapps * linting * remove unsed code * go mod changes * add pool module * anothersimapp * linting fixes * protocol pool module accounts * callback fixes * simapp fixes * register interfaces * fix feeibc * changes++ * fix missed conflict * fix wasm client * linting fixes * fix tests * linting * fix simapp tests * fix some tests * fix e2e go mod * go mod changes * remove grandpa * Gomod changes and minor updates (#7549) * Remove module.HasProposalMsgs * Update ante handler * Bump versions * x * Cleanup * chore: use same tags for all go mods * chore: update go mod files, revert callbacks simapp changes * chore: fix tendermint client test suite * chore: fix tests in TestAnteDecoratorCheckTx * chore: fix event tests * chore: fix compiler error in simapp * deps: update to latest of cosmossdk.io/store main to fix proofs test * chore: tidy all * fix: remove ibcmock module acc from blocked addrs * chore: fix proto failures and Gov errors * chore: fix ica test * chore: fix a few compiler errs in 08-wasm * fix: update ica account already exists test to front run account creation correctly * chore: fix ica test for address gen * chore: re-add log to returned error * chore: update go mods * chore: fixed build errors in wasm app.go * chore: cleanup callbacks simapp * chore: fixing simulation functions * chore: reconfigure simd cmd and fix TestInitCmd * feat: add runtime Env to icacontroller and fix v0.52 e2e tests (#7587) * feat: adding runtime Environment * chore: run make lint-fix * chore: remove duplicate import * chore: rm duplicate import * chore: migrate to env KVStoreService in icacontroller * chore: fix duplicate import * chore: rm kv store service * chore: refactor events to use environment * chore: make lint-fix * chore: make tidy-all * chore: rm msg service router from icacontroller * fix: remove 32 bit arm arch from callbacks ci builds * test: try cache false for callbacks linter * chore: pin to updated interchaintest fork * chore: revert relayer count to 10 * chore: continued work on upgrading e2e tests to 0.52 * chore: transfer e2e passing * chore: fix upgrade build errors * chore: bump interchaintest * chore: update sample config * chore: reconfigure protoany to use gogoproto any in favour of codec types * chore: tidy imports in e2e * fix: address failure in module safe query ica e2e test * bump golangci version to 1.60 * lint: remove duplicate import * chore: use gogoprotoany in favour of codec types any. rm ProtoCodecMarshaler for Codec iface * chore: bump go version in Dockerfile * chore: add todo * lint: fix unnecessary cast * deps: upgrade sdk to head of release/v0.52.x, upgrade store to latest main * deps: bump to head of release/v0.52 * fix: add unit test to reproduce e2e test failure for ScheduleIBCUpgrade, update code to expect tendermint client temporarily * fix: error in tests * chore: address comments from pr --------- Co-authored-by: chatton <[email protected]> Co-authored-by: Nikolas De Giorgis <[email protected]> * chore: linter fixes * lint: ignore redunant import alias * chore: rm redudant semi-colon in tendermint.proto * chore: rm redundant doc string regarding e2e-compatibility tests - tests now use annoations for compatibility checks * chore: update dead links * fix: apply fix for x/tx cosmos-sdk #22574 * chore: make lint-fix * fix: use hermes v1.10.4 for ci configs * fix: apply fix for cosmos-sdk #22779 and update dependencies * fix: unpin local sdk to HEAD of release/v0.52 in simapp go.mod * chore: revert docs/versioned_docs to main * chore: ammendments to linter configs * chore: update var name in expected keeper * chore: revert diffs in clienttypes/height_test * chore: propagate error from event emission in icacontroller * test: revert unnecessary diffs in test fn * chore: update comment in test chain * Update e2e/tests/interchain_accounts/base_test.go Co-authored-by: DimitrisJim <[email protected]> * chore: nit on import aliasing * refactor: rename instances of expected keepers from accountKeeper -> authKeeper where apt * chore: readd TestABCICodeDeterminism to 04-channel types * refactor: remove redundant AppModuleBasics * chore: rm GetStakingKeeper api from testing app * chore: update version in wasm dockerfile * chore: update the go work example file version * chore: rm UnwrapSDKContext in ica where possible * fix: import path in e2e from suggestion --------- Co-authored-by: Alexander Peters <[email protected]> Co-authored-by: chatton <[email protected]> Co-authored-by: Damian Nolan <[email protected]> Co-authored-by: Nikolas De Giorgis <[email protected]> Co-authored-by: DimitrisJim <[email protected]>
cosmos · Dec 17, 2024 · 8575743 · 8575743
1 parent fa77756
commit 8575743
Show file tree

Hide file tree

Showing 286 changed files with 5,470 additions and 6,007 deletions.
diff --git a/.github/workflows/callbacks.yml b/.github/workflows/callbacks.yml
@@ -17,13 +17,13 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: golangci/[email protected]
         with:
-          version: v1.57.2
+          version: v1.60
           only-new-issues: true
           args: --timeout 5m
           working-directory: modules/apps/callbacks
@@ -32,12 +32,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-arch: ['amd64', 'arm', 'arm64']
+        go-arch: ['amd64', 'arm64']
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       - 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.22'
+          go-version: '1.23'
       - name: Go Test
         run: |
           cd modules/apps/callbacks

diff --git a/.github/workflows/e2e-compatibility-workflow-call.yaml b/.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.22'
+          go-version: '1.23'
           cache-dependency-path: 'e2e/go.sum'
       - name: Run e2e Test
         run: |

diff --git a/.github/workflows/e2e-fork.yml b/.github/workflows/e2e-fork.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       - id: set-matrix
         run: |
           output=$(go run cmd/build_test_matrix/main.go)
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       - id: set-matrix
         run: |
           output=$(go run cmd/build_test_matrix/main.go)
@@ -75,7 +75,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
           cache-dependency-path: 'e2e/go.sum'
       - name: Run e2e Test
         run: |
@@ -112,7 +112,7 @@ jobs:
 #      - name: Setup Go
 #        uses: actions/setup-go@v5
 #        with:
-#          go-version: '1.22'
+#          go-version: '1.23'
 #          cache-dependency-path: 'e2e/go.sum'
 #      - name: Run e2e Test
 #        run: |

diff --git a/.github/workflows/e2e-test-workflow-call.yml b/.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.22'
+          go-version: '1.23'
       - 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.22'
+          go-version: '1.23'
           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.22'
+          go-version: '1.23'
           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
diff --git a/.github/workflows/e2e-wasm.yaml b/.github/workflows/e2e-wasm.yaml
@@ -34,7 +34,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       - id: get-tag
         run: |
           if [ -z "${{ github.event.pull_request.number }}" ]

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

diff --git a/.github/workflows/e2emodule.yml b/.github/workflows/e2emodule.yml
@@ -17,14 +17,14 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
           cache-dependency-path: 'e2e/go.sum'
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: golangci/[email protected]
         with:
-          version: v1.57.2
+          version: v1.60
           only-new-issues: true
           args: --timeout 5m
           working-directory: e2e/
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
           cache-dependency-path: 'e2e/go.sum'
       - name: Go Test
         run: |

diff --git a/.github/workflows/golangci-feature.yml b/.github/workflows/golangci-feature.yml
@@ -22,13 +22,13 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
-          version: v1.57.2
+          version: v1.60
           only-new-issues: true
           args: --timeout 10m
diff --git a/.github/workflows/golangci.yml b/.github/workflows/golangci.yml
@@ -18,13 +18,13 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
-          version: v1.57.2
+          version: v1.60
           only-new-issues: true
           args: --timeout 10m
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
 
       - name: Release
         uses: goreleaser/goreleaser-action@v6

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

diff --git a/.github/workflows/wasm-client.yml b/.github/workflows/wasm-client.yml
@@ -16,13 +16,13 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: golangci/[email protected]
         with:
-          version: v1.57.2
+          version: v1.60
           only-new-issues: true
           args: --timeout 10m
           working-directory: modules/light-clients/08-wasm
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       # 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.22'
+          go-version: '1.23'
       - name: Go Test
         run: |
           cd modules/light-clients/08-wasm

diff --git a/.golangci.yml b/.golangci.yml
@@ -16,25 +16,26 @@ linters:
     - ineffassign
     - misspell
     - nakedret
+    - revive
     - staticcheck
-    - thelper
-    - typecheck
     - stylecheck
-    - revive
-    - typecheck
     - tenv
+    - thelper
+    - typecheck
     - 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'
+    - text: "Use of weak random number generator"
+      linters:
+        - gosec
+    - text: "G115: integer overflow conversion"
       linters:
         - gosec
     - linters:
@@ -56,11 +57,25 @@ 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
@@ -109,7 +124,7 @@ linters-settings:
       - name: unhandled-error
         disabled: false
         arguments:
-          - 'fmt.Printf'
-          - 'fmt.Print'
-          - 'fmt.Println'
-          - 'myFunction'
+          - "fmt.Printf"
+          - "fmt.Print"
+          - "fmt.Println"
+          - "myFunction"
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22-alpine3.20 as builder
+FROM golang:1.23.3-alpine as builder
 ARG IBC_GO_VERSION
 
 RUN set -eux; apk add --no-cache git libusb-dev linux-headers gcc musl-dev make;

diff --git a/docs/docs/03-light-clients/01-developer-guide/09-setup.md b/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 codectypes.InterfaceRegistry) {
+func (AppModuleBasic) RegisterInterfaces(registry coreregistry.InterfaceRegistrar) {
   RegisterInterfaces(registry)
 }
 

diff --git a/docs/docs/03-light-clients/04-wasm/05-governance.md b/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 "github.com/cosmos/cosmos-sdk/x/gov/types"
+  govtypes "cosmossdk.io/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"

diff --git a/docs/docs/05-migrations/06-v4-to-v5.md b/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 `"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:
+- 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:
 
 ```go
 type StakingKeeper interface {

diff --git a/docs/tutorials/01-fee/04-wire-feeibc-mod.md b/docs/tutorials/01-fee/04-wire-feeibc-mod.md
@@ -60,6 +60,7 @@ 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,

diff --git a/e2e/README.md b/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
-json matrix files under [.github/compatibility-test-matrices](../.github/compatibility-test-matrices).
+E2E test annotations.
 
 Navigate to `Actions` -> `Compatibility E2E` -> `Run Workflow` -> `release/v8.0.x`