Merge branch 'develop' into f_toml_config

.gitignore

@@ -86,4 +86,4 @@ tools/flakeytests/coverage.txt
 .test_summary/
 .run.id
 
-overrides.toml
+overrides.toml

integration-tests/actions/private_network.go

@@ -6,18 +6,13 @@ import (
 	"github.com/rs/zerolog"
 
 	ctf_test_env "github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
+	tc "github.com/smartcontractkit/chainlink/integration-tests/testconfig"
 )
 
-func EthereumNetworkConfigFromEnvOrDefault(l zerolog.Logger) (network ctf_test_env.EthereumNetwork, err error) {
-	chainConfig := ctf_test_env.EthereumChainConfig{
-		SecondsPerSlot: 8,
-		SlotsPerEpoch:  4,
-	}
-
+func EthereumNetworkConfigFromConfig(l zerolog.Logger, config *tc.TestConfig) (network ctf_test_env.EthereumNetwork, err error) {
 	ethBuilder := ctf_test_env.NewEthereumNetworkBuilder()
 	network, err = ethBuilder.
-		WithExecClientFromEnvVar().
-		WithEthereumChainConfig(chainConfig).
+		WithExistingConfig(*config.PrivateEthereumNetwork).
 		Build()
 
 	if errors.Is(err, ctf_test_env.ErrMissingExecClientEnvVar) {

integration-tests/docker/test_env/test_env_builder.go

@@ -236,7 +236,7 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) {
 	}
 
 	if b.hasLogStream {
-		b.te.LogStream, err = logstream.NewLogStream(b.t, b.testConfig.Logging)
+		b.te.LogStream, err = logstream.NewLogStream(b.te.t, b.testConfig.Logging)
 		if err != nil {
 			return nil, err
 		}

integration-tests/go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/lib/pq v1.10.9
 	github.com/manifoldco/promptui v0.9.0
 	github.com/onsi/gomega v1.30.0
-	github.com/pelletier/go-toml/v2 v2.1.0
+	github.com/pelletier/go-toml/v2 v2.1.1
 	github.com/pkg/errors v0.9.1
 	github.com/rs/zerolog v1.30.0
 	github.com/scylladb/go-reflectx v1.0.1

integration-tests/load/ocr/ocr_test.go

@@ -9,6 +9,8 @@ import (
 
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
 	tc "github.com/smartcontractkit/chainlink/integration-tests/testconfig"
+
+	"github.com/smartcontractkit/chainlink/integration-tests/k8s"
 )
 
 var (

integration-tests/load/vrfv2plus/vrfv2plus_test.go

@@ -117,7 +117,7 @@ func TestVRFV2PlusPerformance(t *testing.T) {
 			err = env.EVMClient.WaitForEvents()
 			require.NoError(t, err, vrfv2plus.ErrWaitTXsComplete)
 			l.Info().
-				Str("Coordinator", cfg.ExistingEnvConfig.CoordinatorAddress).
+				Str("Coordinator", vrfv2PlusConfig.CoordinatorAddress).
 				Int("Number of Subs to create", vrfv2PlusConfig.NumberOfSubToCreate).
 				Msg("Creating and funding subscriptions, deploying and adding consumers to subs")
 			subIDs, err = vrfv2plus.CreateFundSubsAndAddConsumers(

integration-tests/migration/upgrade_version_test.go

@@ -21,7 +21,7 @@ func TestVersionUpgrade(t *testing.T) {
 
 	env, err := test_env.NewCLTestEnvBuilder().
 		WithTestConfig(&config).
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithGeth().
 		WithCLNodes(1).
 		WithStandardCleanup().

integration-tests/smoke/automation_test.go

@@ -1134,7 +1134,7 @@ func setupAutomationTestDocker(
 	clNodesCount := 5
 	if isMercuryV02 || isMercuryV03 {
 		env, err = test_env.NewCLTestEnvBuilder().
-			WithTestLogger(t).
+			WithTestInstance(t).
 			WithTestConfig(config).
 			WithGeth().
 			WithMockAdapter().
@@ -1172,7 +1172,7 @@ func setupAutomationTestDocker(
 
 	} else {
 		env, err = test_env.NewCLTestEnvBuilder().
-			WithTestLogger(t).
+			WithTestInstance(t).
 			WithTestConfig(config).
 			WithGeth().
 			WithMockAdapter().

integration-tests/smoke/cron_test.go

@@ -26,7 +26,7 @@ func TestCronBasic(t *testing.T) {
 	}
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
 		WithGeth().
 		WithMockAdapter().
@@ -79,7 +79,7 @@ func TestCronJobReplacement(t *testing.T) {
 	}
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
 		WithGeth().
 		WithMockAdapter().

integration-tests/smoke/flux_test.go

@@ -32,7 +32,7 @@ func TestFluxBasic(t *testing.T) {
 	}
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
 		WithGeth().
 		WithMockAdapter().

integration-tests/smoke/forwarder_ocr_test.go

@@ -25,7 +25,7 @@ func TestForwarderOCRBasic(t *testing.T) {
 	}
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
 		WithGeth().
 		WithMockAdapter().

integration-tests/smoke/forwarders_ocr2_test.go

@@ -31,7 +31,7 @@ func TestForwarderOCR2Basic(t *testing.T) {
 	}
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
 		WithGeth().
 		WithMockAdapter().

integration-tests/smoke/keeper_test.go

@@ -1160,7 +1160,7 @@ func setupKeeperTest(t *testing.T, config *tc.TestConfig) (
 	clNodeConfig.Keeper.Registry.PerformGasOverhead = &performGasOverhead
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(config).
 		WithGeth().
 		WithCLNodes(5).

integration-tests/smoke/ocr2_test.go

@@ -29,10 +29,13 @@ func TestOCRv2Basic(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	network, err := actions.EthereumNetworkConfigFromConfig(l, &config)
+	require.NoError(t, err, "Error building ethereum network config")
+
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
-		WithGeth().
+		WithPrivateEthereumNetwork(network).
 		WithMockAdapter().
 		WithCLNodeConfig(node.NewConfig(node.NewBaseConfig(),
 			node.WithOCR2(),
@@ -111,7 +114,7 @@ func TestOCRv2JobReplacement(t *testing.T) {
 	}
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
 		WithGeth().
 		WithMockAdapter().

integration-tests/smoke/ocr_test.go

@@ -24,10 +24,13 @@ func TestOCRBasic(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	network, err := actions.EthereumNetworkConfigFromConfig(l, &config)
+	require.NoError(t, err, "Error building ethereum network config")
+
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
-		WithGeth().
+		WithPrivateEthereumNetwork(network).
 		WithMockAdapter().
 		WithCLNodes(6).
 		WithFunding(big.NewFloat(.5)).
@@ -79,7 +82,7 @@ func TestOCRJobReplacement(t *testing.T) {
 	}
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
 		WithGeth().
 		WithMockAdapter().

integration-tests/smoke/vrf_test.go

@@ -30,7 +30,7 @@ func TestVRFBasic(t *testing.T) {
 	}
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
 		WithGeth().
 		WithCLNodes(1).
@@ -125,7 +125,7 @@ func TestVRFJobReplacement(t *testing.T) {
 	}
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
 		WithGeth().
 		WithCLNodes(1).

integration-tests/smoke/vrfv2_test.go

@@ -28,10 +28,13 @@ func TestVRFv2Basic(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	network, err := actions.EthereumNetworkConfigFromConfig(l, &config)
+	require.NoError(t, err, "Error building ethereum network config")
+
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
-		WithGeth().
+		WithPrivateEthereumNetwork(network).
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(*config.Common.ChainlinkNodeFunding)).
 		WithStandardCleanup().

integration-tests/smoke/vrfv2plus_test.go

@@ -33,10 +33,13 @@ func TestVRFv2Plus(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	network, err := actions.EthereumNetworkConfigFromConfig(l, &config)
+	require.NoError(t, err, "Error building ethereum network config")
+
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
-		WithGeth().
+		WithPrivateEthereumNetwork(network).
 		WithCLNodes(1).
 		WithFunding(big.NewFloat(*config.Common.ChainlinkNodeFunding)).
 		WithStandardCleanup().
@@ -613,7 +616,7 @@ func TestVRFv2PlusMultipleSendingKeys(t *testing.T) {
 	}
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
 		WithGeth().
 		WithCLNodes(1).
@@ -706,7 +709,7 @@ func TestVRFv2PlusMigration(t *testing.T) {
 	}
 
 	env, err := test_env.NewCLTestEnvBuilder().
-		WithTestLogger(t).
+		WithTestInstance(t).
 		WithTestConfig(&config).
 		WithGeth().
 		WithCLNodes(1).

integration-tests/testconfig/functions/config.go

@@ -5,9 +5,9 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/utils/net"
+	"github.com/smartcontractkit/chainlink/v2/core/store/models"
 )
 
 const (