[TT-1800] Fix Reth v1.0.0, bump default eth2 images to latest (#1252)

Author: Tofel

lib/docker/ethereum/images.go

@@ -2,26 +2,26 @@ package ethereum
 
 const (
 	DefaultBesuEth1Image = "hyperledger/besu:22.1.0"
-	DefaultBesuEth2Image = "hyperledger/besu:24.5.1"
+	DefaultBesuEth2Image = "hyperledger/besu:24.10.0"
 	BesuBaseImageName    = "hyperledger/besu"
 	besuGitRepo          = "hyperledger/besu"
 
 	DefaultErigonEth1Image = "thorax/erigon:v2.40.0"
-	DefaultErigonEth2Image = "thorax/erigon:v2.59.3" // v.2.60.0 is the latest, but gas estimations using zero address are broken
+	DefaultErigonEth2Image = "thorax/erigon:2.60.8"
 	ErigonBaseImageName    = "thorax/erigon"
 	erigonGitRepo          = "ledgerwatch/erigon"
 
 	DefaultGethEth1Image = "ethereum/client-go:v1.13.8"
-	DefaultGethEth2Image = "ethereum/client-go:v1.14.3"
+	DefaultGethEth2Image = "ethereum/client-go:v1.14.11"
 	GethBaseImageName    = "ethereum/client-go"
 	gethGitRepo          = "ethereum/go-ethereum"
 
 	DefaultNethermindEth1Image = "nethermind/nethermind:1.16.0"
-	DefaultNethermindEth2Image = "nethermind/nethermind:1.26.0"
+	DefaultNethermindEth2Image = "nethermind/nethermind:1.29.1"
 	NethermindBaseImageName    = "nethermind/nethermind"
 	nethermindGitRepo          = "NethermindEth/nethermind"
 
-	DefaultRethEth2Image = "ghcr.io/paradigmxyz/reth:v1.0.0"
+	DefaultRethEth2Image = "ghcr.io/paradigmxyz/reth:v1.1.0"
 	RethBaseImageName    = "ghcr.io/paradigmxyz/reth"
 	rethGitRepo          = "paradigmxyz/reth"
 )

lib/docker/test_env/besu_eth2.go

@@ -1,8 +1,11 @@
 package test_env
 
 import (
+	"bytes"
 	"fmt"
+	"os"
 	"strings"
+	"text/template"
 	"time"
 
 	config_types "github.com/smartcontractkit/chainlink-testing-framework/lib/config/types"
@@ -56,7 +59,7 @@ func NewBesuEth2(networks []string, chainConfig *config.EthereumChainConfig, gen
 func (g *Besu) getEth2ContainerRequest() (*tc.ContainerRequest, error) {
 	cmd := []string{
 		"--data-path=/opt/besu/execution-data",
-		fmt.Sprintf("--genesis-file=%s/besu.json", g.generatedDataContainerDir),
+		fmt.Sprintf("--genesis-file=%s/besu.json", "/opt/besu/execution-data"),
 		fmt.Sprintf("--network-id=%d", g.chainConfig.ChainID),
 		"--host-allowlist=*",
 		"--rpc-http-enabled=true",
@@ -102,6 +105,21 @@ func (g *Besu) getEth2ContainerRequest() (*tc.ContainerRequest, error) {
 		cmd = append(cmd, "--bonsai-limit-trie-logs-enabled=false")
 	}
 
+	initFile, err := os.CreateTemp("", "init.sh")
+	if err != nil {
+		return nil, err
+	}
+
+	initScriptContent, err := g.buildPosInitScript(strings.Join(cmd, " "))
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = initFile.WriteString(initScriptContent)
+	if err != nil {
+		return nil, err
+	}
+
 	return &tc.ContainerRequest{
 		Name:     g.ContainerName,
 		Image:    g.GetImageWithVersion(),
@@ -113,10 +131,20 @@ func (g *Besu) getEth2ContainerRequest() (*tc.ContainerRequest, error) {
 				WithPollInterval(1 * time.Second)).
 			WithStartupTimeoutDefault(g.StartupTimeout),
 		User: "0:0", //otherwise in CI we get "permission denied" error, when trying to access data from mounted volume
-		Cmd:  cmd,
+		Entrypoint: []string{
+			"sh",
+			"/init.sh",
+		},
 		Env: map[string]string{
 			"JAVA_OPTS": "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n",
 		},
+		Files: []tc.ContainerFile{
+			{
+				HostFilePath:      initFile.Name(),
+				ContainerFilePath: "/init.sh",
+				FileMode:          0744,
+			},
+		},
 		HostConfigModifier: func(hostConfig *container.HostConfig) {
 			hostConfig.Mounts = append(hostConfig.Mounts, mount.Mount{
 				Type:     mount.TypeBind,
@@ -133,3 +161,37 @@ func (g *Besu) getEth2ContainerRequest() (*tc.ContainerRequest, error) {
 		},
 	}, nil
 }
+
+func (g *Besu) buildPosInitScript(params string) (string, error) {
+	initTemplate := `#!/bin/bash
+	echo "Copied genesis file to {{.ExecutionDir}}"
+	mkdir -p {{.ExecutionDir}}
+	cp {{.GeneratedDataDir}}/besu.json {{.ExecutionDir}}/besu.json
+    # to avoid permission issues without diving into the details
+	chmod 777 {{.GeneratedDataDir}}/genesis.json
+
+	echo "Starting Besu..."
+	echo "Running command: {{.Command}}"
+	{{.Command}}`
+
+	data := struct {
+		GeneratedDataDir string
+		ExecutionDir     string
+		Command          string
+	}{
+		GeneratedDataDir: g.generatedDataContainerDir,
+		ExecutionDir:     "/opt/besu/execution-data",
+		Command:          fmt.Sprintf("/opt/besu/bin/besu %s", params),
+	}
+
+	t, err := template.New("init").Parse(initTemplate)
+	if err != nil {
+		fmt.Println("Error parsing template:", err)
+		os.Exit(1)
+	}
+
+	var buf bytes.Buffer
+	err = t.Execute(&buf, data)
+
+	return buf.String(), err
+}

lib/docker/test_env/besu_test.go

@@ -40,6 +40,30 @@ func TestBesuEth1(t *testing.T) {
 	require.NoError(t, err, "Couldn't close the client")
 }
 
+func TestBesuEth2(t *testing.T) {
+	l := logging.GetTestLogger(t)
+
+	builder := NewEthereumNetworkBuilder()
+	cfg, err := builder.
+		WithEthereumVersion(config_types.EthereumVersion_Eth2).
+		WithExecutionLayer(config_types.ExecutionLayer_Besu).
+		Build()
+	require.NoError(t, err, "Builder validation failed")
+
+	net, _, err := cfg.Start()
+	require.NoError(t, err, "Couldn't start PoS network")
+
+	c, err := blockchain.ConnectEVMClient(net, l)
+	require.NoError(t, err, "Couldn't connect to the evm client")
+
+	address := common.HexToAddress("0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1")
+	err = sendAndCompareBalances(testcontext.Get(t), c, address)
+	require.NoError(t, err, fmt.Sprintf("balance wasn't correctly updated for %s network", net.Name))
+
+	err = c.Close()
+	require.NoError(t, err, "Couldn't close the client")
+}
+
 func TestBesuEth2_Deneb(t *testing.T) {
 	l := logging.GetTestLogger(t)
 

lib/docker/test_env/erigon_test.go

@@ -40,6 +40,30 @@ func TestErigonEth1(t *testing.T) {
 	require.NoError(t, err, "Couldn't close the client")
 }
 
+func TestErigonEth2(t *testing.T) {
+	l := logging.GetTestLogger(t)
+
+	builder := NewEthereumNetworkBuilder()
+	cfg, err := builder.
+		WithEthereumVersion(config_types.EthereumVersion_Eth2).
+		WithExecutionLayer(config_types.ExecutionLayer_Erigon).
+		Build()
+	require.NoError(t, err, "Builder validation failed")
+
+	net, _, err := cfg.Start()
+	require.NoError(t, err, "Couldn't start PoS network")
+
+	c, err := blockchain.ConnectEVMClient(net, l)
+	require.NoError(t, err, "Couldn't connect to the evm client")
+
+	address := common.HexToAddress("0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1")
+	err = sendAndCompareBalances(testcontext.Get(t), c, address)
+	require.NoError(t, err, fmt.Sprintf("balance wasn't correctly updated for %s network", net.Name))
+
+	err = c.Close()
+	require.NoError(t, err, "Couldn't close the client")
+}
+
 func TestErigonEth2_Deneb(t *testing.T) {
 	l := logging.GetTestLogger(t)
 

lib/docker/test_env/geth_test.go

@@ -56,13 +56,12 @@ func TestGethEth1(t *testing.T) {
 	require.NoError(t, err, "Couldn't close the client")
 }
 
-func TestGethEth2_Deneb(t *testing.T) {
+func TestGethEth2(t *testing.T) {
 	l := logging.GetTestLogger(t)
 
 	builder := NewEthereumNetworkBuilder()
 	cfg, err := builder.
-		WithCustomDockerImages(map[config.ContainerType]string{config.ContainerType_ExecutionLayer: "ethereum/client-go:v1.13.12"}).
-		WithConsensusLayer(config.ConsensusLayer_Prysm).
+		WithEthereumVersion(config_types.EthereumVersion_Eth2).
 		WithExecutionLayer(config_types.ExecutionLayer_Geth).
 		Build()
 	require.NoError(t, err, "Builder validation failed")
@@ -85,29 +84,15 @@ func TestGethEth2_Deneb(t *testing.T) {
 	address := common.HexToAddress("0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1")
 	err = sendAndCompareBalances(ctx, clientOne, address)
 	require.NoError(t, err, fmt.Sprintf("balance wasn't correctly updated for %s network", nonEip1559Network.Name))
-
-	eip1559Network := blockchain.SimulatedEVMNetwork
-	eip1559Network.Name = "Simulated Geth + Prysm (EIP 1559)"
-	eip1559Network.SupportsEIP1559 = true
-	eip1559Network.URLs = eth2.PublicWsUrls()
-	clientTwo, err := blockchain.ConnectEVMClient(eip1559Network, l)
-	require.NoError(t, err, "Couldn't connect to the evm client")
-
-	t.Cleanup(func() {
-		err = clientTwo.Close()
-		require.NoError(t, err, "Couldn't close the client")
-	})
-
-	err = sendAndCompareBalances(ctx, clientTwo, address)
-	require.NoError(t, err, fmt.Sprintf("balance wasn't correctly updated for %s network", eip1559Network.Name))
 }
 
-func TestGethEth2_Shanghai_No_Fork_Setup(t *testing.T) {
+func TestGethEth2_Deneb(t *testing.T) {
 	l := logging.GetTestLogger(t)
 
 	builder := NewEthereumNetworkBuilder()
 	cfg, err := builder.
-		WithCustomDockerImages(map[config.ContainerType]string{config.ContainerType_ExecutionLayer: "ethereum/client-go:v1.13.11"}).
+		WithCustomDockerImages(map[config.ContainerType]string{config.ContainerType_ExecutionLayer: "ethereum/client-go:v1.13.12"}).
+		WithConsensusLayer(config.ConsensusLayer_Prysm).
 		WithExecutionLayer(config_types.ExecutionLayer_Geth).
 		Build()
 	require.NoError(t, err, "Builder validation failed")
@@ -130,6 +115,21 @@ func TestGethEth2_Shanghai_No_Fork_Setup(t *testing.T) {
 	address := common.HexToAddress("0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1")
 	err = sendAndCompareBalances(ctx, clientOne, address)
 	require.NoError(t, err, fmt.Sprintf("balance wasn't correctly updated for %s network", nonEip1559Network.Name))
+
+	eip1559Network := blockchain.SimulatedEVMNetwork
+	eip1559Network.Name = "Simulated Geth + Prysm (EIP 1559)"
+	eip1559Network.SupportsEIP1559 = true
+	eip1559Network.URLs = eth2.PublicWsUrls()
+	clientTwo, err := blockchain.ConnectEVMClient(eip1559Network, l)
+	require.NoError(t, err, "Couldn't connect to the evm client")
+
+	t.Cleanup(func() {
+		err = clientTwo.Close()
+		require.NoError(t, err, "Couldn't close the client")
+	})
+
+	err = sendAndCompareBalances(ctx, clientTwo, address)
+	require.NoError(t, err, fmt.Sprintf("balance wasn't correctly updated for %s network", eip1559Network.Name))
 }
 
 func TestGethEth2_Shanghai(t *testing.T) {

lib/docker/test_env/nethermind_test.go

@@ -40,6 +40,30 @@ func TestNethermindEth1(t *testing.T) {
 	require.NoError(t, err, "Couldn't close the client")
 }
 
+func TestNethermindEth2(t *testing.T) {
+	l := logging.GetTestLogger(t)
+
+	builder := NewEthereumNetworkBuilder()
+	cfg, err := builder.
+		WithEthereumVersion(config_types.EthereumVersion_Eth2).
+		WithExecutionLayer(config_types.ExecutionLayer_Nethermind).
+		Build()
+	require.NoError(t, err, "Builder validation failed")
+
+	net, _, err := cfg.Start()
+	require.NoError(t, err, "Couldn't start PoS network")
+
+	c, err := blockchain.ConnectEVMClient(net, l)
+	require.NoError(t, err, "Couldn't connect to the evm client")
+
+	address := common.HexToAddress("0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1")
+	err = sendAndCompareBalances(testcontext.Get(t), c, address)
+	require.NoError(t, err, fmt.Sprintf("balance wasn't correctly updated for %s network", net.Name))
+
+	err = c.Close()
+	require.NoError(t, err, "Couldn't close the client")
+}
+
 func TestNethermindEth2_Dencun(t *testing.T) {
 	l := logging.GetTestLogger(t)
 

lib/docker/test_env/reth_base.go

@@ -156,7 +156,7 @@ func (g *Reth) WaitUntilChainIsReady(ctx context.Context, waitTime time.Duration
 	if g.GetEthereumVersion() == config_types.EthereumVersion_Eth1 {
 		return nil
 	}
-	waitForFirstBlock := tcwait.NewLogStrategy("Block added to canonical chain").WithPollInterval(1 * time.Second).WithStartupTimeout(waitTime)
+	waitForFirstBlock := tcwait.NewLogStrategy("Canonical chain committed").WithPollInterval(1 * time.Second).WithStartupTimeout(waitTime)
 	return waitForFirstBlock.WaitUntilReady(ctx, *g.GetContainer())
 }