Ci/golangci lint v2

.github/workflows/lint.yml

@@ -106,7 +106,7 @@ jobs:
         uses: golangci/golangci-lint-action@v7
         if: steps.changed-go-files.outputs.any_changed == 'true'
         with:
-          version: v1.61
+          version: v2.0
 
       - name: Lint go code (gofumpt)
         if: steps.changed-go-files.outputs.any_changed == 'true'

.golangci.yml

@@ -1,8 +1,6 @@
-run:
-  timeout: 10m
-
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     - asciicheck
     - bidichk
@@ -17,17 +15,14 @@ linters:
     - exhaustive
     - forbidigo
     - funlen
-    - gci
     - gocognit
     - goconst
     - gocritic
     - gocyclo
     - godot
-    - goimports
     - gomodguard
     - goprintffuncname
     - gosec
-    - gosimple
     - govet
     - ineffassign
     - lll
@@ -43,71 +38,88 @@ linters:
     - promlinter
     - revive
     - staticcheck
-    - stylecheck
     - tagliatelle
-    - tenv
     - tparallel
-    - typecheck
     - unconvert
     - unparam
     - unused
     - wastedassign
     - whitespace
-
-linters-settings:
-  gci:
-    sections:
-      - standard # Standard section: captures all standard packages.
-      - default # Default section: contains all imports that could not be matched to another section type.
-      - blank # blank imports
-      - dot # dot imports
-      - prefix(github.com/cometbft/cometbft) # comet
-      - prefix(cosmossdk.io) # cosmossdk.io
-      - prefix(github.com/cosmos/cosmos-sdk) # cosmos-sdk & cosmos org libs
-      - prefix(github.com/cosmos/interchain-security) # interchain-security
-      - prefix(github.com/cosmos/ibc-go) # ibc
-      - prefix(github.com/axone-protocol/axoned) # axone
-    custom-order: true
-
-  cyclop:
-    max-complexity: 20
-    skip-tests: true
-  funlen:
-    statements: 65
-  godot:
-    scope: declarations # comments to be checked: `declarations` (default), `toplevel`, or `all`
-  lll:
-    line-length: 135
-  tagliatelle:
-    case:
-      use-field-name: true
-      rules:
-        json: snake
-        yaml: snake
-output:
-  uniq-by-line: false
-
+  settings:
+    cyclop:
+      max-complexity: 20
+    funlen:
+      statements: 65
+    godot:
+      scope: declarations
+    lll:
+      line-length: 135
+    tagliatelle:
+      case:
+        rules:
+          json: snake
+          yaml: snake
+        use-field-name: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - lll
+        source: ^//\s*go:generate\s
+      - linters:
+          - godot
+        source: (noinspection|TODO)
+      - linters:
+          - gocritic
+        source: //noinspection
+      - linters:
+          - errorlint
+        source: ^\s+if _, ok := err\.\([^.]+\.InternalError\); ok {
+      - linters:
+          - dupl
+          - funlen
+        path: _test\.go
+      - linters:
+          - revive
+        path: _test\.go
+        text: "dot-imports:"
+      - linters:
+          - cyclop
+        path: (.+)_test\.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
-  exclude-rules:
-    - source: "^//\\s*go:generate\\s"
-      linters:
-        - lll
-    - source: "(noinspection|TODO)"
-      linters:
-        - godot
-    - source: "//noinspection"
-      linters:
-        - gocritic
-    - source: "^\\s+if _, ok := err\\.\\([^.]+\\.InternalError\\); ok {"
-      linters:
-        - errorlint
-    - path: "_test\\.go"
-      linters:
-        - dupl
-        - funlen
-    - path: "_test\\.go"
-      linters:
-        - revive
-      text: "dot-imports:"
+  uniq-by-line: false
+formatters:
+  enable:
+    - gci
+    - goimports
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - blank
+        - dot
+        - prefix(github.com/cometbft/cometbft)
+        - prefix(cosmossdk.io)
+        - prefix(github.com/cosmos/cosmos-sdk)
+        - prefix(github.com/cosmos/interchain-security)
+        - prefix(github.com/cosmos/ibc-go)
+        - prefix(github.com/axone-protocol/axoned)
+      custom-order: true
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -11,7 +11,7 @@ LEDGER_ENABLED         ?= true
 
 # Docker images
 DOCKER_IMAGE_GOLANG	      = golang:1.23-alpine3.20
-DOCKER_IMAGE_GOLANG_CI    = golangci/golangci-lint:v1.61
+DOCKER_IMAGE_GOLANG_CI    = golangci/golangci-lint:v2.0
 DOCKER_IMAGE_PROTO        = ghcr.io/cosmos/proto-builder:0.14.0
 DOCKER_IMAGE_BUF          = bufbuild/buf:1.4.0
 DOCKER_PROTO_RUN         := docker run --rm --user $(id -u):$(id -g) -v $(HOME)/.cache:/root/.cache -v $(PWD):/workspace --workdir /workspace $(DOCKER_IMAGE_PROTO)

app/app.go

@@ -441,7 +441,7 @@
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 		app.AccountKeeper.AddressCodec(),
 	)
