Merge branch 'main' into alex/2803_best_2worlds

* main:
  chore: add stricter linting (#3132)
  feat(benchmarking): adding ERC20 benchmarking test (#3114)
  feat: ensure p2p DAHint within limits (#3128)

Author: alpe

.github/workflows/benchmark.yml

@@ -77,6 +77,29 @@ jobs:
           name: spamoor-benchmark-results
           path: test/e2e/benchmark/spamoor_bench.json
 
+  # TODO: wire up to publish results once additional tests are in place.
+  erc20-benchmark:
+    name: ERC20 Throughput Benchmark
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Set up Go
+        uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
+        with:
+          go-version-file: ./go.mod
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+      - name: Install just
+        uses: extractions/setup-just@v3
+      - name: Build binaries
+        run: just build-evm build-da
+      - name: Run ERC20 throughput test
+        run: |
+          cd test/e2e && go test -tags evm \
+            -run='^TestSpamoorSuite$/^TestERC20Throughput$' -v -timeout=15m \
+            ./benchmark/ --evm-binary=../../../build/evm
+
   # single job to push all results to gh-pages sequentially, avoiding race conditions
   publish-benchmarks:
     name: Publish Benchmark Results

.github/workflows/lint.yml

@@ -29,7 +29,7 @@ jobs:
       - uses: golangci/golangci-lint-action@v9.2.0
         with:
           version: latest
-          args: --timeout 10m
+          args: --timeout 10m ./...
           github-token: ${{ secrets.github_token }}
         if: env.GIT_DIFF
 

.golangci.yml

@@ -1,18 +1,57 @@
 version: "2"
 run:
   modules-download-mode: readonly
+  timeout: 10m
+  tests: true
   build-tags:
     - evm
     - e2e
     - docker
 linters:
   enable:
+    - asciicheck
+    - bidichk
+    - bodyclose
+    - contextcheck
+    - copyloopvar
+    - durationcheck
+    - errname
     - errorlint
+    - govet
+    - ineffassign
+    - makezero
     - gosec
     - misspell
+    - nilerr
+    - noctx
+    - prealloc
+    - predeclared
+    - reassign
     - revive
+    - rowserrcheck
+    - sqlclosecheck
+    - staticcheck
     - unconvert
+    - 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 +60,7 @@ linters:
         - name: package-comments
           disabled: true
         - name: duplicated-imports
-          severity: warning
+          severity: error
         - name: exported
           arguments:
             - disableStutteringCheck
@@ -32,10 +71,28 @@ linters:
       - common-false-positives
       - legacy
       - std-error-handling
+    rules:
+      - path: _test\.go
+        linters:
+          - prealloc
+          - noctx
     paths:
       - third_party$
       - builtin$
       - examples$
+  disable:
+    - containedctx
+    - errcheck
+    - gocritic
+    - nolintlint
+    - 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
 

CHANGELOG.md

@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Store pending blocks separately from executed blocks key. [#3073](https://github.com/evstack/ev-node/pull/3073)
 - Fixes issues with force inclusion verification on sync nodes. [#3057](https://github.com/evstack/ev-node/pull/3057)
 - Add flag to `local-da` to produce empty DA blocks (closer to the real system). [#3057](https://github.com/evstack/ev-node/pull/3057)
+- Validate P2P DA height hints against the latest known DA height to prevent malicious peers from triggering runaway catchup . [#3128](https://github.com/evstack/ev-node/pull/3128)
 
 ## v1.0.0-rc.4
 

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

@@ -381,7 +381,6 @@ func (e *Executor) executionLoop() {
 	} else {
 		delay = time.Until(currentState.LastBlockTime.Add(e.config.Node.BlockTime.Duration))
 	}
-
 	if delay > 0 {
 		e.logger.Info().Dur("delay", delay).Msg("waiting to start block production")
 		select {
@@ -591,7 +590,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")
@@ -617,12 +616,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")
@@ -637,7 +636,7 @@ func (e *Executor) ProduceBlock(ctx context.Context) error {
 
 	// For based sequencer, advance safe/finalized since it comes from DA.
 	if e.config.Node.BasedSequencer {
-		if err := e.exec.SetFinal(e.ctx, newHeight); err != nil {
+		if err := e.exec.SetFinal(ctx, newHeight); err != nil {
 			e.sendCriticalError(fmt.Errorf("failed to set final height in based sequencer mode: %w", err))
 			return fmt.Errorf("failed to set final height in based sequencer mode: %w", err)
 		}

block/internal/submitting/da_submitter.go

@@ -90,15 +90,15 @@ func (rs *retryState) Next(reason retryReason, pol retryPolicy) {
 }
 
 // clamp constrains a duration between min and max bounds
-func clamp(v, min, max time.Duration) time.Duration {
-	if min > max {
-		min, max = max, min
+func clamp(v, minTime, maxTime time.Duration) time.Duration {
+	if minTime > maxTime {
+		minTime, maxTime = maxTime, minTime
 	}
-	if v < min {
-		return min
+	if v < minTime {
+		return minTime
 	}
-	if v > max {
-		return max
+	if v > maxTime {
+		return maxTime
 	}
 	return v
 }

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{