[DO NOT MERGE] 2.61 vs 2.60

.github/workflows/qa-rpc-integration-tests.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Checkout RPC Tests Repository & Install Requirements
         run: |
           rm -rf ${{ runner.workspace }}/rpc-tests
-          git -c advice.detachedHead=false clone --depth 1 --branch v0.52.0 https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests
+          git -c advice.detachedHead=false clone --depth 1 --branch erigon_v2.6x https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests
           cd ${{ runner.workspace }}/rpc-tests
           pip3 install -r requirements.txt
 

.github/workflows/qa-tip-tracking-gnosis.yml

@@ -122,4 +122,4 @@ jobs:
       if: steps.test_step.outputs.TEST_RESULT != 'success'
       run: |
         echo "::error::Error detected during tests"
-        exit 1
+        exit 1

.github/workflows/release.yml

@@ -1,9 +1,10 @@
 name: Release
+run-name: Build release ${{ inputs.release_version }} from branch ${{ inputs.checkout_ref }} by @${{ github.actor }}
 
 env:
   APPLICATION: "erigon"
   BUILDER_IMAGE: "golang:1.22-bookworm"
-  DOCKER_BASE_IMAGE: "debian:12.7-slim"
+  DOCKER_BASE_IMAGE: "debian:12.8-slim"
   APP_REPO: "erigontech/erigon"
   PACKAGE: "github.com/erigontech/erigon"
   DOCKERHUB_REPOSITORY: "erigontech/erigon"
@@ -43,22 +44,26 @@ jobs:
     name: Build Artifacts and multi-platform Docker image, publish draft of the Release Notes
 
     steps:
-      - name: Checkout git repository ${{ env.APP_REPO }}
+      - name: Checkout git repository ${{ env.APP_REPO }} reference ${{ inputs.checkout_ref }}
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 ## 4.1.7 release
         with:
           repository: ${{ env.APP_REPO }}
           fetch-depth: 0
           ref: ${{ inputs.checkout_ref }}
           path: 'erigon'
 
-      - name: Check if tag ${{ inputs.release_version }} already exists in case perform_release is set.
+      - name: Check if tag ${{ inputs.release_version }} already exists and create it in case perform_release is set.
         if: ${{ (inputs.perform_release) && (inputs.release_version != '') }}
         run: |
+          cd erigon
           if git ls-remote --exit-code --quiet --tags origin '${{ inputs.release_version }}'; then
             echo "ERROR: tag ${{ inputs.release_version }} exists and workflow is performing release. Exit."
             exit 1
           else
             echo "OK: tag ${{ inputs.release_version }} does not exists. Proceeding."
+            git tag ${{ inputs.release_version }}
+            git push origin ${{ inputs.release_version }}
+            echo; echo "Git TAG ${{ inputs.release_version }} created and pushed."
           fi
 
       - name: Run some commands, get commit id
@@ -230,3 +235,26 @@ jobs:
             --notes "**Improvements:**<br>- ...coming soon <br><br>**Bugfixes:**<br><br>- ...coming soon<br><br>**Docker images:**<br><br>Docker image released:<br> ${{ env.DOCKER_TAGS }}<br><br>... coming soon<br>" \
              ${{ inputs.release_version }} \
              *.tar.gz ${{ env.APPLICATION }}_${{ inputs.release_version }}_checksums.txt
+
+  In-case-of-failure:
+    name: "In case of failure: remove remote git tag pointing to the new version."
+    needs: [ build-release ]
+    if: always() && !contains(needs.build-release.result, 'success')
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout git repository ${{ env.APP_REPO }} reference ${{ inputs.checkout_ref }}
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 ## 4.1.7 release
+        with:
+          repository: ${{ env.APP_REPO }}
+          fetch-depth: 0
+          ref: ${{ inputs.checkout_ref }}
+          path: 'erigon'
+
+      - name: Rollback - remove git tag ${{ inputs.release_version }}
+        if: ${{ (inputs.perform_release) && (inputs.release_version != '') }}
+        run: |
+          cd erigon
+          git push -d origin ${{ inputs.release_version }}
+
+

.github/workflows/test-hive-eest.yml

