add stricterlinting

Author: tac0turtle

.github/workflows/lint.yml

@@ -28,8 +28,8 @@ jobs:
             go.sum
       - uses: golangci/golangci-lint-action@v9.2.0
         with:
-          version: latest
-          args: --timeout 10m
+          version: v2.10.1
+          args: --timeout 10m ./...
           github-token: ${{ secrets.github_token }}
         if: env.GIT_DIFF
 

.golangci.yml

@@ -1,18 +1,63 @@
 version: "2"
 run:
   modules-download-mode: readonly
+  timeout: 10m
+  tests: true
   build-tags:
     - evm
     - e2e
     - docker
 linters:
   enable:
+    - asciicheck
+    - bidichk
+    - bodyclose
+    - containedctx
+    - contextcheck
+    - copyloopvar
+    - durationcheck
+    - errname
+    - errcheck
     - errorlint
+    - gocritic
+    - govet
+    - ineffassign
+    - makezero
     - gosec
     - misspell
+    - nilerr
+    - noctx
+    - nolintlint
+    - prealloc
+    - predeclared
+    - reassign
     - revive
+    - rowserrcheck
+    - sqlclosecheck
+    - staticcheck
+    - testifylint
     - unconvert
+    - unparam
+    - unused
+    - usestdlibvars
+    - wastedassign
   settings:
+    errcheck:
+      check-type-assertions: true
+      check-blank: true
+    govet:
+      enable-all: true
+      disable:
+        - fieldalignment
+        - shadow
+    gocritic:
+      enabled-tags:
+        - diagnostic
+        - style
+        - performance
+      disabled-checks:
+        - hugeParam
+        - rangeValCopy
     gosec:
       excludes:
         - G115
@@ -21,7 +66,7 @@ linters:
         - name: package-comments
           disabled: true
         - name: duplicated-imports
-          severity: warning
+          severity: error
         - name: exported
           arguments:
             - disableStutteringCheck
@@ -36,6 +81,21 @@ linters:
       - third_party$
       - builtin$
       - examples$
+  disable:
+    - containedctx
+    - errcheck
+    - gocritic
+    - nolintlint
+    - prealloc
+    - predeclared
+    - testifylint
+    - thelper
+    - tparallel
+    - unparam
+    - wrapcheck
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0
 formatters:
   enable:
     - gci

.just/lint.just

@@ -2,7 +2,7 @@
 [group('lint')]
 lint: vet
     @echo "--> Running golangci-lint"
-    @golangci-lint run
+    @golangci-lint run ./...
     @echo "--> Running markdownlint"
     @markdownlint --config .markdownlint.yaml '**/*.md'
     @echo "--> Running hadolint"
@@ -18,7 +18,7 @@ lint: vet
 [group('lint')]
 lint-fix:
     @echo "--> Formatting go"
-    @golangci-lint run --fix
+    @golangci-lint run --fix ./...
     @echo "--> Formatting markdownlint"
     @markdownlint --config .markdownlint.yaml --ignore './changelog.md' '**/*.md' -f
 

block/internal/da/async_block_retriever_test.go

@@ -266,5 +266,6 @@ func TestBlockData_SerializationEmpty(t *testing.T) {
 	}
 
 	assert.Equal(t, uint64(100), decoded.Height)
+	assert.Equal(t, time.Unix(0, 0).UTC(), decoded.Timestamp)
 	assert.Equal(t, 0, len(decoded.Blobs))
 }

block/internal/executing/executor.go

@@ -583,7 +583,7 @@ func (e *Executor) ProduceBlock(ctx context.Context) error {
 			LastSubmittedDaHeaderHeight: e.cache.GetLastSubmittedHeaderHeight(),
 			LastSubmittedDaDataHeight:   e.cache.GetLastSubmittedDataHeight(),
 		}
