merge with devel & fixes after merge

.github/CONTRIBUTING.md

@@ -21,7 +21,7 @@ Please make sure your contributions adhere to our coding guidelines:
 (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)).
  * Code must be documented adhering to the official Go 
 [commentary](https://golang.org/doc/effective_go.html#commentary) guidelines.
- * Pull requests need to be based on and opened against the `devel` branch.
+ * Pull requests need to be based on and opened against the `main` branch.
  * Commit messages should be prefixed with the package(s) they modify.
    * E.g. "eth, rpc: make trace configs optional"
 

.github/workflows/check.yml

@@ -3,7 +3,7 @@ name: Check
 on:
   push:
     branches:
-      - devel
+      - main
   workflow_dispatch:
 
 jobs:

.github/workflows/ci.yml

@@ -2,13 +2,11 @@ name: CI
 on:
   push:
     branches:
-      - devel
-      - alpha
+      - main
       - 'release/**'
   pull_request:
     branches:
-      - devel
-      - alpha
+      - main
       - 'release/**'
     types:
       - opened
@@ -25,14 +23,19 @@ jobs:
     if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments
+        # list of os: https://github.com/actions/virtual-environments
+        os:
+          - ubuntu-22.04
+          - macos-13
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: Install dependencies on Linux
         if: runner.os == 'Linux'
         run: sudo apt update && sudo apt install build-essential
@@ -52,9 +55,9 @@ jobs:
 
       - name: Install golangci-lint
         if: runner.os == 'Linux'
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
-          version: v1.55.2
+          version: v1.57.2
           skip-build-cache: true
           args: --help
 
@@ -69,6 +72,14 @@ jobs:
       - name: Test
         run: make test
 
+      - name: SonarCloud
+        if: runner.os == 'Linux'
+        uses: SonarSource/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        continue-on-error: true
+
   tests-windows:
     if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
     strategy:
@@ -78,13 +89,13 @@ jobs:
 
     steps:
       - name: configure Pagefile
-        uses: al-cheb/configure-pagefile-action@v1.3
+        uses: al-cheb/configure-pagefile-action@v1.4
         with:
           minimum-size: 8GB
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
 
       - uses: actions/cache@v3
         with:
@@ -94,8 +105,8 @@ jobs:
           key: chocolatey-${{ matrix.os }}
       - name: Install dependencies
         run: |
-          choco upgrade mingw -y --no-progress --version 11.2.0.07112021
-          choco install cmake -y --no-progress --version 3.23.1
+          choco upgrade mingw -y --no-progress --version 13.2.0
+          choco install cmake -y --no-progress --version 3.27.8
 
       - name: Build
         run: .\wmake.ps1 all
@@ -107,12 +118,13 @@ jobs:
         run: cd erigon-lib && make test-no-fuzz
 
   docker-build-check:
-    # don't run this on devel - the PR must have run it to be merged and it misleads that this pushes the docker image
-    if: (${{ github.event_name == 'push' || !github.event.pull_request.draft }}) && ${{ github.ref != 'refs/heads/devel' }}
-    runs-on: ubuntu-20.04
+    # don't run this on main - the PR must have run it to be merged and it misleads that this pushes the docker image
+    if: (${{ github.event_name == 'push' || !github.event.pull_request.draft }}) && ${{ github.ref != 'refs/heads/main' }}
+    runs-on: ubuntu-22.04
+
     steps:
       - uses: AutoModality/action-clean@v1
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # fetch git tags for "git describe"
 
@@ -125,10 +137,10 @@ jobs:
 
 #  automated-tests:
 #    runs-on:
-#      ubuntu-20.04
+#      ubuntu-22.04
 #    if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
 #    steps:
-#      - uses: actions/checkout@v3
+#      - uses: actions/checkout@v4
 #
 #      - name: run automated testing
 #        run: BUILD_ERIGON=1 ./tests/automated-testing/run.sh

.github/workflows/docker-tags.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.github/workflows/hive-nightly.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: AutoModality/action-clean@v1
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # fetch git tags for "git describe"
 

.github/workflows/manifest.yml

@@ -0,0 +1,84 @@
+name: Manifest Check
+on:
+  push:
+    branches:
+      - main
+      - 'release/**'
+    paths:
+      - 'go.mod'
+  pull_request:
+    branches:
+      - main
+      - 'release/**'
+    paths:
+      - 'go.mod'
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+
+jobs:
+  check-snap-modifications:
+    runs-on: ubuntu-22.04
+    outputs:
+      modified: ${{ steps.check-modified.outputs.modified }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2 # Ensures we fetch enough history to compare
+
+      - name: Is ledgerwatch/erigon-snapshot updated in go.mod # if not, pipeline should exit beacuse grep exit code >0 when no match
+        run: |
+          git diff HEAD~1 HEAD -- go.mod | grep 'github.com/ledgerwatch/erigon-snapshot'
+
+#  ManifestCheck:
+#    needs: check-snap-modifications
+#    if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
+#    strategy:
+#      matrix:
+#        os:
+#          - ubuntu-22.04
+#    runs-on: ${{ matrix.os }}
+#
+#    steps:
+#      - uses: actions/checkout@v4
+#      - uses: actions/setup-go@v4
+#        with:
+#          go-version: '1.21'
+#      - name: Install dependencies on Linux
+#        if: runner.os == 'Linux'
+#        run: sudo apt update && sudo apt install build-essential
+#
+#      - name: Build
+#        run: make downloader
+#
+#      - name: mainnet webseeds
+#        run: |
+#          echo $ModModified
+#          ./build/bin/downloader manifest-verify --chain mainnet
+#
+#      - name: bor-mainnet webseeds
+#        run: |
+#          ./build/bin/downloader manifest-verify --chain bor-mainnet
+#
+#      - name: gnosis webseeds
+#        run: |
+#          ./build/bin/downloader manifest-verify --chain gnosis
+#
+#      - name: mumbai webseeds
+#        run: |
+#          ./build/bin/downloader manifest-verify --chain mumbai
+#
+#      - name: sepolia webseeds
+#        run: |
+#          ./build/bin/downloader manifest-verify --chain sepolia
+#
+#      - name: chiado webseeds
+#        run: |
+#          ./build/bin/downloader manifest-verify --chain chiado
+#
+#      - name: amoy webseeds
+#        run: |
+#          ./build/bin/downloader manifest-verify --chain amoy