chore: merge upstream master

.github/workflows/beekeeper.yml

@@ -8,7 +8,7 @@ on:
       - "**"
 
 env:
-  K3S_VERSION: "v1.30.3+k3s1"
+  K3S_VERSION: "v1.31.10+k3s1"
   REPLICA: 3
   RUN_TYPE: "PR RUN"
   SETUP_CONTRACT_IMAGE: "ethersphere/bee-localchain"
@@ -33,18 +33,18 @@ jobs:
       msg: ${{ steps.commit.outputs.msg }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         if: github.event.action != 'beekeeper'
         with:
           fetch-depth: 0
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         if: github.event.action == 'beekeeper'
         with:
           fetch-depth: 0
           ref: ${{ github.event.client_payload.ref }}
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           cache: false
           go-version-file: go.mod
@@ -158,6 +158,9 @@ jobs:
       - name: Test manifest
         id: manifest
         run: timeout ${TIMEOUT} beekeeper check --cluster-name local-dns --checks=ci-manifest
+      - name: Test manifest v1
+        id: manifest-v1
+        run: timeout ${TIMEOUT} beekeeper check --cluster-name local-dns --checks=ci-manifest-v1
       - name: Test postage stamps
         id: postage-stamps
         run: timeout ${TIMEOUT} beekeeper check --cluster-name local-dns --checks ci-postage
@@ -173,6 +176,9 @@ jobs:
       - name: Test act
         id: act
         run: timeout ${TIMEOUT} bash -c 'until beekeeper check --cluster-name local-dns --checks ci-act; do echo "waiting for act..."; sleep .3; done'
+      - name: Test feeds v1
+        id: feeds-v1
+        run: timeout ${TIMEOUT} beekeeper check --cluster-name local-dns --checks=ci-feed-v1
       - name: Test feeds
         id: feeds
         run: timeout ${TIMEOUT} beekeeper check --cluster-name local-dns --checks=ci-feed
@@ -186,11 +192,18 @@ jobs:
           if ${{ steps.settlements.outcome=='failure' }}; then FAILED=settlements; fi
           if ${{ steps.pss.outcome=='failure' }}; then FAILED=pss; fi
           if ${{ steps.soc.outcome=='failure' }}; then FAILED=soc; fi
+          if ${{ steps.gsoc.outcome=='failure' }}; then FAILED=gsoc; fi
           if ${{ steps.pushsync-chunks-1.outcome=='failure' }}; then FAILED=pushsync-chunks-1; fi
           if ${{ steps.pushsync-chunks-2.outcome=='failure' }}; then FAILED=pushsync-chunks-2; fi
           if ${{ steps.retrieval.outcome=='failure' }}; then FAILED=retrieval; fi
           if ${{ steps.manifest.outcome=='failure' }}; then FAILED=manifest; fi
-          if ${{ steps.content-availability.outcome=='failure' }}; then FAILED=content-availability; fi
+          if ${{ steps.manifest-v1.outcome=='failure' }}; then FAILED=manifest-v1; fi
+          if ${{ steps.postage-stamps.outcome=='failure' }}; then FAILED=postage-stamps; fi
+          if ${{ steps.stake.outcome=='failure' }}; then FAILED=stake; fi
+          if ${{ steps.withdraw.outcome=='failure' }}; then FAILED=withdraw; fi
+          if ${{ steps.redundancy.outcome=='failure' }}; then FAILED=redundancy; fi
+          if ${{ steps.feeds.outcome=='failure' }}; then FAILED=feeds; fi
+          if ${{ steps.feeds-v1.outcome=='failure' }}; then FAILED=feeds-v1; fi
           if ${{ steps.act.outcome=='failure' }}; then FAILED=act; fi
           curl -sSf -X POST -H "Content-Type: application/json" -d "{\"text\": \"**${RUN_TYPE}** Beekeeper Error\nBranch: \`${{ github.head_ref }}\`\nUser: @${{ github.event.pull_request.user.login }}\nDebugging artifacts: [click](https://$BUCKET_NAME.$AWS_ENDPOINT/artifacts_$VERTAG.tar.gz)\nStep failed: \`${FAILED}\`\"}" https://beehive.ethswarm.org/hooks/${{ secrets.TUNSHELL_KEY }}
           echo "Failed test: ${FAILED}"

.github/workflows/codeql.yml

@@ -40,7 +40,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/docs.yaml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: '0'
     - name: Check whether docs have changed

.github/workflows/go.yml

@@ -21,12 +21,21 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     - name: Setup Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         cache: true
         go-version-file: go.mod
+    - name: Increase UDP buffer sizes (Ubuntu)
+      if: matrix.os == 'ubuntu-latest'
+      run: |
+        sudo sysctl -w net.core.rmem_max=7500000
+        sudo sysctl -w net.core.wmem_max=7500000
+    - name: Increase UDP buffer sizes (macOS)
+      if: matrix.os == 'macos-latest'
+      run: |
+        sudo sysctl -w kern.ipc.maxsockbuf=6291456
     - name: Build
       run: make build
     - name: Test with race detector (Ubuntu and MacOS)
@@ -41,9 +50,9 @@ jobs:
     continue-on-error: ${{ github.ref == 'refs/heads/master' }}
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     - name: Setup Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         cache: true
         go-version-file: go.mod
@@ -55,22 +64,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
     - name: Setup Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         cache: false
         go-version-file: go.mod
     - name: Commit linting
       if: github.ref != 'refs/heads/master'
       uses: wagoid/commitlint-github-action@v5
+      with:
+        configFile: commitlint.config.js
     - name: GolangCI-Lint
-      uses: golangci/golangci-lint-action@v6
+      uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8
       with:
         skip-cache: false
-        version: v1.64.5
+        version: v2.5.0
     - name: Whitespace check
       run: make check-whitespace
     - name: go mod tidy check
@@ -81,9 +92,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     - name: Setup Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         cache: false
         go-version-file: go.mod
@@ -97,7 +108,7 @@ jobs:
     - name: Test with code coverage
       run: make cover=1 test-ci
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         fail_ci_if_error: true
@@ -109,11 +120,11 @@ jobs:
     if: github.ref == 'refs/heads/master'
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
     - name: Setup Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         cache: false
         go-version-file: go.mod

.github/workflows/pr-title.yml

@@ -0,0 +1,23 @@
+name: PR Title Lint
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, edited]
+
+jobs:
+  lint-title:
+    name: Lint PR Title
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      - name: Install commitlint
+        run: npm install --save-dev @commitlint/cli @commitlint/config-conventional
+      - name: PR title linting
+        env:
+          PR_TITLE: ${{ github.event.pull_request.title }}
+        run: echo "$PR_TITLE" | npx commitlint --config ./commitlint.config.js