-		if err := e.raftNode.Broadcast(e.ctx, raftState); err != nil {
+		if err := e.raftNode.Broadcast(ctx, raftState); err != nil {
 			return fmt.Errorf("failed to propose block to raft: %w", err)
 		}
 		e.logger.Debug().Uint64("height", newHeight).Msg("proposed block to raft")
@@ -609,12 +609,12 @@ func (e *Executor) ProduceBlock(ctx context.Context) error {
 	// IMPORTANT: Header MUST be broadcast before data — the P2P layer validates
 	// incoming data against the current and previous header, so out-of-order
 	// delivery would cause validation failures on peers.
-	if err := e.headerBroadcaster.WriteToStoreAndBroadcast(e.ctx, &types.P2PSignedHeader{
+	if err := e.headerBroadcaster.WriteToStoreAndBroadcast(ctx, &types.P2PSignedHeader{
 		SignedHeader: header,
 	}); err != nil {
 		e.logger.Error().Err(err).Msg("failed to broadcast header")
 	}
-	if err := e.dataBroadcaster.WriteToStoreAndBroadcast(e.ctx, &types.P2PData{
+	if err := e.dataBroadcaster.WriteToStoreAndBroadcast(ctx, &types.P2PData{
 		Data: data,
 	}); err != nil {
 		e.logger.Error().Err(err).Msg("failed to broadcast data")

block/internal/submitting/da_submitter_test.go

@@ -145,7 +145,6 @@ func TestDASubmitter_SubmitHeaders_Success(t *testing.T) {
 
 	// Create test signer
 	addr, pub, signer := createTestSigner(t)
-	gen.ProposerAddress = addr
 
 	// Create test headers
 	header1 := &types.SignedHeader{

block/internal/syncing/syncer.go

@@ -222,14 +222,14 @@ func (s *Syncer) Start(ctx context.Context) error {
 
 	s.fiRetriever = da.NewForcedInclusionRetriever(s.daClient, s.logger, s.config, s.genesis.DAStartHeight, s.genesis.DAEpochForcedInclusion)
 	s.p2pHandler = NewP2PHandler(s.headerStore, s.dataStore, s.cache, s.genesis, s.logger)
-	if currentHeight, err := s.store.Height(s.ctx); err != nil {
+	if currentHeight, err := s.store.Height(ctx); err != nil {
 		s.logger.Error().Err(err).Msg("failed to set initial processed height for p2p handler")
 	} else {
 		s.p2pHandler.SetProcessedHeight(currentHeight)
 	}
 
 	if s.raftRetriever != nil {
-		if err := s.raftRetriever.Start(s.ctx); err != nil {
+		if err := s.raftRetriever.Start(ctx); err != nil {
 			return fmt.Errorf("start raft retriever: %w", err)
 		}
 	}
@@ -242,7 +242,7 @@ func (s *Syncer) Start(ctx context.Context) error {
 	s.wg.Go(s.processLoop)
 
 	// Start dedicated workers for DA, and pending processing
-	s.startSyncWorkers()
+	s.startSyncWorkers(ctx)
 
 	s.logger.Info().Msg("syncer started")
 	return nil
@@ -389,11 +389,12 @@ func (s *Syncer) processLoop() {
 	}
 }
 
-func (s *Syncer) startSyncWorkers() {
+func (s *Syncer) startSyncWorkers(ctx context.Context) {
+	_ = ctx
 	s.wg.Add(3)
 	go s.daWorkerLoop()
 	go s.pendingWorkerLoop()
-	go s.p2pWorkerLoop()
+	go s.p2pWorkerLoop(ctx)
 }
 
 func (s *Syncer) daWorkerLoop() {
@@ -516,7 +517,7 @@ func (s *Syncer) pendingWorkerLoop() {
 	}
 }
 
-func (s *Syncer) p2pWorkerLoop() {
+func (s *Syncer) p2pWorkerLoop(ctx context.Context) {
 	defer s.wg.Done()
 
 	logger := s.logger.With().Str("worker", "p2p").Logger()
@@ -525,12 +526,12 @@ func (s *Syncer) p2pWorkerLoop() {
 
 	for {
 		select {
-		case <-s.ctx.Done():
+		case <-ctx.Done():
 			return
 		default:
 		}
 
-		currentHeight, err := s.store.Height(s.ctx)
+		currentHeight, err := s.store.Height(ctx)
 		if err != nil {
 			logger.Error().Err(err).Msg("failed to get current height for P2P worker")
 			if !s.sleepOrDone(50 * time.Millisecond) {
@@ -540,7 +541,7 @@ func (s *Syncer) p2pWorkerLoop() {
 		}
 
 		targetHeight := currentHeight + 1
-		waitCtx, cancel := context.WithCancel(s.ctx)
+		waitCtx, cancel := context.WithCancel(ctx)
 		s.setP2PWaitState(targetHeight, cancel)
 
 		err = s.p2pHandler.ProcessHeight(waitCtx, targetHeight, s.heightInCh)
@@ -876,7 +877,7 @@ func (s *Syncer) ValidateBlock(_ context.Context, currState types.State, data *t
 	// Set custom verifier for aggregator node signature
 	header.SetCustomVerifierForSyncNode(s.options.SyncNodeSignatureBytesProvider)
 
-	if err := header.ValidateBasicWithData(data); err != nil {
+	if err := header.ValidateBasicWithData(data); err != nil { //nolint:contextcheck // validation API does not accept context
 		return fmt.Errorf("invalid header: %w", err)
 	}
 
@@ -1308,10 +1309,7 @@ func (s *Syncer) RecoverFromRaft(ctx context.Context, raftState *raft.RaftBlockS
 			s.logger.Debug().Err(err).Msg("no state in store, using genesis defaults for recovery")
 			currentState = types.State{
 				ChainID:         s.genesis.ChainID,
-				InitialHeight:   s.genesis.InitialHeight,
 				LastBlockHeight: s.genesis.InitialHeight - 1,
-				LastBlockTime:   s.genesis.StartTime,
-				DAHeight:        s.genesis.DAStartHeight,
 			}
 		}
 	}

block/internal/syncing/syncer_backoff_test.go

@@ -121,7 +121,7 @@ func TestSyncer_BackoffOnDAError(t *testing.T) {
 				}
 
 				// Run sync loop
-				syncer.startSyncWorkers()
+				syncer.startSyncWorkers(context.Background())
 				<-ctx.Done()
 				syncer.wg.Wait()
 
@@ -223,7 +223,7 @@ func TestSyncer_BackoffResetOnSuccess(t *testing.T) {
 		go syncer.processLoop()
 
 		// Run workers
-		syncer.startSyncWorkers()
+		syncer.startSyncWorkers(context.Background())
 		<-ctx.Done()
 		syncer.wg.Wait()
 
@@ -294,7 +294,7 @@ func TestSyncer_BackoffBehaviorIntegration(t *testing.T) {
 			Return(nil, datypes.ErrBlobNotFound).Once()
 
 		go syncer.processLoop()
-		syncer.startSyncWorkers()
+		syncer.startSyncWorkers(context.Background())
 		<-ctx.Done()
 		syncer.wg.Wait()
 

block/internal/syncing/syncer_benchmark_test.go

@@ -44,7 +44,7 @@ func BenchmarkSyncerIO(b *testing.B) {
 
 				// run both loops
 				go fixt.s.processLoop()
-				fixt.s.startSyncWorkers()
+				fixt.s.startSyncWorkers(context.Background())
 
 				require.Eventually(b, func() bool {
 					processedHeight, _ := fixt.s.store.Height(b.Context())

block/internal/syncing/syncer_test.go

@@ -416,7 +416,7 @@ func TestSyncLoopPersistState(t *testing.T) {
 		Return(nil, datypes.ErrHeightFromFuture)
 
 	go syncerInst1.processLoop()
-	syncerInst1.startSyncWorkers()
+	syncerInst1.startSyncWorkers(context.Background())
 	syncerInst1.wg.Wait()
 	requireEmptyChan(t, errorCh)
 
@@ -479,7 +479,7 @@ func TestSyncLoopPersistState(t *testing.T) {
 
 	// when it starts, it should fetch from the last height it stopped at
 	t.Log("sync workers on instance2 started")
-	syncerInst2.startSyncWorkers()
+	syncerInst2.startSyncWorkers(context.Background())
 	syncerInst2.wg.Wait()
 
 	t.Log("sync workers exited")