Skip to content

Commit bf19a54

Browse files
authored
[TT-1992] use ethereum genesis generator version that works with geth v1.15.+ (#1642)
1 parent 3bf1ac8 commit bf19a54

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

.github/workflows/docker-test.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
pull_request:
66
types: [labeled]
77
paths-ignore:
8-
- 'tools/**'
8+
- 'tools/**'
99

1010
jobs:
1111
eth_env:
@@ -26,12 +26,11 @@ jobs:
2626
- name: Checkout the Repo
2727
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
2828
- name: Install Go
29-
uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/setup-go@d2f9642bcc24a73400568756f24b72c188ac7a9a # v2.3.31
29+
uses: smartcontractkit/.github/actions/setup-golang@01d931b0455a754d12e7143cc54a5a3521a8f6f6 #v 0.3.1
3030
with:
31-
test_download_vendor_packages_command: cd lib && go mod download
32-
go_mod_path: ./lib/go.mod
33-
cache_key_id: ctf-go
34-
cache_restore_only: 'false'
31+
# test_download_vendor_packages_command: cd lib && go mod download
32+
go-version-file: ./lib/go.mod
33+
use-go-cache: "true"
3534
- name: Install gotestloghelper
3635
working-directory: lib
3736
run: make gotestloghelper_build

lib/docker/ethereum/images.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package ethereum
22

33
const (
44
DefaultBesuEth1Image = "hyperledger/besu:22.1.0"
5-
DefaultBesuEth2Image = "hyperledger/besu:24.12.2"
5+
DefaultBesuEth2Image = "hyperledger/besu:25.2.0"
66
BesuBaseImageName = "hyperledger/besu"
77
besuGitRepo = "hyperledger/besu"
88

@@ -12,16 +12,19 @@ const (
1212
erigonGitRepo = "ledgerwatch/erigon"
1313

1414
DefaultGethEth1Image = "ethereum/client-go:v1.13.8"
15-
DefaultGethEth2Image = "ethereum/client-go:v1.14.12"
15+
DefaultGethEth2Image = "ethereum/client-go:v1.15.0"
1616
GethBaseImageName = "ethereum/client-go"
1717
gethGitRepo = "ethereum/go-ethereum"
1818

1919
DefaultNethermindEth1Image = "nethermind/nethermind:1.16.0"
20-
DefaultNethermindEth2Image = "nethermind/nethermind:1.30.3"
20+
DefaultNethermindEth2Image = "nethermind/nethermind:1.31.0"
2121
NethermindBaseImageName = "nethermind/nethermind"
2222
nethermindGitRepo = "NethermindEth/nethermind"
2323

2424
DefaultRethEth2Image = "ghcr.io/paradigmxyz/reth:v1.1.5"
2525
RethBaseImageName = "ghcr.io/paradigmxyz/reth"
2626
rethGitRepo = "paradigmxyz/reth"
27+
28+
GenesisGeneratorDenebImage = "public.ecr.aws/w0i8p0z9/ethereum-genesis-generator:main-8a8fb99" // latest one
29+
GenesisGeneratorShanghaiImage = "tofelb/ethereum-genesis-generator:2.0.5"
2730
)

lib/docker/test_env/genesis_generator.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
)
2424

2525
var generatorForkToImageMap = map[ethereum.Fork]string{
26-
ethereum.EthereumFork_Shanghai: "tofelb/ethereum-genesis-generator:2.0.5",
27-
ethereum.EthereumFork_Deneb: "tofelb/ethereum-genesis-generator:3.3.5-no-future-forks",
26+
ethereum.EthereumFork_Shanghai: ethereum.GenesisGeneratorShanghaiImage,
27+
ethereum.EthereumFork_Deneb: ethereum.GenesisGeneratorDenebImage,
2828
}
2929

3030
var generatorForkToDataDirMap = map[ethereum.Fork]string{

0 commit comments

Comments
 (0)