.github/workflows/release.yaml

@@ -12,21 +12,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version-file: go.mod
       - name: Docker Hub and Quay Login
         run: |
           printf ${{ secrets.DOCKERHUB_PASSWORD }} | docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
           printf ${{ secrets.QUAY_PASSWORD }} | docker login --username ${{ secrets.QUAY_USERNAME }} quay.io --password-stdin
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
       - name: Import GPG key
         run: |
           echo "$GPG_PRIVATE_KEY" | gpg --import --passphrase "$GPG_PASSPHRASE" --batch --allow-secret-key-import
@@ -37,7 +37,7 @@ jobs:
         run: |
           echo "BEE_API_VERSION=$(grep '^  version:' openapi/Swarm.yaml | awk '{print $2}')" >> $GITHUB_ENV
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v6
+        uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6
         with:
           version: '~> v2'
           args: release --clean --timeout 1h

.gitignore

@@ -2,6 +2,7 @@
 /.idea
 /.vscode
 /tmp
+/vendor
 
 # Compiled Object files, Static and Dynamic libs (Shared Objects)
 *.o

.golangci.yml

@@ -1,75 +1,82 @@
-run:
-  timeout: 10m
+version: "2"
 linters:
   enable:
     - asciicheck
     - bidichk
     - copyloopvar
     - dogsled
     - durationcheck
-    - errcheck
     - errname
     - errorlint
     - forbidigo
     - gochecknoinits
     - goconst
-    - gofmt
     - goheader
     - goprintffuncname
-    - gosimple
-    - govet
     - importas
-    - ineffassign
     - misspell
     - nilerr
     - noctx
     - paralleltest
     - prealloc
     - predeclared
     - promlinter
-    - staticcheck
     - thelper
-    - typecheck
     - unconvert
     - unused
-    # - depguard disable temporary until this issue is resolved: https://github.com/golangci/golangci-lint/issues/3906
-
-linters-settings:
-  govet:
-    enable-all: true
-    disable:
-      - fieldalignment ## temporally disabled
-      - shadow ## temporally disabled
-  goheader:
-    values:
-      regexp:
-        date: "20[1-2][0-9]"
-    template: |-
-      Copyright {{date}} The Swarm Authors. All rights reserved.
-      Use of this source code is governed by a BSD-style
-      license that can be found in the LICENSE file.
-  paralleltest:
-    # Ignore missing calls to `t.Parallel()` and only report incorrect uses of `t.Parallel()`.
-    ignore-missing: true
-issues:
-  exclude-rules:
-    - linters:
-        - goheader
-      text: "go-ethereum Authors" ## disable check for other authors
-    - path: _test\.go
-      linters:
-        - goconst ## temporally disable goconst in test
-    - linters:
-        - forbidigo
-      path: cmd/bee/cmd
-      text: "use of `fmt.Print" ## allow fmt.Print in cmd directory
-    - linters:
-        - dogsled
-      path: pkg/api/(.+)_test\.go # temporally disable dogsled in api test files
-    - linters:
-        - dogsled
-      path: pkg/pushsync/(.+)_test\.go # temporally disable dogsled in pushsync test files
-      # temporally disable paralleltest in following packages
-    - linters:
-        - paralleltest
-      path: pkg/log
+  settings:
+    goheader:
+      values:
+        regexp:
+          date: 20[1-2][0-9]
+      template: |-
+        Copyright {{date}} The Swarm Authors. All rights reserved.
+        Use of this source code is governed by a BSD-style
+        license that can be found in the LICENSE file.
+    govet:
+      disable:
+        - fieldalignment
+        - shadow
+      enable-all: true
+    paralleltest:
+      ignore-missing: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - goheader
+        text: go-ethereum Authors
+      - linters:
+          - goconst
+        path: _test\.go
+      - linters:
+          - forbidigo
+        path: cmd/bee/cmd
+        text: use of `fmt.Print
+      - linters:
+          - dogsled
+        path: pkg/api/(.+)_test\.go
+      - linters:
+          - dogsled
+        path: pkg/pushsync/(.+)_test\.go
+      - linters:
+          - paralleltest
+        path: pkg/log
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$