Merge v2.1.0-beta4 into Polygon

.github/CODEOWNERS

@@ -0,0 +1,33 @@
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+accounts/usbwallet/             @gballet
+accounts/scwallet/              @gballet
+accounts/abi/                   @gballet @MariusVanDerWijden
+beacon/engine/                  @MariusVanDerWijden @lightclient @fjl
+beacon/light/                   @zsfelfoldi
+beacon/merkle/                  @zsfelfoldi 
+beacon/types/                   @zsfelfoldi @fjl
+beacon/params/                  @zsfelfoldi @fjl
+cmd/evm/                        @MariusVanDerWijden @lightclient
+core/state/                     @rjl493456442
+crypto/                         @gballet @jwasinger @fjl
+core/                           @rjl493456442
+eth/                            @rjl493456442
+eth/catalyst/                   @MariusVanDerWijden @lightclient @fjl @jwasinger
+eth/tracers/                    @s1na
+ethclient/                      @fjl
+ethdb/                          @rjl493456442
+event/                          @fjl
+trie/                           @rjl493456442
+triedb/                         @rjl493456442
+core/tracing/                   @s1na
+graphql/                        @s1na
+internal/ethapi/                @fjl @s1na @lightclient
+internal/era/                   @lightclient
+miner/                          @MariusVanDerWijden @fjl @rjl493456442
+node/                           @fjl
+p2p/                            @fjl @zsfelfoldi
+rlp/                            @fjl
+params/                         @fjl @karalabe @gballet @rjl493456442 @zsfelfoldi
+rpc/                            @fjl

.github/workflows/amoy_deb_profiles.yml

@@ -384,7 +384,7 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ env.GIT_TAG }}
-          prerelease: true
+          make_latest: false
           files: |
             packaging/deb/bor-amoy-**.deb
             packaging/deb/bor-pbss-amoy-**.deb 

.github/workflows/ci.yml

@@ -110,7 +110,7 @@ jobs:
       - name: Test
         run: make test
 
-      - uses: actions/upload-artifact@v4.4.0
+      - uses: PaloAltoNetworks/upload-secure-artifact@main
         with:
           name: unitTest-coverage
           path: cover.out
@@ -161,7 +161,7 @@ jobs:
       - name: test-integration
         run: make test-integration
 
-      - uses: actions/upload-artifact@v4.4.0
+      - uses: PaloAltoNetworks/upload-secure-artifact@main
         with:
           name: integrationTest-coverage
           path: cover.out
@@ -275,13 +275,17 @@ jobs:
           echo "Starting RPC Tests..."
           timeout 5m bash bor/integration-tests/rpc_test.sh
 
+      - name: Resolve absolute path for logs
+        id: pathfix
+        run: |
+          echo "ABS_LOG_PATH=$(realpath matic-cli/devnet/logs)" >> $GITHUB_ENV
+
       - name: Upload logs
         if: always()
-        uses: actions/upload-artifact@v4.4.0
+        uses: PaloAltoNetworks/upload-secure-artifact@main
         with:
           name: logs_${{ github.run_id }}
-          path: |
-            matic-cli/devnet/logs
+          path: ${{ env.ABS_LOG_PATH }}
 
       - name: Package code and chain data
         if: always()
@@ -292,11 +296,11 @@ jobs:
           mkdir -p ${{ github.run_id }}/matic-cli
           sudo mv bor ${{ github.run_id }}
           sudo mv matic-cli/devnet ${{ github.run_id }}/matic-cli
-          sudo tar czf code.tar.gz ${{ github.run_id }}
+          sudo tar --warning=no-file-changed --exclude='.git' -czf code.tar.gz ${{ github.run_id }}
 
       - name: Upload code and chain data
         if: always()
-        uses: actions/upload-artifact@v4.4.0
+        uses: PaloAltoNetworks/upload-secure-artifact@main
         with:
           name: code_${{ github.run_id }}
           path: code.tar.gz

.github/workflows/go.yml

@@ -0,0 +1,48 @@
+name: i386 linux tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: self-hosted
+    steps:
+    - uses: actions/checkout@v4
+
+    # Cache build tools to avoid downloading them each time
+    - uses: actions/cache@v4
+      with:
+        path: build/cache
+        key: ${{ runner.os }}-build-tools-cache-${{ hashFiles('build/checksums.txt') }}
+
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: 1.23.0
+        cache: false
+
+    - name: Run linters
+      run: |
+        go run build/ci.go lint
+        go run build/ci.go check_generate
+        go run build/ci.go check_baddeps
+
+  build:
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.24.0
+          cache: false
+      - name: Run tests
+        run: go test -short ./...
+        env:
+          GOOS: linux
+          GOARCH: 386

.github/workflows/mainnet_deb_profiles.yml

@@ -394,7 +394,7 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ env.GIT_TAG }}
-          prerelease: true
+          make_latest: false
           files: |
             packaging/deb/bor-mainnet-**.deb
             packaging/deb/bor-pbss-mainnet-**.deb

.github/workflows/packager_deb.yml

@@ -122,7 +122,7 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ env.GIT_TAG }}
-          prerelease: true
+          make_latest: false
           files: |
             packaging/deb/bor**.deb
             packaging/deb/bor**.deb.checksum

.github/workflows/sf-release.yml