@@ -0,0 +1,81 @@
+name: Hive EEST tests
+
+on:
+  push:
+    branches:
+        - release/*
+        - pectra_e2
+  workflow_dispatch:
+
+jobs:
+  test-hive-eest:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Hive
+        uses: actions/checkout@v4
+        with:
+          repository: danceratopz/hive
+          ref: prague-devnet-4
+          path: hive
+      - name: Setup go env and cache
+        uses: actions/setup-go@v5
+        with:
+          go-version: '>=1.22'
+          go-version-file: 'hive/go.mod'
+
+      # Targetting the clients/erigon/Dockerfile.git in the Hive director - 
+      # this builds the container from github and uses it for tests
+      - name: Get dependencies and build hive
+        run: |
+          cd hive
+          git status
+          go get . >> buildlogs.log
+          rm clients/erigon/Dockerfile
+          mv clients/erigon/Dockerfile.git clients/erigon/Dockerfile
+          branch_name=$(echo ${GITHUB_REF#refs/heads/}  | sed 's/[&/\]/\\&/g')
+          echo Building Hive with Erigon branch - $branch_name
+          sed -i "s/^ARG github=ledgerwatch\/erigon$/ARG github=erigontech\/erigon/" clients/erigon/Dockerfile
+          sed -i "s/^ARG tag=main$/ARG tag=${branch_name}/" clients/erigon/Dockerfile
+          if [[ "$branch_name" != "main" ]]; then
+            sed -i "/$sync.parallel-state-flushing/d" clients/erigon/erigon.sh
+          fi
+          go build . >> buildlogs.log
+      # Depends on the last line of hive output that prints the number of suites, tests and failed
+      # Currently, we fail even if suites and tests are too few, indicating the tests did not run
+      # We also fail if more than half the tests fail
+      - name: Run hive tests and parse output
+        run: |
+          cd hive
+          run_suite() {
+            echo -e "\n\n============================================================"
+            echo "Running test: ${1}"
+            echo -e "\n"
+            ./hive --sim 'ethereum/eest/consume-engine' --client erigon 2>&1 | tee output.log || {
+              if [ $? -gt 0 ]; then
+                echo "Exitcode gt 0"
+              fi
+            }
+            status_line=$(tail -2 output.log | head -1 | sed -r "s/\x1B\[[0-9;]*[a-zA-Z]//g")
+            suites=$(echo "$status_line" | sed -n 's/.*suites=\([0-9]*\).*/\1/p')
+            if [ -z "$suites" ]; then
+              status_line=$(tail -1 output.log | sed -r "s/\x1B\[[0-9;]*[a-zA-Z]//g")
+              suites=$(echo "$status_line" | sed -n 's/.*suites=\([0-9]*\).*/\1/p')
+            fi 
+            tests=$(echo "$status_line" | sed -n 's/.*tests=\([0-9]*\).*/\1/p')
+            failed=$(echo "$status_line" | sed -n 's/.*failed=\([0-9]*\).*/\1/p')
+
+            echo -e "\n"
+            echo "-----------   Results for ${1}    -----------" 
+            echo "Tests: $tests, Failed: $failed"
+            echo -e "\n\n============================================================"
+
+            if (( tests < 4 )); then
+              echo "Too few tests run for suite ${1} - ${tests} tests"
+              exit 1
+            fi
+            if (( failed*2 > tests )); then
+              echo "Too many failures for suite ${1} - ${failed} failed out of ${tests}"
+              exit 1
+            fi
+          }
+          run_suite eest/consume-engine

.github/workflows/test-hive.yml

@@ -0,0 +1,87 @@
+name: Test Hive
+
+on:
+  push:
+    branches:
+        - release/*
+        - pectra_e2
+  schedule:
+    - cron: "0 05 * * *" # daily at 5 am UTC
+  workflow_dispatch:
+
+
+jobs:
+  test-hive:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Hive
+        uses: actions/checkout@v4
+        with:
+          repository: ethereum/hive
+          # ref: master
+          path: hive
+      - name: Setup go env and cache
+        uses: actions/setup-go@v5
+        with:
+          go-version: '>=1.22'
+          go-version-file: 'hive/go.mod'
+
+      # Targetting the clients/erigon/Dockerfile.git in the Hive director - 
+      # this builds the container from github and uses it for tests
+      - name: Get dependencies and build hive
+        run: |
+          cd hive
+          go get . >> buildlogs.log
+          rm clients/erigon/Dockerfile
+          mv clients/erigon/Dockerfile.git clients/erigon/Dockerfile
+          branch_name=$(echo ${GITHUB_REF#refs/heads/}  | sed 's/[&/\]/\\&/g')
+          echo Building Hive with Erigon branch - $branch_name
+          sed -i "s/^ARG tag=main$/ARG tag=${branch_name}/" clients/erigon/Dockerfile
+          if [[ "$branch_name" != "main" ]]; then
+            sed -i "/$sync.parallel-state-flushing/d" clients/erigon/erigon.sh
+          fi
+          go build . >> buildlogs.log
+      # Depends on the last line of hive output that prints the number of suites, tests and failed
+      # Currently, we fail even if suites and tests are too few, indicating the tests did not run
+      # We also fail if more than half the tests fail
+      - name: Run hive tests and parse output
+        run: |
+          cd hive
+          run_suite() {
+            echo -e "\n\n============================================================"
+            echo "Running test: ${1}-${2}"
+            echo -e "\n"
+            ./hive --sim ethereum/"${1}" --sim.limit="${2}" --client erigon 2>&1 | tee output.log || {
+              if [ $? -gt 0 ]; then
+                echo "Exitcode gt 0"
+              fi
+            }
+            status_line=$(tail -2 output.log | head -1 | sed -r "s/\x1B\[[0-9;]*[a-zA-Z]//g")
+            suites=$(echo "$status_line" | sed -n 's/.*suites=\([0-9]*\).*/\1/p')
+            if [ -z "$suites" ]; then
+              status_line=$(tail -1 output.log | sed -r "s/\x1B\[[0-9;]*[a-zA-Z]//g")
+              suites=$(echo "$status_line" | sed -n 's/.*suites=\([0-9]*\).*/\1/p')
+            fi 
+            tests=$(echo "$status_line" | sed -n 's/.*tests=\([0-9]*\).*/\1/p')
+            failed=$(echo "$status_line" | sed -n 's/.*failed=\([0-9]*\).*/\1/p')
+
+            echo -e "\n"
+            echo "-----------   Results for ${1}-${2}    -----------" 
+            echo "Tests: $tests, Failed: $failed"
+            echo -e "\n\n============================================================"
+
+            if (( tests < 4 )); then
+              echo "Too few tests run for suite ${1}-${2} - ${tests} tests"
+              exit 1
+            fi
+            if (( failed*2 > tests )); then
+              echo "Too many failures for suite ${1}-${2} - ${failed} failed out of ${tests}"
+              exit 1
+            fi
+          }
+          run_suite engine exchange-capabilities 
+          run_suite engine withdrawals
+          run_suite engine cancun
+          run_suite engine api
+          run_suite engine auth
+          run_suite rpc compat