-	app.BaseApp.SetCircuitBreaker(&app.CircuitKeeper)
+	app.SetCircuitBreaker(&app.CircuitKeeper)
 
 	groupConfig := group.DefaultConfig()
 	/*
@@ -904,7 +904,7 @@
 		if err := app.LoadLatestVersion(); err != nil {
 			tmos.Exit(err.Error())
 		}
-		ctx := app.BaseApp.NewUncachedContext(true, tmproto.Header{})
+		ctx := app.NewUncachedContext(true, tmproto.Header{})
 
 		// Initialize pinned codes in wasmvm as they are not persisted there
 		if err := app.WasmKeeper.InitializePinnedCodes(ctx); err != nil {
@@ -1136,15 +1136,15 @@
 
 // RegisterTxService implements the Application.RegisterTxService method.
 func (app *App) RegisterTxService(clientCtx client.Context) {
-	authtx.RegisterTxService(app.BaseApp.GRPCQueryRouter(), clientCtx, app.BaseApp.Simulate, app.interfaceRegistry)
+	authtx.RegisterTxService(app.GRPCQueryRouter(), clientCtx, app.Simulate, app.interfaceRegistry)
 }
 
 // RegisterTendermintService implements the Application.RegisterTendermintService method.
 func (app *App) RegisterTendermintService(clientCtx client.Context) {
 	cmtApp := server.NewCometABCIWrapper(app)
 	cmtservice.RegisterTendermintService(
 		clientCtx,
-		app.BaseApp.GRPCQueryRouter(),
+		app.GRPCQueryRouter(),
 		app.interfaceRegistry,
 		cmtApp.Query,
 	)

app/export.go

@@ -52,7 +52,7 @@
 		AppState:        appState,
 		Validators:      validators,
 		Height:          height,
-		ConsensusParams: app.BaseApp.GetConsensusParams(ctx),
+		ConsensusParams: app.GetConsensusParams(ctx),
 	}, nil
 }
 
@@ -63,12 +63,8 @@
 //
 //nolint:funlen,gocognit,gocyclo,cyclop
 func (app *App) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []string) {
-	applyAllowedAddrs := false
-
 	// check if there is a allowed address list
-	if len(jailAllowedAddrs) > 0 {
-		applyAllowedAddrs = true
-	}
+	applyAllowedAddrs := len(jailAllowedAddrs) > 0
 
 	allowedAddrsMap := make(map[string]bool)
 

x/logic/keeper/grpc_query_ask.go

@@ -14,15 +14,15 @@ import (
 
 func (k Keeper) Ask(ctx goctx.Context, req *types.QueryServiceAskRequest) (response *types.QueryServiceAskResponse, err error) {
 	if req == nil {
-		return nil, errorsmod.Wrap(types.InvalidArgument, "request is nil")
+		return nil, errorsmod.Wrap(types.ErrInvalidArgument, "request is nil")
 	}
 
 	sdkCtx := withSafeGasMeter(sdk.UnwrapSDKContext(ctx))
 	defer func() {
 		if r := recover(); r != nil {
 			if gasError, ok := r.(storetypes.ErrorOutOfGas); ok {
 				response, err = nil, errorsmod.Wrapf(
-					types.LimitExceeded, "out of gas: %s <%s> (%d/%d)",
+					types.ErrLimitExceeded, "out of gas: %s <%s> (%d/%d)",
 					types.ModuleName, gasError.Descriptor, sdkCtx.GasMeter().GasConsumed(), sdkCtx.GasMeter().Limit())
 
 				return
@@ -49,7 +49,7 @@ func checkLimits(request *types.QueryServiceAskRequest, limits types.Limits) err
 	size := uint64(len(request.GetQuery()))
 
 	if limits.MaxSize != 0 && size > limits.MaxSize {
-		return errorsmod.Wrapf(types.LimitExceeded, "query: %d > MaxSize: %d", size, limits.MaxSize)
+		return errorsmod.Wrapf(types.ErrLimitExceeded, "query: %d > MaxSize: %d", size, limits.MaxSize)
 	}
 
 	return nil

x/logic/keeper/interpreter.go

@@ -52,10 +52,10 @@
 
 	i, userOutput, err := k.newInterpreter(ctx, params)
 	if err != nil {
-		return nil, errorsmod.Wrapf(types.Internal, "error creating interpreter: %v", err.Error())
+		return nil, errorsmod.Wrapf(types.ErrInternal, "error creating interpreter: %v", err.Error())
 	}
 	if err := i.ExecContext(ctx, program); err != nil {
-		return nil, errorsmod.Wrapf(types.InvalidArgument, "error compiling query: %v", err.Error())
+		return nil, errorsmod.Wrapf(types.ErrInvalidArgument, "error compiling query: %v", err.Error())
 	}
 
 	answer, err := k.queryInterpreter(ctx, i, query, calculateSolutionLimit(solutionsLimit, params.GetLimits().MaxResultCount))
@@ -183,7 +183,7 @@
 				switch rType := r.(type) {
 				case storetypes.ErrorOutOfGas:
 					err = errorsmod.Wrapf(
-						types.LimitExceeded, "out of gas: %s <%s> (%d/%d)",
+						types.ErrLimitExceeded, "out of gas: %s <%s> (%d/%d)",
 						types.ModuleName, rType.Descriptor, sdkctx.GasMeter().GasConsumed(), sdkctx.GasMeter().Limit())
 				default:
 					panic(r)

x/logic/types/errors.go

@@ -7,9 +7,9 @@ import (
 )
 
 var (
-	InvalidArgument = sdkerrors.RegisterWithGRPCCode(ModuleName, 1, codes.InvalidArgument, "invalid argument")
+	ErrInvalidArgument = sdkerrors.RegisterWithGRPCCode(ModuleName, 1, codes.InvalidArgument, "invalid argument")
 	// LimitExceeded is returned when a limit is exceeded.
-	LimitExceeded = sdkerrors.RegisterWithGRPCCode(ModuleName, 2, codes.InvalidArgument, "limit exceeded")
+	ErrLimitExceeded = sdkerrors.RegisterWithGRPCCode(ModuleName, 2, codes.InvalidArgument, "limit exceeded")
 	// Internal is returned when an internal error occurs.
-	Internal = sdkerrors.RegisterWithGRPCCode(ModuleName, 3, codes.Internal, "internal error")
+	ErrInternal = sdkerrors.RegisterWithGRPCCode(ModuleName, 3, codes.Internal, "internal error")
 )

x/logic/util/prolog.go

@@ -35,7 +35,7 @@
 	p := engine.NewParser(&i.VM, strings.NewReader(query))
 	t, err := p.Term()
 	if err != nil {
-		return nil, errorsmod.Wrapf(types.InvalidArgument, "error executing query: %v", err.Error())
+		return nil, errorsmod.Wrapf(types.ErrInvalidArgument, "error executing query: %v", err.Error())
 	}
 
 	var env *engine.Env
@@ -52,20 +52,20 @@
 	vars := parsedVarsToVars(p.Vars)
 	results, err := envsToResults(envs, p.Vars, i)
 	if err != nil {
-		return nil, errorsmod.Wrapf(types.InvalidArgument, "error executing query: %v", err.Error())
+		return nil, errorsmod.Wrapf(types.ErrInvalidArgument, "error executing query: %v", err.Error())
 	}
 
 	if callErr != nil {
 		if uint64(len(results)) < solutionsLimit {
 			// error is not part of the look-ahead and should be included in the solutions
-			if errors.Is(callErr, types.LimitExceeded) {
+			if errors.Is(callErr, types.ErrLimitExceeded) {
 				return nil, callErr
 			}
 
 			var err engine.Exception
 			if errors.As(callErr, &err) {
 				if err, ok := isPanicError(err.Term()); ok {
-					return nil, errorsmod.Wrapf(types.LimitExceeded, "%s", err)
+					return nil, errorsmod.Wrapf(types.ErrLimitExceeded, "%s", err)
 				}
 			}
 
@@ -76,7 +76,7 @@
 				sdkCtx := sdk.UnwrapSDKContext(ctx)
 				if sdkCtx.GasMeter().IsOutOfGas() {
 					return errorsmod.Wrapf(
-						types.LimitExceeded, "out of gas: %s <%s> (%d/%d)",
+						types.ErrLimitExceeded, "out of gas: %s <%s> (%d/%d)",
 						types.ModuleName, callErr.Error(), sdkCtx.GasMeter().GasConsumed(), sdkCtx.GasMeter().Limit())
 				}
 				return nil

x/mint/module_test.go

@@ -26,7 +26,7 @@ func TestItCreatesModuleAccountOnInitBlock(t *testing.T) {
 		), &accountKeeper)
 	require.NoError(t, err)
 
-	ctx := app.BaseApp.NewContext(false)
+	ctx := app.NewContext(false)
 	acc := accountKeeper.GetAccount(ctx, authtypes.NewModuleAddress(types.ModuleName))
 	require.NotNil(t, acc)
 }