@@ -0,0 +1,174 @@
+name: Build, push and release (if tag)
+
+on:
+  push:
+    tags:
+      - "*-v*"
+    branches:
+      - "firehose-fh3.0"
+      - "release/*"
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - platform: linux/amd64
+            platform_suffix: amd64
+            runner: ubuntu-22.04
+
+          - platform: linux/arm64
+            platform_suffix: arm64
+            runner: ubuntu-22.04-arm
+
+    runs-on: [ "${{ matrix.runner }}" ]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract version
+        id: extract-version
+        run: |
+          version="edge"
+          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            version=${GITHUB_REF#refs/tags/}
+          fi
+
+          echo "VERSION=${version}" >> "$GITHUB_OUTPUT"
+
+      - name: Generate docker tags/labels from github build context
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          # The second sha tag is defined to uniquely identify the image and the platform,
+          # we append extract version, either edge or <tag>, this is necessary to avoid a
+          # race condition when pushing a tag and its related branches. In this case, three
+          # build are launched, but only one, the tag, will get it's version set to the tag.
+          #
+          # What happened is that non-tag Docker built image like `3b14725-amd64` was
+          # overwriting the tag Docker image also labeled `3b14725-amd64`. The `push` action
+          # was then merging an image that didn't have the version labels correctly set.
+          #
+          # Our image more looks like `3b14725-edge-amd64` or `3b14725-geth-v1.15.10-fh3.0-amd64`
+          # which mean the `push` can now pick the correct image depending on the type of build.
+          tags: |
+            type=ref,event=tag,prefix=
+            type=sha,prefix=
+            type=sha,prefix=,suffix=-${{ steps.extract-version.outputs.VERSION }}-${{ matrix.platform_suffix }}
+            type=edge,branch=firehose-fh3.0,priority=1
+            type=edge,branch=release/*,priority=1
+          flavor: |
+            latest=${{ startsWith(github.ref, 'refs/tags/') && !contains(github.ref, 'beta') && !contains(github.ref, 'rc') }}
+            prefix=geth-,onlatest=true
+
+      - name: Build and push Docker image (${{ matrix.platform }})
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile.sf
+          platforms: ${{ matrix.platform }}
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          provenance: false
+          # FIXME: Switch to Firehose Ethereum!
+          build-args: |
+            FIREHOSE_CORE=18bb86f
+
+  push:
+    needs: build
+    runs-on: ubuntu-22.04
+
+    permissions:
+        contents: read
+        packages: write
+
+    steps:
+      - name: Docker login
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Generate docker tags/labels from github build context
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=tag,prefix=
+            type=sha,prefix=
+            type=edge,branch=firehose-fh3.0,priority=1
+            type=edge,branch=release/*,priority=1
+          flavor: |
+            latest=${{ startsWith(github.ref, 'refs/tags/') && !contains(github.ref, 'beta') && !contains(github.ref, 'rc') }}
+            prefix=geth-,onlatest=true
+          sep-tags: ","
+
+      - name: Extract image
+        id: image
+        run: |
+          version="edge"
+          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            version=${GITHUB_REF#refs/tags/}
+          fi
+
+          echo "ID=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_SHA::7}-${version}" >> "$GITHUB_OUTPUT"
+
+      - name: Create and push manifest images
+        uses: Noelware/docker-manifest-action@0.4.3
+        with:
+          inputs: "${{ steps.meta.outputs.tags }}"
+          images: "${{ steps.image.outputs.ID }}-amd64, ${{ steps.image.outputs.ID }}-arm64"
+          push: true
+
+  release:
+    if: startsWith(github.ref, 'refs/tags/')
+    needs: build
+    runs-on: ubuntu-22.04
+
+    permissions:
+        contents: write
+
+    steps:
+      - name: Extract image
+        id: image
+        run: |
+          version="edge"
+          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            version=${GITHUB_REF#refs/tags/}
+          fi
+
+          echo "ID=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${GITHUB_SHA::7}-${version}" >> "$GITHUB_OUTPUT"
+
+      - name: Extract assets
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          # The --platform are not really needed here, but it removes the warning
+          docker cp $(docker create --platform=linux/amd64 ${{ steps.image.outputs.ID }}-amd64):/usr/local/bin/geth ./geth_linux
+          docker cp $(docker create --platform=linux/arm64 ${{ steps.image.outputs.ID }}-arm64):/usr/local/bin/geth ./geth_linux_arm64
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        with:
+          prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'rc') }}
+          files: |
+            ./geth_linux
+            ./geth_linux_arm64

.gitignore

@@ -4,16 +4,11 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile ~/.gitignore_global
 
-/tmp
 */**/*un~
 */**/*.test
 *un~
 .DS_Store
 */**/.DS_Store
-.ethtest
-*/**/*tx_database*
-*/**/*dapps*
-build/_vendor/pkg
 
 cover.out
 
@@ -44,27 +39,22 @@ profile.cov
 
 # IdeaIDE
 .idea
+*.iml
 
 # VS Code
 .vscode
 
-# dashboard
-/dashboard/assets/flow-typed
-/dashboard/assets/node_modules
-/dashboard/assets/stats.json
-/dashboard/assets/bundle.js
-/dashboard/assets/bundle.js.map
-/dashboard/assets/package-lock.json
-
-**/yarn-error.log
-./test
-./bor-debug-*
-
-dist
-
-.dccache
-
-*.csv
-logs/
-
 tests/spec-tests/
+
+# binaries
+cmd/abidump/abidump
+cmd/abigen/abigen
+cmd/blsync/blsync
+cmd/clef/clef
+cmd/devp2p/devp2p
+cmd/era/era
+cmd/ethkey/ethkey
+cmd/evm/evm
+cmd/geth/geth
+cmd/rlpdump/rlpdump
+cmd/workload/workload