chore: linter upgrade to v2 (#2354)

Author: onikonychev

.github/workflows/golangci-lint.yml

@@ -71,7 +71,7 @@ jobs:
         uses: golangci/golangci-lint-action@v8
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.64.8
+          version: v2.1
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

.golangci.yml

@@ -1,59 +1,71 @@
-# Options for analysis running. See https://golangci-lint.run/usage/configuration/ for config options.
-run:
-  timeout: 5m
-issues:
-  max-issues-per-linter: 0 # infinite
-  max-same-issues: 0 # infinite
-  fix: true
-  exclude:
-    # see https://github.com/stretchr/testify/issues/1199#issuecomment-1215592618, testify shows vet problem
-    - 'github.com\/stretchr\/testify\/suite\.Suite contains sync\.RWMutex'
+version: "2"
 linters:
   enable:
-    - whitespace
-    - goimports
     - importas
-  disable:
-    - typecheck
-linters-settings:
-  misspell:
-    locale: US
-  goimports:
-    # Put imports beginning with prefix after 3rd-party packages.
-    # It's a comma-separated list of prefixes.
-    local-prefixes: github.com/NibiruChain/nibiru
-  revive:
+    - whitespace
+  settings:
+    importas:
+      alias:
+        - pkg: github.com/pkg/errors
+          alias: pkgerrors
+        - pkg: cosmossdk.io/errors
+          alias: sdkioerrors
+        - pkg: github.com/cosmos/cosmos-sdk/types/errors
+          alias: sdkerrors
+        - pkg: cosmossdk.io/math
+          alias: sdkmath
+        - pkg: github.com/cosmos/cosmos-sdk/types
+          alias: sdk
+        - pkg: github.com/cometbft/cometbft/rpc/core
+          alias: cmtrpccoretypes
+        - pkg: github.com/cometbft/cometbft/rpc/client
+          alias: cmtrpcclient
+        - pkg: github.com/cometbft/cometbft/config
+          alias: cmtcfg
+        - pkg: github.com/cometbft/cometbft/libs/cli
+          alias: cmtcli
+        - pkg: github.com/cometbft/cometbft/libs/rand
+          alias: cmtrand
+        - pkg: github.com/cometbft/cometbft/types
+          alias: cmttypes
+      no-unaliased: true
+      no-extra-aliases: false
+    misspell:
+      locale: US
+    revive:
+      rules:
+        - name: exported
+          disabled: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-      - name: exported
-        disabled: true
-  importas:
-    # no-unaliased: Forces the use of the specified alias
-    no-unaliased: true
-    # Disallows the use of aliases not specified by the linter.
-    no-extra-aliases: false
-    alias:
-      - pkg: github.com/pkg/errors
-        alias: pkgerrors
-      - pkg: cosmossdk.io/errors
-        alias: sdkioerrors
-      - pkg: github.com/cosmos/cosmos-sdk/types/errors
-        alias: sdkerrors
-      - pkg: cosmossdk.io/math
-        alias: sdkmath
-      - pkg: github.com/cosmos/cosmos-sdk/types
-        alias: sdk
-      - pkg: github.com/cometbft/cometbft/rpc/core
-        alias: cmtrpccoretypes
-      - pkg: github.com/cometbft/cometbft/rpc/client
-        alias: cmtrpcclient
-      - pkg: github.com/cometbft/cometbft/config
-        alias: cmtcfg
-      - pkg: github.com/cometbft/cometbft/libs/cli
-        alias: cmtcli
-      - pkg: github.com/cometbft/cometbft/libs/rand
-        alias: cmtrand
-      - pkg: github.com/cometbft/cometbft/types
-        alias: cmttypes
-
+      - path: (.+)\.go$
+        text: github.com\/stretchr\/testify\/suite\.Suite contains sync\.RWMutex
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
+  fix: true
 severity:
-  default-severity: error
+  default: error
+formatters:
+  enable:
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/NibiruChain/nibiru
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

CHANGELOG.md

@@ -54,6 +54,7 @@ See https://github.com/dangoslen/changelog-enforcer.
 - [#2348](https://github.com/NibiruChain/nibiru/pull/2348) - fix(oracle): max expiration a label rather than an invalidation for additional query liveness
 - [#2350](https://github.com/NibiruChain/nibiru/pull/2350) - fix(simapp): sim tests with empty validator set panic
 - [#2352](https://github.com/NibiruChain/nibiru/pull/2352) - chore(token-registry): Add bank coin versions of USDC and USDT from Stargate and LayerZero, and update ErisEvm.sol to fix redeem
+- [#2354](https://github.com/NibiruChain/nibiru/pull/2354) - chore: linter upgrade to v2
 
 ### Dependencies
 - Bump `form-data` from 4.0.1 to 4.0.4 ([#2347](https://github.com/NibiruChain/nibiru/pull/2347))

app/app.go

@@ -386,7 +386,7 @@ func NewNibiruApp(
 	cryptocodec.RegisterCrypto(app.legacyAmino)
 
 	// load state streaming if enabled
-	if _, _, err := streaming.LoadStreamingServices(app.App.BaseApp, appOpts, app.appCodec, logger, app.kvStoreKeys()); err != nil {
+	if _, _, err := streaming.LoadStreamingServices(app.BaseApp, appOpts, app.appCodec, logger, app.kvStoreKeys()); err != nil {
 		logger.Error("failed to load state streaming", "err", err)
 		os.Exit(1)
 	}
@@ -465,7 +465,7 @@ func NewNibiruApp(
 
 	if loadLatest {
 		// Initialize pinned codes in wasmvm as they are not persisted there
-		if err := ibcwasmkeeper.InitializePinnedCodes(app.BaseApp.NewUncachedContext(true, cmtproto.Header{}), app.appCodec); err != nil {
+		if err := ibcwasmkeeper.InitializePinnedCodes(app.NewUncachedContext(true, cmtproto.Header{}), app.appCodec); err != nil {
 			cmtos.Exit(fmt.Sprintf("failed to initialize pinned codes %s", err))
 		}
 	}
@@ -591,15 +591,15 @@ func (app *NibiruApp) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.API
 // RegisterTxService implements the Application.RegisterTxService method.
 func (app *NibiruApp) RegisterTxService(clientCtx client.Context) {
 	authtx.RegisterTxService(
-		app.BaseApp.GRPCQueryRouter(), clientCtx,
-		app.BaseApp.Simulate, app.interfaceRegistry)
+		app.GRPCQueryRouter(), clientCtx,
+		app.Simulate, app.interfaceRegistry)
 }
 
 // RegisterTendermintService implements the Application.RegisterTendermintService method.
 func (app *NibiruApp) RegisterTendermintService(clientCtx client.Context) {
 	tmservice.RegisterTendermintService(
 		clientCtx,
-		app.BaseApp.GRPCQueryRouter(),
+		app.GRPCQueryRouter(),
 		app.interfaceRegistry,
 		app.Query,
 	)

app/app_config.go

@@ -55,14 +55,12 @@ import (
 	"github.com/NibiruChain/nibiru/v2/x/common"
 	devgastypes "github.com/NibiruChain/nibiru/v2/x/devgas/v1/types"
 	epochstypes "github.com/NibiruChain/nibiru/v2/x/epochs/types"
-	"github.com/NibiruChain/nibiru/v2/x/evm"
 	evmtypes "github.com/NibiruChain/nibiru/v2/x/evm"
 	"github.com/NibiruChain/nibiru/v2/x/genmsg"
 	inflationtypes "github.com/NibiruChain/nibiru/v2/x/inflation/types"
 	oracletypes "github.com/NibiruChain/nibiru/v2/x/oracle/types"
 	sudotypes "github.com/NibiruChain/nibiru/v2/x/sudo/types"
 	tftypes "github.com/NibiruChain/nibiru/v2/x/tokenfactory/types"
-	tokenfactorytypes "github.com/NibiruChain/nibiru/v2/x/tokenfactory/types"
 )
 
 var (
@@ -77,12 +75,12 @@ var (
 		ibcfeetypes.ModuleName,
 		icatypes.ModuleName,
 
-		evm.ModuleName,
+		evmtypes.ModuleName,
 		epochstypes.ModuleName,
 		sudotypes.ModuleName,
 		common.TreasuryPoolModuleAccount,
 		wasmtypes.ModuleName,
-		tokenfactorytypes.ModuleName,
+		tftypes.ModuleName,
 	}
 
 	// module account permissions
@@ -98,12 +96,12 @@ var (
 		{Account: ibcfeetypes.ModuleName},
 		{Account: icatypes.ModuleName},
 
-		{Account: evm.ModuleName, Permissions: []string{authtypes.Minter, authtypes.Burner}},
+		{Account: evmtypes.ModuleName, Permissions: []string{authtypes.Minter, authtypes.Burner}},
 		{Account: epochstypes.ModuleName},
 		{Account: sudotypes.ModuleName},
 		{Account: common.TreasuryPoolModuleAccount},
 		{Account: wasmtypes.ModuleName, Permissions: []string{authtypes.Burner}},
-		{Account: tokenfactorytypes.ModuleName, Permissions: []string{authtypes.Minter, authtypes.Burner}},
+		{Account: tftypes.ModuleName, Permissions: []string{authtypes.Minter, authtypes.Burner}},
 	}
 
 	orderedModuleNames = []string{
@@ -158,13 +156,13 @@ var (
 		ibcwasmtypes.ModuleName,
 
 		// --------------------------------------------------------------------
-		evm.ModuleName,
+		evmtypes.ModuleName,
 
 		// --------------------------------------------------------------------
 		// CosmWasm
 		wasmtypes.ModuleName,
 		devgastypes.ModuleName,
-		tokenfactorytypes.ModuleName,
+		tftypes.ModuleName,
 
 		// Everything else should be before genmsg
 		genmsg.ModuleName,

app/evmante/evmante_can_transfer.go

@@ -24,7 +24,7 @@ type CanTransferDecorator struct {
 func (ctd CanTransferDecorator) AnteHandle(
 	ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler,
 ) (sdk.Context, error) {
-	ethCfg := evm.EthereumConfig(ctd.EVMKeeper.EthChainID(ctx))
+	ethCfg := evm.EthereumConfig(ctd.EthChainID(ctx))
 	signer := gethcore.MakeSigner(
 		ethCfg,
 		big.NewInt(ctx.BlockHeight()),
@@ -40,7 +40,7 @@ func (ctd CanTransferDecorator) AnteHandle(
 			)
 		}
 
-		baseFeeWeiPerGas := evm.NativeToWei(ctd.EVMKeeper.BaseFeeMicronibiPerGas(ctx))
+		baseFeeWeiPerGas := evm.NativeToWei(ctd.BaseFeeMicronibiPerGas(ctx))
 
 		evmMsg, err := msgEthTx.AsMessage(signer, baseFeeWeiPerGas)
 		if err != nil {

app/evmante/evmante_can_transfer_test.go

@@ -88,7 +88,7 @@ func (s *TestSuite) TestCanTransferDecorator() {
 		s.Run(tc.name, func() {
 			deps := evmtest.NewTestDeps()
 			stateDB := deps.NewStateDB()
-			anteDec := evmante.CanTransferDecorator{deps.App.AppKeepers.EvmKeeper}
+			anteDec := evmante.CanTransferDecorator{deps.App.EvmKeeper}
 			tx := tc.txSetup(&deps)
 
 			if tc.beforeTxSetup != nil {

app/evmante/evmante_emit_event_test.go

@@ -42,7 +42,7 @@ func (s *TestSuite) TestEthEmitEventDecorator() {
 		s.Run(tc.name, func() {
 			deps := evmtest.NewTestDeps()
 			stateDB := deps.NewStateDB()
-			anteDec := evmante.NewEthEmitEventDecorator(deps.App.AppKeepers.EvmKeeper)
+			anteDec := evmante.NewEthEmitEventDecorator(deps.App.EvmKeeper)
 
 			tx := tc.txSetup(&deps)
 			s.Require().NoError(stateDB.Commit())

app/evmante/evmante_gas_consume_test.go

@@ -61,7 +61,7 @@ func (s *TestSuite) TestAnteDecEthGasConsume() {
 			deps := evmtest.NewTestDeps()
 			stateDB := deps.NewStateDB()
 			anteDec := evmante.NewAnteDecEthGasConsume(
-				deps.App.AppKeepers.EvmKeeper, tc.maxGasWanted,
+				deps.App.EvmKeeper, tc.maxGasWanted,
 			)
 
 			tc.beforeTxSetup(&deps, stateDB)

app/evmante/evmante_mempool_fees_test.go

@@ -82,7 +82,7 @@ func (s *TestSuite) TestMempoolGasFeeDecorator() {
 	for _, tc := range testCases {
 		s.Run(tc.name, func() {
 			deps := evmtest.NewTestDeps()
-			anteDec := evmante.NewMempoolGasPriceDecorator(deps.App.AppKeepers.EvmKeeper)
+			anteDec := evmante.NewMempoolGasPriceDecorator(deps.App.EvmKeeper)
 
 			tx := tc.txSetup(&deps)