Merge branch 'main' into som/blobhashcheckfail

.github/workflows/ci-cd-main-branch-docker-images.yml

@@ -3,7 +3,7 @@ run-name: "Commit id ${{ github.sha }}: CI-CD build and deploy docker images bas
 
 env:
   APPLICATION: "erigon"
-  BUILDER_IMAGE: "golang:1.23-alpine"
+  BUILDER_IMAGE: "golang:1.24-alpine"
   TARGET_BASE_IMAGE: "alpine:3.21"
   APP_REPO: "erigontech/erigon"
   CHECKOUT_REF: "main"

.github/workflows/ci.yml

@@ -20,6 +20,7 @@ concurrency:
   cancel-in-progress: ${{ !contains(fromJSON('[
       "refs/heads/release/2.60",
       "refs/heads/release/2.61",
+      "refs/heads/release/3.0",
       "refs/heads/main"
     ]'), github.ref) }}
 
@@ -41,10 +42,11 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
           cache: ${{ contains(fromJSON('[
             "refs/heads/release/2.60",
             "refs/heads/release/2.61",
+            "refs/heads/release/3.0",
             "refs/heads/main"
             ]'), github.ref) }}
 
@@ -91,10 +93,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
           cache: ${{ contains(fromJSON('[
             "refs/heads/release/2.60",
             "refs/heads/release/2.61",
+            "refs/heads/release/3.0",
             "refs/heads/main"
             ]'), github.ref) }}
 

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

@@ -0,0 +1,25 @@
+participants:
+- el_type: erigon
+  el_image: test/erigon:current
+  cl_type: lighthouse
+  count: 1
+- el_type: erigon
+  el_image: test/erigon:current
+  cl_type: lodestar
+  count: 1
+- el_type: erigon
+  el_image: test/erigon:current
+  cl_type: prysm
+  count: 1
+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
+  image: test/assertoor:current
+  tests:
+  - https://raw.githubusercontent.com/noku-team/assertoor/master/playbooks/dev/tx-pool-check.yaml

.github/workflows/lint.yml

@@ -26,13 +26,13 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.24'
 
       - name: Install golangci-lint
         if: runner.os == 'Linux'
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.63.4
+          version: v1.64.6
           skip-cache: true
 
       - name: Lint

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

@@ -34,7 +34,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 v1.46.0 https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests
+          git -c advice.detachedHead=false clone --depth 1 --branch v1.49.0 https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests
           cd ${{ runner.workspace }}/rpc-tests
           pip3 install -r requirements.txt
 

.github/workflows/qa-sync-from-scratch.yml

@@ -1,6 +1,9 @@
 name: QA - Sync from scratch
 
 on:
+  push:
+    branches:
+      - 'release/3.*'
   schedule:
     - cron: '0 0 * * 0'  # Run on Sunday at 00:00 AM UTC
   workflow_dispatch:     # Run manually

.github/workflows/qa-txpool-performance-test.yml

@@ -0,0 +1,47 @@
+name: QA - TxPool performance test
+
+on:
+  workflow_call:
+  workflow_dispatch:
+  # push:
+  #   branches:
+  #       - main
+  #       - release/*
+  #       - docker_pectra
+
+jobs:
+  assertoor_test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Fast checkout git repository
+        uses: actions/checkout@v4
+
+      - name: Docker build current branch
+        run: |
+          docker build -t test/erigon:current .
+
+      - name: Docker build noku-team/assertoor image
+        run: |
+          git clone https://github.com/noku-team/assertoor.git
+          cd assertoor
+          docker build -t test/assertoor:current .
+          cd ..
+
+      - name: Run regular Kurtosis + assertoor tests
+        uses: ethpandaops/kurtosis-assertoor-github-action@v1
+        with:
+            enclave_name: "kurtosis-run1-${{ github.run_id }}"
+            ethereum_package_args: ".github/workflows/kurtosis/txpool-assertoor.io"
+            kurtosis_extra_args: --verbosity detailed --cli-log-level trace
+            persistent_logs: "true"
+
+      # todo: save result on mongodb
+
+      # - name: Run Pectra Kurtosis + assertoor tests
+      #   uses: ethpandaops/kurtosis-assertoor-github-action@v1
+      #   with:
+      #       enclave_name: "kurtosis-run2-${{ github.run_id }}"
+      #       ethereum_package_args: ".github/workflows/kurtosis/pectra.io"
+      #       kurtosis_extra_args: --verbosity detailed --cli-log-level trace
+      #       persistent_logs: "true"

.github/workflows/test-erigon-is-library.yml

@@ -20,7 +20,7 @@ jobs:
       - run: git submodule update --init --recursive --force
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
       - name: Install dependencies on Linux
         if: runner.os == 'Linux'
         run: sudo apt update && sudo apt install build-essential

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

@@ -20,7 +20,7 @@ jobs:
       - name: Setup go env and cache
         uses: actions/setup-go@v5
         with:
-          go-version: '>=1.22'
+          go-version: '>=1.23'
           go-version-file: 'hive/go.mod'
 
       # Targetting the clients/erigon/Dockerfile.git in the Hive director - 

.github/workflows/test-hive.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Setup go env and cache
         uses: actions/setup-go@v5
         with:
-          go-version: '>=1.22'
+          go-version: '>=1.23'
           go-version-file: 'hive/go.mod'
 
       # Targetting the clients/erigon/Dockerfile.git in the Hive director - 

.github/workflows/test-integration-caplin.yml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
           cache: ${{ contains(fromJSON('[
             "refs/heads/release/2.60",
             "refs/heads/release/2.61",
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.23'
           cache: ${{ contains(fromJSON('[
             "refs/heads/release/2.60",
             "refs/heads/release/2.61",

ChangeLog.md

@@ -1,7 +1,64 @@
 ChangeLog
 ---------
 
-## v3.0.0-beta2 (in development)
+## v3.1.0 (in development)
+
+**Improvements:**
+
+TODO
+
+**Bugfixes:**
+
+TODO
+
+### TODO
+
+- milestones:
+https://github.com/erigontech/erigon/milestone/31
+
+
+## v3.0.0 (in development)
+
+
+### Milestone
+
+https://github.com/erigontech/erigon/milestone/30
+
+## v3.0.0-rc2
+
+**Bugfixes:**
+
+- Caplin: error on aggregation_bit merge by @domiwei in https://github.com/erigontech/erigon/pull/14063
+- Pectra: fix bad deposit contract deposit unmarshalling by @Giulio2002 in https://github.com/erigontech/erigon/pull/14068
+
+### Milestone
+
+https://github.com/erigontech/erigon/milestone/36
+
+## v3.0.0-rc1
+
+**Improvements:**
+
+- Schedule Pectra for Chiado by @yperbasis in https://github.com/erigontech/erigon/pull/13898
+- stagedsync: dbg option to log receipts on receipts hash mismatch (#13905) by @taratorio in https://github.com/erigontech/erigon/pull/13940
+- Introduces a new method for estimating transaction gas that targets the maximum gas a contract could use (#13913). Fixes eth_estimateGas for historical blocks (#13903) by @somnathb1 in https://github.com/erigontech/erigon/pull/13916
+
+**Bugfixes:**
+
+- rpcdaemon: Show state sync transactions in eth_getLogs (#13924) by @shohamc1 in https://github.com/erigontech/erigon/pull/13951
+- polygon/heimdall: fix snapshot store last entity to check in snapshots too (#13845) by @taratorio in https://github.com/erigontech/erigon/pull/13938
+- Implemented wait if heimdall is not synced to the chain (#13807) by @taratorio in https://github.com/erigontech/erigon/pull/13939
+
+**Known Problems:**
+
+- polygon: `eth_getLogs` if search by filters - doesn't return state-sync (state-sync events are not indexed yet). Without filter can see state-sync events. In `eth_getReceipts` also can see. [Will](https://github.com/erigontech/erigon/issues/14003) release fixed files in E3.1
+- polygon: `eth_getLogs` state-sync events have incorrect `index` field. [Will](https://github.com/erigontech/erigon/issues/14003) release fixed files in E3.1
+
+### Milestone
+
+https://github.com/erigontech/erigon/milestone/34
+
+## v3.0.0-beta2
 
 ### Breaking changes
 - Reverts Optimize gas by default in eth_createAccessList #8337  

Dockerfile

@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1.2
-FROM docker.io/library/golang:1.22-alpine3.19 AS builder
+FROM docker.io/library/golang:1.24.1-alpine3.20 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.22-alpine3.19 AS tools-builder
+FROM docker.io/library/golang:1.24.1-alpine3.20 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.19
+FROM docker.io/library/alpine:3.20
 
 # install required runtime libs, along with some helpers for debugging
 RUN apk add --no-cache ca-certificates libstdc++ tzdata

Dockerfile.debian

@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1.2
-FROM docker.io/library/golang:1.21-bullseye AS builder
+FROM docker.io/library/golang:1.24-bullseye AS builder
 
 RUN apt update
 RUN apt install -y build-essential git bash ca-certificates libstdc++6
@@ -17,7 +17,7 @@ RUN --mount=type=cache,target=/root/.cache \
     make all
 
 
-FROM docker.io/library/golang:1.21-alpine3.17 AS tools-builder
+FROM docker.io/library/golang:1.24-alpine3.20 AS tools-builder
 
 RUN apk --no-cache add build-base linux-headers git bash ca-certificates libstdc++
 WORKDIR /app

Dockerfile.release

@@ -1,5 +1,5 @@
 ARG RELEASE_DOCKER_BASE_IMAGE="debian:12.8-slim" \
-    CI_CD_MAIN_BUILDER_IMAGE="golang:1.22-bookworm" \
+    CI_CD_MAIN_BUILDER_IMAGE="golang:1.24-bookworm" \
     CI_CD_MAIN_TARGET_BASE_IMAGE="alpine:3" \
     UID_ERIGON=1000 \
     GID_ERIGON=1000 \

README.md

@@ -62,8 +62,6 @@ frontier.
     - [Windows](#windows)
 - [Getting in touch](#getting-in-touch)
     - [Erigon Discord Server](#erigon-discord-server)
-    - [Blog](#blog)
-    - [Twitter](#twitter)
     - [Reporting security issues/concerns](#reporting-security-issuesconcerns)
 - [Known issues](#known-issues)
     - [`htop` shows incorrect memory usage](#htop-shows-incorrect-memory-usage)
@@ -82,7 +80,7 @@ Set `--prune.mode` to "archive" if you need an archive node or to "minimal" if y
 System Requirements
 ===================
 
-RAM: >=32GB, [Golang >= 1.22](https://golang.org/doc/install); GCC 10+ or Clang; On Linux: kernel > v4. 64-bit
+RAM: >=32GB, [Golang >= 1.23](https://golang.org/doc/install); GCC 10+ or Clang; On Linux: kernel > v4. 64-bit
 architecture.
 
 - ArchiveNode Ethereum Mainnet: 2TB (April 2024). FullNode: 1.1TB (June 2024)
@@ -682,7 +680,7 @@ Windows users may run erigon in 3 possible ways:
   build on windows :
     * [Git](https://git-scm.com/downloads) for Windows must be installed. If you're cloning this repository is very
       likely you already have it
-    * [GO Programming Language](https://golang.org/dl/) must be installed. Minimum required version is 1.22
+    * [GO Programming Language](https://golang.org/dl/) must be installed. Minimum required version is 1.23
     * GNU CC Compiler at least version 13 (is highly suggested that you install `chocolatey` package manager - see
       following point)
     * If you need to build MDBX tools (i.e. `.\wmake.ps1 db-tools`)

accounts/abi/bind/backends/simulated.go

@@ -717,8 +717,8 @@ func (b *SimulatedBackend) callContract(_ context.Context, call ethereum.CallMsg
 	if call.FeeCap == nil {
 		call.FeeCap = uint256.NewInt(baseFeeUpperLimit)
 	}
-	if call.Tip == nil {
-		call.Tip = uint256.NewInt(baseFeeUpperLimit)
+	if call.TipCap == nil {
+		call.TipCap = uint256.NewInt(baseFeeUpperLimit)
 	}
 	if call.Gas == 0 {
 		call.Gas = 50000000
@@ -849,7 +849,7 @@ func (m callMsg) CheckNonce() bool                      { return false }
 func (m callMsg) To() *libcommon.Address                { return m.CallMsg.To }
 func (m callMsg) GasPrice() *uint256.Int                { return m.CallMsg.GasPrice }
 func (m callMsg) FeeCap() *uint256.Int                  { return m.CallMsg.FeeCap }
-func (m callMsg) Tip() *uint256.Int                     { return m.CallMsg.Tip }
+func (m callMsg) TipCap() *uint256.Int                  { return m.CallMsg.TipCap }
 func (m callMsg) Gas() uint64                           { return m.CallMsg.Gas }
 func (m callMsg) Value() *uint256.Int                   { return m.CallMsg.Value }
 func (m callMsg) Data() []byte                          { return m.CallMsg.Data }

cl/aggregation/pool_test.go

@@ -121,7 +121,7 @@ func (t *PoolTestSuite) TestAddAttestationElectra() {
 		CommitteeBits:   cBits1,
 	}
 	att2 := &solid.Attestation{
-		AggregationBits: solid.BitlistFromBytes([]byte{0b00001100}, 2048*64),
+		AggregationBits: solid.BitlistFromBytes([]byte{0b00001101}, 2048*64),
 		Data:            attData1,
 		Signature:       [96]byte{'d', 'e', 'f', 'g', 'h', 'i'},
 		CommitteeBits:   cBits2,