sdk 50

.github/workflows/docker.yml

@@ -30,12 +30,12 @@ jobs:
 
     - name: Extract metadata (tags, labels) for Docker
       id: meta
-      uses: docker/metadata-action@2c0bd771b40637d97bf205cbccdd294a32112176
+      uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175
       with:
         images: ${{ env.REGISTRY }}/cosmos/${{ env.IMAGE_NAME }}
 
     - name: Build and push Docker image
-      uses: docker/build-push-action@44ea916f6c540f9302d50c2b1e5a8dc071f15cdf
+      uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825
       with:
         context: .
         push: true

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

@@ -109,13 +109,13 @@ jobs:
       - name: Extract metadata (tags, labels) for Docker
         if: ${{ inputs.build-and-push-docker-image }}
         id: meta
-        uses: docker/metadata-action@2c0bd771b40637d97bf205cbccdd294a32112176
+        uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175
         with:
           images: ${{ env.REGISTRY }}/cosmos/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
         if: ${{ inputs.build-and-push-docker-image }}
-        uses: docker/build-push-action@44ea916f6c540f9302d50c2b1e5a8dc071f15cdf
+        uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825
         with:
           context: .
           push: true

.github/workflows/golangci.yml

@@ -22,5 +22,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
-          version: v1.52.0
+          version: v1.53.1
           args: --timeout 5m

.github/workflows/release.yml

@@ -47,12 +47,12 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@2c0bd771b40637d97bf205cbccdd294a32112176
+        uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175
         with:
           images: ${{ env.REGISTRY }}/cosmos/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@44ea916f6c540f9302d50c2b1e5a8dc071f15cdf
+        uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825
         with:
           context: .
           push: true

.gitignore

@@ -57,5 +57,4 @@ dependency-graph.png
 *.history
 
 # Go
-go.work
 go.work.sum

.golangci.yml

@@ -6,7 +6,6 @@ run:
 linters:
   disable-all: true
   enable:
-    - depguard
     - dogsled
     - exportloopref
     - errcheck
@@ -20,6 +19,7 @@ linters:
     - misspell
     - nakedret
     - staticcheck
+    - thelper
     - stylecheck
     - revive
     - typecheck
@@ -60,3 +60,7 @@ linters-settings:
     allow-leading-space: true
     require-explanation: false
     require-specific: false
+  revive:
+    rules:
+      - name: if-return
+        disabled: true

cmd/build_test_matrix/main_test.go

