Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- uses: actions/checkout@v6
- uses: actions/setup-go@v6
with:
go-version: '1.24'
go-version: '1.25'
- run: make downloader
- run: echo $ModModified
- run: ./build/bin/downloader manifest-verify --chain mainnet --webseed 'https://erigon3-v1-snapshots-mainnet.erigon.network'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-hive-eest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Setup go env and cache
uses: actions/setup-go@v6
with:
go-version: '>=1.24'
go-version: '>=1.25'

# Targetting the clients/erigon/Dockerfile.git in the Hive director -
# this builds the container from github and uses it for tests
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/test-hive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ jobs:
sim-limit: compat
max-allowed-failures: 23
steps:
- name: Checkout Erigon go.mod
uses: actions/checkout@v6
with:
sparse-checkout: go.mod
path: erigon-src

- name: Checkout Hive
uses: actions/checkout@v6
with:
Expand All @@ -66,7 +72,7 @@ jobs:
- name: Setup go env and cache
uses: actions/setup-go@v6
with:
go-version: '>=1.24'
go-version: '>=1.25'
go-version-file: 'hive/go.mod'

- name: Conditional Docker Login
Expand Down Expand Up @@ -96,6 +102,9 @@ jobs:
echo Building Hive with Erigon repo - ${SOURCE_REPO}, branch - $branch_name
sed -i "s|^ARG github=erigontech/erigon$|ARG github=${SOURCE_REPO}|" clients/erigon/Dockerfile
sed -i "s/^ARG tag=main$/ARG tag=${branch_name}/" clients/erigon/Dockerfile
go_version=$(go mod edit -json ../erigon-src/go.mod | jq -r .Go)
echo "Patching builder Go version to ${go_version}"
sed -i "s|golang:[0-9.]*-alpine|golang:${go_version}-alpine|" clients/erigon/Dockerfile
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can open a PR to fix this in the Hive repo https://github.com/ethereum/hive/blob/master/clients/erigon

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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ default: all

## go-version: print and verify go version
go-version:
@if [ $(shell $(GO) version | cut -c 16-17) -lt 20 ]; then \
echo "minimum required Golang version is 1.20"; \
@if [ $(shell $(GO) version | cut -c 16-17) -lt 25 ]; then \
echo "minimum required Golang version is 1.25"; \
exit 1 ;\
fi

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Set `--prune.mode` to "archive" if you need an archive node or to "minimal" if y
System Requirements
===================

