Merge remote-tracking branch 'upstream/main' into devel

.buildkite/pipeline.yml

@@ -3,4 +3,4 @@ steps:
   - command: './nightly.sh'
     label: 'build & run geth'
     env:
-      BUILDKITE_GOLANG_IMPORT_PATH: "github.com/ledgerwatch/erigon"
+      BUILDKITE_GOLANG_IMPORT_PATH: "github.com/erigontech/erigon"

.github/CONTRIBUTING.md

@@ -7,7 +7,7 @@ smallest of fixes!
 If you'd like to contribute to Erigon, please fork, fix, commit and send a 
 pull request for the maintainers to review and merge into the main code base. If
 you wish to submit more complex changes though, please check up with the core 
-devs first on [Discord server](https://github.com/ledgerwatch/erigon#erigon-discord-server) to 
+devs first on [Discord server](https://github.com/erigontech/erigon#erigon-discord-server) to 
 ensure those changes are in line with the general philosophy of the project 
 and/or get some early feedback which can make both your efforts much lighter as
 well as our review and merge procedures quick and simple.
@@ -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"
 
@@ -30,11 +30,11 @@ Please make sure your contributions adhere to our coding guidelines:
 Before you submit a feature request, please check and make sure that it isn't 
 possible through some other means. The JavaScript-enabled console is a powerful 
 feature in the right hands. Please check our 
-[Wiki page](https://github.com/ledgerwatch/erigon/wiki) for more info
+[Wiki page](https://github.com/erigontech/erigon/wiki) for more info
 and help.
 
 ## Configuration, dependencies, and tests
 
-Please see the [Readme](https://github.com/ledgerwatch/erigon#readme) file
+Please see the [Readme](https://github.com/erigontech/erigon#readme) file
 for more details on configuring your environment, managing project dependencies
 and testing procedures.

.github/ISSUE_TEMPLATE/question.md

@@ -6,4 +6,4 @@ labels: 'type:docs'
 assignees: ''
 ---
 
-This should only be used in very rare cases e.g. if you are not 100% sure if something is a bug or asking a question that leads to improving the documentation. For general questions please use [Erigon's discord](https://github.com/ledgerwatch/erigon#erigon-discord-server).
+This should only be used in very rare cases e.g. if you are not 100% sure if something is a bug or asking a question that leads to improving the documentation. For general questions please use [Erigon's discord](https://github.com/erigontech/erigon#erigon-discord-server).

.github/workflows/check.yml

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

.github/workflows/ci.yml

@@ -2,19 +2,18 @@ name: CI
 on:
   push:
     branches:
-      - devel
-      - alpha
+      - main
       - 'release/**'
   pull_request:
     branches:
-      - devel
-      - alpha
+      - main
       - 'release/**'
     types:
       - opened
       - reopened
       - synchronize
       - ready_for_review
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.ref }}
@@ -28,14 +27,16 @@ jobs:
         # list of os: https://github.com/actions/virtual-environments
         os:
           - ubuntu-22.04
-          - macos-13
+          - macos-14
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
         with:
-          go-version: '1.20'
+          fetch-depth: 0
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
       - name: Install dependencies on Linux
         if: runner.os == 'Linux'
         run: sudo apt update && sudo apt install build-essential
@@ -55,23 +56,27 @@ jobs:
 
       - name: Install golangci-lint
         if: runner.os == 'Linux'
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.56.1
+          version: v1.59.1
           skip-build-cache: true
           args: --help
 
-      - name: Install go-licenses
-        if: runner.os == 'Linux'
-        run: cd erigon-lib && make lint-licenses-deps
-
       - name: Lint
         if: runner.os == 'Linux'
         run: make lint
 
       - 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:
@@ -81,15 +86,15 @@ 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/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             C:\ProgramData\chocolatey\lib\mingw
@@ -110,12 +115,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' }}
+    # 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"
 
@@ -131,7 +137,7 @@ jobs:
 #      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,31 +11,31 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: dockerhub-login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB }}
           password: ${{ secrets.DOCKERHUB_KEY }}
       - name: ghcr-login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-qemu-action@v3
 
       - run: |
           make release-dry-run
           docker images
         #          docker image push --all-tags thorax/erigon
-        #          docker image push --all-tags ghcr.io/ledgerwatch/erigon
+        #          docker image push --all-tags ghcr.io/erigontech/erigon
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VERSION: ${GITHUB_REF#refs/tags/}
           DOCKER_USERNAME: ${{ secrets.DOCKERHUB }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_KEY }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_KEY }}

.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"
 
@@ -38,8 +38,8 @@ jobs:
           done
 
       - name: parse hive results
-        uses: phoenix-actions/test-reporting@v10
+        uses: phoenix-actions/test-reporting@v15
         with:
           name: Tests
           path: results-${{ github.run_id }}/*.xml
-          reporter: java-junit
+          reporter: java-junit

.github/workflows/manifest.yml

@@ -0,0 +1,55 @@
+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
+  workflow_dispatch:
+
+jobs:
+  #  check-snap-modifications:
+  #    runs-on: ubuntu-24.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 erigontech/erigon-snapshot updated in go.mod # if not, pipeline should exit because grep exit code >0 when no match
+  #        run: |
+  #          git diff HEAD~1 HEAD -- go.mod | grep 'github.com/erigontech/erigon-snapshot'
+
+  ManifestCheck:
+    #    needs: check-snap-modifications
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-24.04
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.22'
+      - run: sudo apt update && sudo apt install build-essential
+      - run: make downloader
+      - run: echo $ModModified
+      - run: ./build/bin/downloader manifest-verify --chain mainnet
+      - run: ./build/bin/downloader manifest-verify --chain bor-mainnet
+      - run: ./build/bin/downloader manifest-verify --chain gnosis
+      - run: ./build/bin/downloader manifest-verify --chain chiado
+      - run: ./build/bin/downloader manifest-verify --chain sepolia
+      - run: ./build/bin/downloader manifest-verify --chain amoy