#303 Upgrade Cosmos-SDK to v0.47.3

- Update version of linter
- Fix linter errors

Signed-off-by: Abdulbois <abdulbois.tursunov@dsr-corporation.com>
Signed-off-by: Abdulbois <abdulbois123@gmail.com>

Author: Abdulbois

.github/workflows/release.yml

@@ -131,7 +131,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: ^1.16
+          go-version: ^1.20
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2

.github/workflows/verify.yml

@@ -87,7 +87,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: ^1.17
+          go-version: ^1.20
       - uses: actions/checkout@v3
       - uses: actions/cache@v3
         if: ${{ !env.ACT }}
@@ -113,7 +113,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: ^1.17
+          go-version: ^1.20
       - uses: actions/checkout@v3
       - uses: actions/cache@v3
         with:
@@ -136,11 +136,11 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.20
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3.6.0
         with:
-          version: v1.46.0
+          version:  1.55.2
           args: --timeout 5m0s
   check:
     if: always()

app/app.go

@@ -6,7 +6,6 @@ import (
 	"os"
 	"path/filepath"
 
-	autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
 	reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
 	dbm "github.com/cometbft/cometbft-db"
 	abci "github.com/cometbft/cometbft/abci/types"
@@ -42,7 +41,7 @@ import (
 	dclpkitypes "github.com/zigbee-alliance/distributed-compliance-ledger/types/pki"
 	compliancemodule "github.com/zigbee-alliance/distributed-compliance-ledger/x/compliance"
 	compliancemodulekeeper "github.com/zigbee-alliance/distributed-compliance-ledger/x/compliance/keeper"
-	compliancetypes "github.com/zigbee-alliance/distributed-compliance-ledger/x/compliance/types"
+	dclcompliancetypes "github.com/zigbee-alliance/distributed-compliance-ledger/x/compliance/types"
 	dclauthmodule "github.com/zigbee-alliance/distributed-compliance-ledger/x/dclauth"
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/dclauth/ante"
 	baseauthmodulekeeper "github.com/zigbee-alliance/distributed-compliance-ledger/x/dclauth/base/keeper"
@@ -55,7 +54,7 @@ import (
 	dclupgrademoduletypes "github.com/zigbee-alliance/distributed-compliance-ledger/x/dclupgrade/types"
 	modelmodule "github.com/zigbee-alliance/distributed-compliance-ledger/x/model"
 	modelmodulekeeper "github.com/zigbee-alliance/distributed-compliance-ledger/x/model/keeper"
-	modelmoduletypes "github.com/zigbee-alliance/distributed-compliance-ledger/x/model/types"
+	dclmodeltypes "github.com/zigbee-alliance/distributed-compliance-ledger/x/model/types"
 	pkimodule "github.com/zigbee-alliance/distributed-compliance-ledger/x/pki"
 	pkimodulekeeper "github.com/zigbee-alliance/distributed-compliance-ledger/x/pki/keeper"
 	validatormodule "github.com/zigbee-alliance/distributed-compliance-ledger/x/validator"
@@ -275,8 +274,8 @@ func New(
 		dclupgrademoduletypes.StoreKey,
 		dclpkitypes.StoreKey,
 		vendorinfomoduletypes.StoreKey,
-		modelmoduletypes.StoreKey,
-		compliancetypes.StoreKey,
+		dclmodeltypes.StoreKey,
+		dclcompliancetypes.StoreKey,
 		// this line is used by starport scaffolding # stargate/app/storeKey
 	)
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
@@ -438,17 +437,17 @@ func New(
 
 	app.ModelKeeper = *modelmodulekeeper.NewKeeper(
 		appCodec,
-		keys[modelmoduletypes.StoreKey],
-		keys[modelmoduletypes.MemStoreKey],
+		keys[dclmodeltypes.StoreKey],
+		keys[dclmodeltypes.MemStoreKey],
 
 		app.DclauthKeeper,
 		app.ComplianceKeeper,
 	)
 
 	app.ComplianceKeeper = *compliancemodulekeeper.NewKeeper(
 		appCodec,
-		keys[compliancetypes.StoreKey],
-		keys[compliancetypes.MemStoreKey],
+		keys[dclcompliancetypes.StoreKey],
+		keys[dclcompliancetypes.MemStoreKey],
 		app.DclauthKeeper,
 		app.ModelKeeper,
 	)
@@ -529,12 +528,31 @@ func New(
 
 	app.mm.SetOrderBeginBlockers(
 		// TODO [issue 99] verify the order
-		upgradetypes.ModuleName,
+		dclauthmoduletypes.ModuleName,
 		validatormoduletypes.ModuleName,
+		dclgenutilmoduletypes.ModuleName,
+		dclupgrademoduletypes.ModuleName,
+		upgradetypes.ModuleName,
+		dclpkitypes.ModuleName,
+		dclauthmoduletypes.ModuleName,
+		dclmodeltypes.ModuleName,
+		dclcompliancetypes.ModuleName,
+		vendorinfomoduletypes.ModuleName,
+		paramstypes.ModuleName,
 	)
 
 	app.mm.SetOrderEndBlockers(
+		dclauthmoduletypes.ModuleName,
 		validatormoduletypes.ModuleName,
+		dclgenutilmoduletypes.ModuleName,
+		dclupgrademoduletypes.ModuleName,
+		upgradetypes.ModuleName,
+		dclpkitypes.ModuleName,
+		dclauthmoduletypes.ModuleName,
+		dclmodeltypes.ModuleName,
+		dclcompliancetypes.ModuleName,
+		vendorinfomoduletypes.ModuleName,
+		paramstypes.ModuleName,
 	)
 
 	// NOTE: The genutils module must occur after staking so that pools are
@@ -565,8 +583,11 @@ func New(
 		dclupgrademoduletypes.ModuleName,
 		dclpkitypes.ModuleName,
 		vendorinfomoduletypes.ModuleName,
-		modelmoduletypes.ModuleName,
-		compliancetypes.ModuleName,
+		dclmodeltypes.ModuleName,
+		dclcompliancetypes.ModuleName,
+		paramstypes.ModuleName,
+		upgradetypes.ModuleName,
+		dclupgrademoduletypes.ModuleName,
 		// this line is used by starport scaffolding # stargate/app/initGenesis
 	)
 
@@ -576,7 +597,7 @@ func New(
 	app.configurator = module.NewConfigurator(app.appCodec, app.MsgServiceRouter(), app.GRPCQueryRouter())
 	app.mm.RegisterServices(app.configurator)
 
-	autocliv1.RegisterQueryServer(app.GRPCQueryRouter(), runtimeservices.NewAutoCLIQueryService(app.mm.Modules))
+	// autocliv1.RegisterQueryServer(app.GRPCQueryRouter(), runtimeservices.NewAutoCLIQueryService(app.mm.Modules))
 	reflectionSvc, err := runtimeservices.NewReflectionService()
 	if err != nil {
 		panic(err)
@@ -832,8 +853,8 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
 	paramsKeeper.Subspace(dclupgrademoduletypes.ModuleName)
 	paramsKeeper.Subspace(dclpkitypes.ModuleName)
 	paramsKeeper.Subspace(vendorinfomoduletypes.ModuleName)
-	paramsKeeper.Subspace(modelmoduletypes.ModuleName)
-	paramsKeeper.Subspace(compliancetypes.ModuleName)
+	paramsKeeper.Subspace(dclmodeltypes.ModuleName)
+	paramsKeeper.Subspace(dclcompliancetypes.ModuleName)
 	// this line is used by starport scaffolding # stargate/app/paramSubspace
 
 	return paramsKeeper

integration_tests/utils/common.go

@@ -21,9 +21,8 @@ import (
 	"time"
 )
 
-// nolint
 func RandString() string {
-	rand.Seed(time.Now().UnixNano())
+	rand.Seed(time.Now().UnixNano()) //nolint:staticcheck
 
 	chars := []rune("ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
 

integration_tests/utils/grpc_rest.go

@@ -25,6 +25,8 @@ import (
 	//nolint:staticcheck
 	"github.com/golang/protobuf/proto"
 	"github.com/stretchr/testify/require"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 
 	sdkerrors "cosmossdk.io/errors"
 	clienttx "github.com/cosmos/cosmos-sdk/client/tx"
@@ -35,7 +37,6 @@ import (
 	"github.com/zigbee-alliance/distributed-compliance-ledger/app"
 	appparams "github.com/zigbee-alliance/distributed-compliance-ledger/app/params"
 	dclauthtypes "github.com/zigbee-alliance/distributed-compliance-ledger/x/dclauth/types"
-	"google.golang.org/grpc"
 )
 
 // NOTE
@@ -55,8 +56,8 @@ type TestSuite struct {
 func (suite *TestSuite) GetGRPCConn() *grpc.ClientConn {
 	// Create a connection to the gRPC server.
 	grpcConn, err := grpc.Dial(
-		"127.0.0.1:26630",   // Or your gRPC server address.
-		grpc.WithInsecure(), // The SDK doesn't support any transport security mechanism.
+		"127.0.0.1:26630", // Or your gRPC server address.
+		grpc.WithTransportCredentials(insecure.NewCredentials()), // The SDK doesn't support any transport security mechanism.
 	)
 	require.NoError(suite.T, err)
 

testutil/network/network.go

@@ -1,4 +1,4 @@
-//nolint:blank-imports,staticcheck
+//nolint:staticcheck
 package network
 
 import (
@@ -43,10 +43,10 @@ import (
 	"github.com/cosmos/cosmos-sdk/testutil"
 	"github.com/cosmos/cosmos-sdk/testutil/network"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	_ "github.com/cosmos/cosmos-sdk/x/auth"
+	_ "github.com/cosmos/cosmos-sdk/x/auth" //nolint: nolintlint
 	_ "github.com/cosmos/cosmos-sdk/x/auth/tx/config"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	_ "github.com/cosmos/cosmos-sdk/x/bank"
+	_ "github.com/cosmos/cosmos-sdk/x/bank" //nolint: nolintlint
 	_ "github.com/cosmos/cosmos-sdk/x/consensus"
 	_ "github.com/cosmos/cosmos-sdk/x/params"
 	_ "github.com/cosmos/cosmos-sdk/x/staking"

x/compliance/handler.go

@@ -3,8 +3,10 @@ package compliance
 import (
 	"fmt"
 
+	"cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/compliance/keeper"
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/compliance/types"
 )
@@ -41,7 +43,7 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
 		default:
 			errMsg := fmt.Sprintf("unrecognized %s message type: %T", types.ModuleName, msg)
 
-			return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg)
+			return nil, errors.Wrap(sdkerrors.ErrUnknownRequest, errMsg)
 		}
 	}
 }

x/compliance/handler_delete_compliance_info_test.go

@@ -29,6 +29,7 @@ func (setup *TestSetup) deleteComplianceInfo(vid int32, pid int32, softwareVersi
 }
 
 func (setup *TestSetup) checkComplianceInfoDeleted(t *testing.T, deleteComplInfoMsg *types.MsgDeleteComplianceInfo) {
+	t.Helper()
 	vid := deleteComplInfoMsg.Vid
 	pid := deleteComplInfoMsg.Pid
 	softwareVersion := deleteComplInfoMsg.SoftwareVersion

x/compliance/handler_provision_model_test.go

@@ -13,6 +13,7 @@ import (
 )
 
 func setupProvisionModel(t *testing.T) (*TestSetup, int32, int32, uint32, string, string) {
+	t.Helper()
 	setup := setup(t)
 
 	vid, pid, softwareVersion, softwareVersionString := setup.addModelVersion(
@@ -48,6 +49,7 @@ func (setup *TestSetup) provisionModelWithAllOptionalFlags(vid int32, pid int32,
 }
 
 func (setup *TestSetup) checkComplianceInfoEqualsProvisionModelMsgData(t *testing.T, provisionModelMsg *types.MsgProvisionModel) {
+	t.Helper()
 	vid := provisionModelMsg.Vid
 	pid := provisionModelMsg.Pid
 	softwareVersion := provisionModelMsg.SoftwareVersion
@@ -59,6 +61,7 @@ func (setup *TestSetup) checkComplianceInfoEqualsProvisionModelMsgData(t *testin
 }
 
 func (setup *TestSetup) checkModelProvisioned(t *testing.T, provisionModelMsg *types.MsgProvisionModel) {
+	t.Helper()
 	vid := provisionModelMsg.Vid
 	pid := provisionModelMsg.Pid
 	softwareVersion := provisionModelMsg.SoftwareVersion

x/compliance/handler_revoke_model_test.go

@@ -15,6 +15,7 @@ import (
 )
 
 func setupRevokeModel(t *testing.T) (*TestSetup, int32, int32, uint32, string, string) {
+	t.Helper()
 	setup := setup(t)
 
 	vid, pid, softwareVersion, softwareVersionString := setup.addModelVersion(
@@ -32,6 +33,7 @@ func (setup *TestSetup) revokeModel(vid int32, pid int32, softwareVersion uint32
 }
 
 func (setup *TestSetup) checkModelRevoked(t *testing.T, revokeModelMsg *types.MsgRevokeModel) {
+	t.Helper()
 	vid := revokeModelMsg.Vid
 	pid := revokeModelMsg.Pid
 	softwareVersion := revokeModelMsg.SoftwareVersion
@@ -48,6 +50,7 @@ func (setup *TestSetup) checkModelRevoked(t *testing.T, revokeModelMsg *types.Ms
 }
 
 func (setup *TestSetup) checkModelStatusChangedToRevoked(t *testing.T, revokeModelMsg *types.MsgRevokeModel) {
+	t.Helper()
 	vid := revokeModelMsg.Vid
 	pid := revokeModelMsg.Pid
 	softwareVersion := revokeModelMsg.SoftwareVersion
@@ -64,6 +67,7 @@ func (setup *TestSetup) checkModelStatusChangedToRevoked(t *testing.T, revokeMod
 }
 
 func (setup *TestSetup) checkRevokedModelInfoEqualsMessageData(t *testing.T, revokeModelMsg *types.MsgRevokeModel) *types.ComplianceInfo {
+	t.Helper()
 	vid := revokeModelMsg.Vid
 	pid := revokeModelMsg.Pid
 	softwareVersion := revokeModelMsg.SoftwareVersion

x/compliance/handler_test.go

@@ -370,6 +370,7 @@ func checkRevokedModelInfo(
 }
 
 func assertNotFound(t *testing.T, err error) {
+	t.Helper()
 	require.Error(t, err)
 	require.Equal(t, codes.NotFound, status.Code(err))
 }

x/compliance/handler_update_compliance_info_test.go

@@ -12,6 +12,7 @@ import (
 )
 
 func (setup *TestSetup) checkAllComplianceInfoFieldsUpdated(t *testing.T, originalComplianceInfo *types.ComplianceInfo, updatedComplianceInfo *types.ComplianceInfo) {
+	t.Helper()
 	require.Equal(t, originalComplianceInfo.Vid, updatedComplianceInfo.Vid)
 	require.Equal(t, originalComplianceInfo.Pid, updatedComplianceInfo.Pid)
 	require.Equal(t, originalComplianceInfo.SoftwareVersion, updatedComplianceInfo.SoftwareVersion)
@@ -33,6 +34,7 @@ func (setup *TestSetup) checkAllComplianceInfoFieldsUpdated(t *testing.T, origin
 }
 
 func (setup *TestSetup) checkDeviceSoftwareComplianceUpdated(t *testing.T, originalComplianceInfo *types.ComplianceInfo, updatedDeviceSoftwareCompliance *types.DeviceSoftwareCompliance, isUpdatedMinimally bool) {
+	t.Helper()
 	isFound := false
 
 	for _, complianceInfo := range updatedDeviceSoftwareCompliance.ComplianceInfo {
@@ -57,6 +59,7 @@ func (setup *TestSetup) checkDeviceSoftwareComplianceUpdated(t *testing.T, origi
 }
 
 func setupUpdateComplianceInfo(t *testing.T) (*TestSetup, int32, int32, uint32, string, string, *types.ComplianceInfo, *types.DeviceSoftwareCompliance) {
+	t.Helper()
 	setup := setup(t)
 
 	vid, pid, softwareVersion, softwareVersionString := setup.addModelVersion(

x/compliance/keeper/msg_server_certify_model.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"time"
 
+	"cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
@@ -18,13 +19,13 @@ func (k msgServer) CertifyModel(goCtx context.Context, msg *types.MsgCertifyMode
 
 	signerAddr, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
-		return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid Address: (%s)", err)
+		return nil, errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid Address: (%s)", err)
 	}
 
 	// check if sender has enough rights to certify model
 	// sender must have CertificationCenter role to certify/revoke model
 	if !k.dclauthKeeper.HasRole(ctx, signerAddr, dclauthtypes.CertificationCenter) {
-		return nil, sdkerrors.Wrapf(sdkerrors.ErrUnauthorized,
+		return nil, errors.Wrapf(sdkerrors.ErrUnauthorized,
 			"MsgAddTestingResult transaction should be signed by an account with the %s role",
 			dclauthtypes.CertificationCenter,
 		)

x/compliance/keeper/msg_server_delete_compliance_info.go

@@ -3,8 +3,10 @@ package keeper
 import (
 	"context"
 
+	"cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	"github.com/zigbee-alliance/distributed-compliance-ledger/x/compliance/types"
 	dclauthtypes "github.com/zigbee-alliance/distributed-compliance-ledger/x/dclauth/types"
 )
@@ -14,13 +16,13 @@ func (k msgServer) DeleteComplianceInfo(goCtx context.Context, msg *types.MsgDel
 
 	signerAddr, err := sdk.AccAddressFromBech32(msg.Creator)
 	if err != nil {
-		return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid Address: (%s)", err)
+		return nil, errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid Address: (%s)", err)
 	}
 
 	// check if sender has enough rights to delete model
 	// sender must have CertificationCenter role to certify/revoke model
 	if !k.dclauthKeeper.HasRole(ctx, signerAddr, dclauthtypes.CertificationCenter) {
-		return nil, sdkerrors.Wrapf(sdkerrors.ErrUnauthorized,
+		return nil, errors.Wrapf(sdkerrors.ErrUnauthorized,
 			"MsgDeleteComplianceInfo transaction should be signed by an account with the %s role",
 			dclauthtypes.CertificationCenter,
 		)