[DO NOT MERGE] 2.61 vs 2.60

.buildkite/pipeline.yml

@@ -1,6 +1,6 @@
 ---
 steps:
-  - command: './nightly.sh'
-    label: 'build & run geth'
+  - 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

@@ -1,40 +1,40 @@
 # Contributing
 
-Thank you for considering to help out with the source code! We welcome 
-contributions from anyone on the internet, and are grateful for even the 
+Thank you for considering to help out with the source code! We welcome
+contributions from anyone on the internet, and are grateful for even the
 smallest of fixes!
 
-If you'd like to contribute to Erigon, please fork, fix, commit and send a 
+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 
-ensure those changes are in line with the general philosophy of the project 
+you wish to submit more complex changes though, please check up with the core
+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.
 
 ## Coding guidelines
 
 Please make sure your contributions adhere to our coding guidelines:
 
- * Code must adhere to the official Go 
-[formatting](https://golang.org/doc/effective_go.html#formatting) 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.
- * Commit messages should be prefixed with the package(s) they modify.
-   * E.g. "eth, rpc: make trace configs optional"
+- Code must adhere to the official Go
+  [formatting](https://golang.org/doc/effective_go.html#formatting) 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.
+- Commit messages should be prefixed with the package(s) they modify.
+  - E.g. "eth, rpc: make trace configs optional"
 
 ## Can I have feature X
 
-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
+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/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

@@ -1,9 +1,9 @@
 ---
 name: Ask a question
 about: Something is unclear
-title: ''
-labels: 'type:docs'
-assignees: ''
+title: ""
+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/docker-tags.yml

@@ -3,7 +3,7 @@ name: Docker tags
 on:
   push:
     tags:
-      - 'y*.*.*'
+      - "y*.*.*"
   workflow_dispatch:
 
 jobs:
@@ -33,9 +33,9 @@ jobs:
           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/kurtosis/pectra.io

@@ -0,0 +1,23 @@
+participants_matrix:
+  el:
+    - el_type: erigon
+      el_image: test/erigon:current
+  cl:
+    - cl_type: lighthouse
+      cl_image: ethpandaops/lighthouse:pawan-electra-alpha7-0dd215c
+    - cl_type: teku
+      cl_image: ethpandaops/teku:mekong
+network_params:
+  electra_fork_epoch: 1
+  min_validator_withdrawability_delay: 1
+  shard_committee_period: 1
+  churn_limit_quotient: 16
+additional_services:
+  - assertoor
+snooper_enabled: true
+assertoor_params:
+  run_stability_check: false
+  run_block_proposal_check: true
+  tests:
+    - { file: "https://raw.githubusercontent.com/ethpandaops/assertoor/refs/heads/electra-support/playbooks/pectra-dev/kurtosis/all.yaml"}
+

.github/workflows/kurtosis/regular-assertoor.io

@@ -0,0 +1,27 @@
+participants_matrix:
+  el:
+    - el_type: erigon
+      el_image: test/erigon:current
+  cl:
+    - cl_type: lighthouse
+      cl_image: sigp/lighthouse:v6.0.0
+    - cl_type: nimbus
+      cl_image: statusim/nimbus-eth2:multiarch-v24.11.0
+network_params:
+  #electra_fork_epoch: 1
+  min_validator_withdrawability_delay: 1
+  shard_committee_period: 1
+additional_services:
+  - assertoor
+assertoor_params:
+  run_stability_check: false
+  run_block_proposal_check: true
+  tests:
+    - https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/all-opcodes-test.yaml
+    - https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/blob-transactions-test.yaml
+    - https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/dencun-opcodes-test.yaml
+    - https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/eoa-transactions-test.yaml
+    - https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/synchronized-check.yaml
+    - https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/validator-exit-test.yaml
+    - https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/block-proposal-check.yaml
+    - https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/stability-check.yaml

.github/workflows/qa-clean-exit-block-downloading.yml

@@ -38,17 +38,17 @@ jobs:
       run: |
         python3 $ERIGON_QA_PATH/test_system/db-producer/pause_production.py || true
 
-    - name: Restore Erigon Testbed Data Directory
-      run: |
-        rsync -a --delete $ERIGON_REFERENCE_DATA_DIR/ $ERIGON_TESTBED_DATA_DIR/
+    #- name: Restore Erigon Testbed Data Directory
+    #  run: |
+    #    rsync -a --delete $ERIGON_REFERENCE_DATA_DIR/ $ERIGON_TESTBED_DATA_DIR/
 
     - name: Run Erigon, send ctrl-c and check for clean exiting
       id: test_step
       run: |
         set +e # Disable exit on error
 
         # Run Erigon, send ctrl-c and check logs
-        python3 $ERIGON_QA_PATH/test_system/qa-tests/clean-exit/run_and_check_clean_exit.py ${{ github.workspace }}/build/bin $ERIGON_TESTBED_DATA_DIR $WORKING_TIME_SECONDS Erigon2
+        python3 $ERIGON_QA_PATH/test_system/qa-tests/clean-exit/run_and_check_clean_exit.py ${{ github.workspace }}/build/bin $ERIGON_REFERENCE_DATA_DIR $WORKING_TIME_SECONDS Erigon2
 
         # Capture monitoring script exit status
         test_exit_status=$?
@@ -72,10 +72,10 @@ jobs:
           echo "TEST_RESULT=failure" >> "$GITHUB_OUTPUT"
         fi
 
-    - name: Delete Erigon Testbed Data Directory
-      if: always()
-      run: |
-        rm -rf $ERIGON_TESTBED_DATA_DIR
+    #- name: Delete Erigon Testbed Data Directory
+    #  if: always()
+    #  run: |
+    #    rm -rf $ERIGON_TESTBED_DATA_DIR
 
     - name: Resume the Erigon instance dedicated to db maintenance
       run: |

.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/qa-tip-tracking.yml

@@ -40,9 +40,9 @@ jobs:
       run: |
         python3 $ERIGON_QA_PATH/test_system/db-producer/pause_production.py || true
 
-    - name: Restore Erigon Testbed Data Directory
-      run: |
-        rsync -a --delete $ERIGON_REFERENCE_DATA_DIR/ $ERIGON_TESTBED_DATA_DIR/
+    #- name: Restore Erigon Testbed Data Directory
+    #  run: |
+    #    rsync -a --delete $ERIGON_REFERENCE_DATA_DIR/ $ERIGON_TESTBED_DATA_DIR/
 
     - name: Run Erigon, wait sync and check ability to maintain sync
       id: test_step
@@ -52,7 +52,7 @@ jobs:
         # 1. Launch the testbed Erigon instance
         # 2. Allow time for the Erigon to achieve synchronization
         # 3. Begin timing the duration that Erigon maintains synchronization
-        python3 $ERIGON_QA_PATH/test_system/qa-tests/tip-tracking/run_and_check_tip_tracking.py ${{ github.workspace }}/build/bin $ERIGON_TESTBED_DATA_DIR $TRACKING_TIME_SECONDS $TOTAL_TIME_SECONDS Erigon2 $CHAIN
+        python3 $ERIGON_QA_PATH/test_system/qa-tests/tip-tracking/run_and_check_tip_tracking.py ${{ github.workspace }}/build/bin $ERIGON_REFERENCE_DATA_DIR $TRACKING_TIME_SECONDS $TOTAL_TIME_SECONDS Erigon2 $CHAIN
 
         # Capture monitoring script exit status
         test_exit_status=$?
@@ -76,10 +76,10 @@ jobs:
           echo "TEST_RESULT=failure" >> "$GITHUB_OUTPUT"
         fi
 
-    - name: Delete Erigon Testbed Data Directory
-      if: always()
-      run: |
-        rm -rf $ERIGON_TESTBED_DATA_DIR
+    #- name: Delete Erigon Testbed Data Directory
+    #  if: always()
+    #  run: |
+    #    rm -rf $ERIGON_TESTBED_DATA_DIR
 
     - name: Resume the Erigon instance dedicated to db maintenance
       run: |

.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 }}
+
+