RAM: >=32GB, [Golang >= 1.24](https://golang.org/doc/install); GCC 10+ or Clang; On Linux: kernel > v4. 64-bit
RAM: >=32GB, [Golang >= 1.25](https://golang.org/doc/install); GCC 10+ or Clang; On Linux: kernel > v4. 64-bit
architecture.

- ArchiveNode Ethereum Mainnet: 1.6TB (May 2025). FullNode: 1.1TB (May 2025)
Expand Down Expand Up @@ -691,7 +691,7 @@ Windows users may run erigon in 3 possible ways:
build on windows :
* [Git](https://git-scm.com/downloads) for Windows must be installed (provides bash and MSYS2 environment). 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.24
* [GO Programming Language](https://golang.org/dl/) must be installed. Minimum required version is 1.25
* [Chocolatey package manager](https://chocolatey.org/) for Windows must be installed. Then install the required
build tools: `choco install cmake make mingw` (provides GNU CC Compiler >= 13, GNU Make, and CMake). Make sure
Windows System "Path" variable has:
Expand Down
2 changes: 1 addition & 1 deletion agents.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

This file provides guidance for AI agents working with this codebase.

**Requirements**: Go 1.24+, GCC 10+ or Clang, 32GB+ RAM, SSD/NVMe storage
**Requirements**: Go 1.25+, GCC 10+ or Clang, 32GB+ RAM, SSD/NVMe storage

## Build & Test

Expand Down
2 changes: 1 addition & 1 deletion common/crypto/blake2b/blake2bAVX2_amd64.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build go1.7 && amd64 && !gccgo && !appengine
//go:build amd64 && !gccgo && !appengine

package blake2b

Expand Down
2 changes: 1 addition & 1 deletion common/crypto/blake2b/blake2bAVX2_amd64.s
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// +build go1.7,amd64,!gccgo,!appengine
// +build amd64,!gccgo,!appengine

#include "textflag.h"

Expand Down
24 changes: 0 additions & 24 deletions common/crypto/blake2b/blake2b_amd64.go

This file was deleted.

2 changes: 0 additions & 2 deletions common/crypto/blake2b/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build go1.9

package blake2b

import (
Expand Down
10 changes: 3 additions & 7 deletions common/synctest/synctest.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,11 @@

package synctest

import (
"testing"
"testing/synctest"
)
import "testing/synctest"

//
// NOTE: we can remove this pkg once go1.26 is out, and we've dropped support for go1.24
// NOTE: we can remove this pkg once go1.26 is out, and we've dropped support for go1.25
//

var Wait = synctest.Wait // nolint:govet

type testFunc func(t *testing.T, f func(*testing.T))
var Test = synctest.Test // nolint:govet
30 changes: 0 additions & 30 deletions common/synctest/synctest_go_1_24.go

This file was deleted.

23 changes: 0 additions & 23 deletions common/synctest/synctest_go_1_25_and_beyond.go

This file was deleted.

2 changes: 0 additions & 2 deletions db/datadir/reset/reset_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
//go:build go1.25

package reset

import (
Expand Down
4 changes: 2 additions & 2 deletions debug.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.2
FROM docker.io/library/golang:1.24-alpine3.20 AS builder
FROM docker.io/library/golang:1.25-alpine3.20 AS builder

RUN apk --no-cache add build-base linux-headers git bash ca-certificates libstdc++

Expand All @@ -16,7 +16,7 @@ RUN --mount=type=cache,target=/root/.cache \
make all


FROM docker.io/library/golang:1.24-alpine3.20 AS tools-builder
FROM docker.io/library/golang:1.25-alpine3.20 AS tools-builder
RUN apk --no-cache add build-base linux-headers git bash ca-certificates libstdc++
WORKDIR /app

Expand Down
4 changes: 2 additions & 2 deletions docs/gitbook/src/get-started/installation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ sudo apt install build-essential cmake -y
**1.3 Go Programming Language**
Erigon utilizes Go (also known as Golang) version 1.24 or newer for part of its development. It is recommended to have a fresh Go installation. If you have an older version, consider deleting the `/usr/local/go` folder (you may need to use `sudo`) and re-extract the new version in its place.
Erigon utilizes Go (also known as Golang) version 1.25 or newer for part of its development. It is recommended to have a fresh Go installation. If you have an older version, consider deleting the `/usr/local/go` folder (you may need to use `sudo`) and re-extract the new version in its place.
To install the latest Go version, visit the official documentation at [https://golang.org/doc/install](https://golang.org/doc/install).
Expand Down Expand Up @@ -330,7 +330,7 @@ Git is a tool that helps download and manage the Erigon source code. To install

**1.4 Go Programming Language**

Erigon utilizes Go (also known as Golang) version 1.24 or newer for part of its development. It is recommended to have a fresh Go installation. If you have an older version, consider deleting the `/usr/local/go` folder (you may need to use `sudo`) and re-extract the new version in its place.
Erigon utilizes Go (also known as Golang) version 1.25 or newer for part of its development. It is recommended to have a fresh Go installation. If you have an older version, consider deleting the `/usr/local/go` folder (you may need to use `sudo`) and re-extract the new version in its place.

To install the latest Go version, visit the official documentation at [https://golang.org/doc/install](https://golang.org/doc/install).

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/erigontech/erigon

go 1.24.0
go 1.25.0

replace github.com/holiman/bloomfilter/v2 => github.com/AskAlexSharov/bloomfilter/v2 v2.0.9

Expand Down
2 changes: 0 additions & 2 deletions node/debug/trace.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
// You should have received a copy of the GNU Lesser General Public License
// along with Erigon. If not, see <http://www.gnu.org/licenses/>.

//go:build go1.5

package debug

import (
Expand Down
34 changes: 0 additions & 34 deletions node/debug/trace_fallback.go

This file was deleted.

Loading