ChangeLog.md

@@ -1,12 +1,18 @@
 ChangeLog
 
-## v2.60.10 (in development)
+## v2.60.10
 
-### TODO
-
-Acknowledgements:
-
-New features:
-
-Fixes:
+**Bugfixes:**
 
+- Trace API: commit state changes from InitializeBlockExecution @yperbasis in [#12559](https://github.com/erigontech/erigon/pull/12559).
+Prior to this PR in `callManyTransactions` (invoked by `trace_block`)
+changes made by `InitializeBlockExecution` were discarded. That was immaterial before since no much was
+happening at the beginning of a block. But that changed in Dencun with
+[EIP-4788](https://eips.ethereum.org/EIPS/eip-4788).
+Fixes Issues 
+[#11871](https://github.com/erigontech/erigon/issues/11871),
+[#12092](https://github.com/erigontech/erigon/issues/12092),
+[#12242](https://github.com/erigontech/erigon/issues/12242),
+[#12432](https://github.com/erigontech/erigon/issues/12432),
+[#12473](https://github.com/erigontech/erigon/issues/12473),
+and [#12525](https://github.com/erigontech/erigon/issues/12525).

Dockerfile

@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1.2
-FROM docker.io/library/golang:1.21-alpine3.17 AS builder
+FROM docker.io/library/golang:1.22-alpine3.19 AS builder
 
 RUN apk --no-cache add build-base linux-headers git bash ca-certificates libstdc++
 
@@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/root/.cache \
     make BUILD_TAGS=nosqlite,noboltdb,nosilkworm all
 
 
-FROM docker.io/library/golang:1.21-alpine3.17 AS tools-builder
+FROM docker.io/library/golang:1.22-alpine3.19 AS tools-builder
 RUN apk --no-cache add build-base linux-headers git bash ca-certificates libstdc++
 WORKDIR /app
 
@@ -36,7 +36,7 @@ RUN --mount=type=cache,target=/root/.cache \
     --mount=type=cache,target=/go/pkg/mod \
     make db-tools
 
-FROM docker.io/library/alpine:3.17
+FROM docker.io/library/alpine:3.19
 
 # install required runtime libs, along with some helpers for debugging
 RUN apk add --no-cache ca-certificates libstdc++ tzdata

Makefile

@@ -6,7 +6,7 @@ DOCKER := $(shell command -v docker 2> /dev/null)
 
 GIT_COMMIT ?= $(shell git rev-list -1 HEAD)
 GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
-GIT_TAG    ?= $(shell git describe --tags '--match=v*' --dirty)
+GIT_TAG    ?= $(shell git describe --tags '--match=*.*.*' --abbrev=7 --dirty)
 ERIGON_USER ?= erigon
 # if using volume-mounting data dir, then must exist on host OS
 DOCKER_UID ?= $(shell id -u)
@@ -175,6 +175,18 @@ test-integration: test-erigon-lib
 test3-integration: test-erigon-lib
 	$(GOTEST) --timeout 240m -tags $(BUILD_TAGS),integration,e3
 
+## test-hive						run the hive tests locally off nektos/act workflows simulator
+test-hive:	
+	@if ! command -v act >/dev/null 2>&1; then \
+		echo "act command not found in PATH, please source it in PATH. If nektosact is not installed, install it by visiting https://nektosact.com/installation/index.html"; \
+	elif [ -z "$(GITHUB_TOKEN)"]; then \
+		echo "Please export GITHUB_TOKEN var in the environment" ; \
+	elif [ "$(SUITE)" = "eest" ]; then \
+		act -j test-hive-eest -s GITHUB_TOKEN=$(GITHUB_TOKEN) ; \
+	else \
+		act -j test-hive -s GITHUB_TOKEN=$(GITHUB_TOKEN) ; \
+	fi
+
 ## lint-deps:                         install lint dependencies
 lint-deps:
 	@cd erigon-lib && $(MAKE) lint-deps