@@ -139,6 +139,7 @@ type FeeMiddlewareTestSuite struct {}
 }
 
 func assertGithubActionTestMatricesEqual(t *testing.T, expected, actual GithubActionTestMatrix) {
+	t.Helper()
 	// sort by both suite and test as the order of the end result does not matter as
 	// all tests will be run.
 	sort.SliceStable(expected.Include, func(i, j int) bool {
@@ -183,6 +184,7 @@ func helper() {}
 }
 
 func createFileWithTestSuiteAndTests(t *testing.T, suiteName, fn1Name, fn2Name, dir, filename string) {
+	t.Helper()
 	goFileContents := goTestFileContents(suiteName, fn1Name, fn2Name)
 	err := os.WriteFile(path.Join(dir, filename), []byte(goFileContents), os.FileMode(0o777))
 	assert.NoError(t, err)

docs/migrations/v4-to-v5.md

@@ -42,7 +42,7 @@ The `AnteDecorator` was actually renamed twice, but in [this PR](https://github.
 
 ### Core
 
-The `key` parameter of the `NewKeeper` function in `modules/core/keeper` is now of type `storetypes.StoreKey` (where `storetypes` is an import alias for `"github.com/cosmos/cosmos-sdk/store/types"`):
+The `key` parameter of the `NewKeeper` function in `modules/core/keeper` is now of type `storetypes.StoreKey` (where `storetypes` is an import alias for `"cosmossdk.io/store/types"`):
 
 ```diff
 func NewKeeper(
@@ -60,7 +60,7 @@ The `RegisterRESTRoutes` function in `modules/core` has been removed.
 
 ### ICS03 - Connection
 
-The `key` parameter of the `NewKeeper` function in `modules/core/03-connection/keeper` is now of type `storetypes.StoreKey` (where `storetypes` is an import alias for `"github.com/cosmos/cosmos-sdk/store/types"`):
+The `key` parameter of the `NewKeeper` function in `modules/core/03-connection/keeper` is now of type `storetypes.StoreKey` (where `storetypes` is an import alias for `"cosmossdk.io/store/types"`):
 
 ```diff
 func NewKeeper(
@@ -85,7 +85,7 @@ The function `NewPacketId` in `modules/core/04-channel/types` has been renamed t
 ) PacketId 
 ```
 
-The `key` parameter of the `NewKeeper` function in `modules/core/04-channel/keeper` is now of type `storetypes.StoreKey` (where `storetypes` is an import alias for `"github.com/cosmos/cosmos-sdk/store/types"`):
+The `key` parameter of the `NewKeeper` function in `modules/core/04-channel/keeper` is now of type `storetypes.StoreKey` (where `storetypes` is an import alias for `"cosmossdk.io/store/types"`):
 
 ```diff
 func NewKeeper(
@@ -101,7 +101,7 @@ func NewKeeper(
 
 ### ICS20 - Transfer
 
-The `key` parameter of the `NewKeeper` function in `modules/apps/transfer/keeper` is now of type `storetypes.StoreKey` (where `storetypes` is an import alias for `"github.com/cosmos/cosmos-sdk/store/types"`):
+The `key` parameter of the `NewKeeper` function in `modules/apps/transfer/keeper` is now of type `storetypes.StoreKey` (where `storetypes` is an import alias for `"cosmossdk.io/store/types"`):
 
 ```diff
 func NewKeeper(
@@ -137,7 +137,7 @@ The `key` and `msgRouter` parameters of the `NewKeeper` functions in
 - `modules/apps/27-interchain-accounts/controller/keeper`
 - and `modules/apps/27-interchain-accounts/host/keeper`
 
-have changed type. The `key` parameter is now of type `storetypes.StoreKey` (where `storetypes` is an import alias for `"github.com/cosmos/cosmos-sdk/store/types"`), and the `msgRouter` parameter is now of type `*icatypes.MessageRouter` (where `icatypes` is an import alias for `"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"`):
+have changed type. The `key` parameter is now of type `storetypes.StoreKey` (where `storetypes` is an import alias for `"cosmossdk.io/store/types"`), and the `msgRouter` parameter is now of type `*icatypes.MessageRouter` (where `icatypes` is an import alias for `"github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types"`):
 
 ```diff
 // NewKeeper creates a new interchain accounts controller Keeper instance
@@ -283,7 +283,7 @@ See [ADR-03](../architecture/adr-003-ics27-acknowledgement.md/#next-major-versio
 
 ### ICS29 - Fee Middleware
 
-The `key` parameter of the `NewKeeper` function in `modules/apps/29-fee` is now of type `storetypes.StoreKey` (where `storetypes` is an import alias for `"github.com/cosmos/cosmos-sdk/store/types"`):
+The `key` parameter of the `NewKeeper` function in `modules/apps/29-fee` is now of type `storetypes.StoreKey` (where `storetypes` is an import alias for `"cosmossdk.io/store/types"`):
 
 ```diff
 func NewKeeper(
@@ -337,7 +337,7 @@ type StakingKeeper interface {
 }
 ```
 
-- The return type of the function `LastCommitID` has changed to `storetypes.CommitID` (where `storetypes` is an import alias for `"github.com/cosmos/cosmos-sdk/store/types"`).
+- The return type of the function `LastCommitID` has changed to `storetypes.CommitID` (where `storetypes` is an import alias for `"cosmossdk.io/store/types"`).
 
 See the following `git diff` for more details:
 
@@ -420,7 +420,7 @@ The `RegisterRESTRoutes` function in `testing/mock` has been removed.
 
 ### ICS02 - Client
 
-The `key` parameter of the `NewKeeper` function in `modules/core/02-client/keeper` is now of type `storetypes.StoreKey` (where `storetypes` is an import alias for `"github.com/cosmos/cosmos-sdk/store/types"`):
+The `key` parameter of the `NewKeeper` function in `modules/core/02-client/keeper` is now of type `storetypes.StoreKey` (where `storetypes` is an import alias for `"cosmossdk.io/store/types"`):
 
 ```diff
 func NewKeeper(

docs/migrations/v5-to-v6.md

@@ -35,11 +35,11 @@ package v6
 
 import (
   "github.com/cosmos/cosmos-sdk/codec"
-  storetypes "github.com/cosmos/cosmos-sdk/store/types"
+  storetypes "cosmossdk.io/store/types"
   sdk "github.com/cosmos/cosmos-sdk/types"
   "github.com/cosmos/cosmos-sdk/types/module"
   capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
-  upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+  upgradetypes "cosmossdk.io/x/upgrade/types"
 
   v6 "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/controller/migrations/v6"
 )

e2e/tests/core/02-client/client_test.go

@@ -15,12 +15,12 @@ import (
 	tmprotoversion "github.com/cometbft/cometbft/proto/tendermint/version"
 	tmtypes "github.com/cometbft/cometbft/types"
 	tmversion "github.com/cometbft/cometbft/version"
-	"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
 	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
 	"github.com/strangelove-ventures/interchaintest/v7/ibc"
 	test "github.com/strangelove-ventures/interchaintest/v7/testutil"
 	"github.com/stretchr/testify/suite"
 
+	"github.com/cosmos/cosmos-sdk/client/grpc/ccmtservice"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
@@ -204,7 +204,7 @@ func (s *ClientTestSuite) TestClient_Update_Misbehaviour() {
 	})
 
 	t.Run("create validator set", func(t *testing.T) {
-		var validators []*tmservice.Validator
+		var validators []*ccmtservice.Validator
 
 		t.Run("fetch block header at latest client state height", func(t *testing.T) {
 			header, err = s.GetBlockHeaderByHeight(ctx, chainB, latestHeight.GetRevisionHeight())
@@ -367,7 +367,7 @@ func createMaliciousTMHeader(chainID string, blockHeight int64, trustedHeight cl
 	blockID := ibctesting.MakeBlockID(hhash, 3, tmhash.Sum([]byte(invalidHashValue)))
 	voteSet := tmtypes.NewVoteSet(chainID, blockHeight, 1, tmproto.PrecommitType, tmValSet)
 
-	commit, err := tmtypes.MakeCommit(blockID, blockHeight, 1, voteSet, signers, timestamp)
+	commit, err := test.MakeCommit(blockID, blockHeight, 1, voteSet, signers, timestamp)
 	if err != nil {
 		return nil, err
 	}

e2e/tests/upgrades/upgrade_test.go

@@ -7,9 +7,9 @@ import (
 	"time"
 
 	sdkmath "cosmossdk.io/math"
+	upgradetypes "cosmossdk.io/x/upgrade/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	"github.com/cosmos/gogoproto/proto"
 	intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types"
 	interchaintest "github.com/strangelove-ventures/interchaintest/v7"

e2e/testsuite/codec.go

@@ -4,6 +4,7 @@ import (
 	"encoding/hex"
 	"fmt"
 
+	upgradetypes "cosmossdk.io/x/upgrade/types"
 	"github.com/cosmos/cosmos-sdk/codec"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -14,7 +15,6 @@ import (
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	grouptypes "github.com/cosmos/cosmos-sdk/x/group"
 	proposaltypes "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
-	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types"
 
 	icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"

e2e/testsuite/grpc_query.go

@@ -6,7 +6,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
+	"github.com/cosmos/cosmos-sdk/client/grpc/ccmtservice"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/cosmos/cosmos-sdk/x/authz"
@@ -49,7 +49,7 @@ type GRPCClients struct {
 	AuthQueryClient   authtypes.QueryClient
 	AuthZQueryClient  authz.QueryClient
 
-	ConsensusServiceClient tmservice.ServiceClient
+	ConsensusServiceClient ccmtservice.ServiceClient
 }
 
 // InitGRPCClients establishes GRPC clients with the given chain.
@@ -85,7 +85,7 @@ func (s *E2ETestSuite) InitGRPCClients(chain *cosmos.CosmosChain) {
 		ParamsQueryClient:      paramsproposaltypes.NewQueryClient(grpcConn),
 		AuthQueryClient:        authtypes.NewQueryClient(grpcConn),
 		AuthZQueryClient:       authz.NewQueryClient(grpcConn),
-		ConsensusServiceClient: tmservice.NewServiceClient(grpcConn),
+		ConsensusServiceClient: ccmtservice.NewServiceClient(grpcConn),
 	}
 }
 
@@ -267,8 +267,8 @@ func (s *E2ETestSuite) QueryProposalV1(ctx context.Context, chain ibc.Chain, pro
 
 // GetBlockHeaderByHeight fetches the block header at a given height.
 func (s *E2ETestSuite) GetBlockHeaderByHeight(ctx context.Context, chain ibc.Chain, height uint64) (Header, error) {
-	tmService := s.GetChainGRCPClients(chain).ConsensusServiceClient
-	res, err := tmService.GetBlockByHeight(ctx, &tmservice.GetBlockByHeightRequest{
+	cmtservice := s.GetChainGRCPClients(chain).ConsensusServiceClient
+	res, err := cmtservice.GetBlockByHeight(ctx, &ccmtservice.GetBlockByHeightRequest{
 		Height: int64(height),
 	})
 	if err != nil {
@@ -286,9 +286,9 @@ func (s *E2ETestSuite) GetBlockHeaderByHeight(ctx context.Context, chain ibc.Cha
 
 // GetValidatorSetByHeight returns the validators of the given chain at the specified height. The returned validators
 // are sorted by address.
-func (s *E2ETestSuite) GetValidatorSetByHeight(ctx context.Context, chain ibc.Chain, height uint64) ([]*tmservice.Validator, error) {
-	tmService := s.GetChainGRCPClients(chain).ConsensusServiceClient
-	res, err := tmService.GetValidatorSetByHeight(ctx, &tmservice.GetValidatorSetByHeightRequest{
+func (s *E2ETestSuite) GetValidatorSetByHeight(ctx context.Context, chain ibc.Chain, height uint64) ([]*ccmtservice.Validator, error) {
+	cmtservice := s.GetChainGRCPClients(chain).ConsensusServiceClient
+	res, err := cmtservice.GetValidatorSetByHeight(ctx, &ccmtservice.GetValidatorSetByHeightRequest{
 		Height: int64(height),
 	})
 	if err != nil {