From 0500dbba20d5725a7865a0ad20c61c255d28e99a Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Thu, 7 Nov 2024 23:44:57 +0100 Subject: [PATCH 01/16] Disable WS check --- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 ++-- integration-tests/types/config/node/core.go | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 9018e8fe2c2..b24b7685df6 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -40,7 +40,7 @@ require ( github.com/smartcontractkit/chainlink-common v0.3.1-0.20241107134205-25e45ecd73ba github.com/smartcontractkit/chainlink-protos/job-distributor v0.4.0 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 - github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.13 + github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241107214439-2aa1df1ad45c github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.5 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 417c84b6921..84045558593 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1423,8 +1423,8 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1 github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 h1:GDGrC5OGiV0RyM1znYWehSQXyZQWTOzrEeJRYmysPCE= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2/go.mod h1:DsT43c1oTBmp3iQkMcoZOoKThwZvt8X3Pz6UmznJ4GY= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.13 h1:T0kbw07Vb6xUyA9MIJZfErMgWseWi1zf7cYvRpoq7ug= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.13/go.mod h1:1CKUOzoK+Ga19WuhRH9pxZ+qUUnrlIx108VEA6qSzeQ= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241107214439-2aa1df1ad45c h1:DXw71zjWLmy6Nzy6/Gc7fs2M0q+5FSSoQVBXIB93O3c= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241107214439-2aa1df1ad45c/go.mod h1:1CKUOzoK+Ga19WuhRH9pxZ+qUUnrlIx108VEA6qSzeQ= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM= github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.5 h1:BxN9wddNLiugruN3k7nYoSMQTO0tz9qR+vILFW2l0Ps= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 66bc10e5d85..549cc8589db 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -18,7 +18,7 @@ require ( github.com/rs/zerolog v1.33.0 github.com/slack-go/slack v0.15.0 github.com/smartcontractkit/chainlink-common v0.3.1-0.20241107134205-25e45ecd73ba - github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.13 + github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241107214439-2aa1df1ad45c github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.5 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 github.com/smartcontractkit/chainlink/deployment v0.0.0-00010101000000-000000000000 diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 1744727230a..4d5cc76ce0f 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1410,8 +1410,8 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1 github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 h1:GDGrC5OGiV0RyM1znYWehSQXyZQWTOzrEeJRYmysPCE= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2/go.mod h1:DsT43c1oTBmp3iQkMcoZOoKThwZvt8X3Pz6UmznJ4GY= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.13 h1:T0kbw07Vb6xUyA9MIJZfErMgWseWi1zf7cYvRpoq7ug= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.13/go.mod h1:1CKUOzoK+Ga19WuhRH9pxZ+qUUnrlIx108VEA6qSzeQ= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241107214439-2aa1df1ad45c h1:DXw71zjWLmy6Nzy6/Gc7fs2M0q+5FSSoQVBXIB93O3c= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241107214439-2aa1df1ad45c/go.mod h1:1CKUOzoK+Ga19WuhRH9pxZ+qUUnrlIx108VEA6qSzeQ= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM= github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.5 h1:BxN9wddNLiugruN3k7nYoSMQTO0tz9qR+vILFW2l0Ps= diff --git a/integration-tests/types/config/node/core.go b/integration-tests/types/config/node/core.go index 7b5230f401f..c775cf425a3 100644 --- a/integration-tests/types/config/node/core.go +++ b/integration-tests/types/config/node/core.go @@ -92,8 +92,8 @@ func WithPrivateEVMs(networks []blockchain.EVMNetwork, commonChainConfig *evmcfg var evmNodes []*evmcfg.Node for i := range network.URLs { evmNodes = append(evmNodes, &evmcfg.Node{ - Name: ptr.Ptr(fmt.Sprintf("%s-%d", network.Name, i)), - WSURL: itutils.MustURL(network.URLs[i]), + Name: ptr.Ptr(fmt.Sprintf("%s-%d", network.Name, i)), + // WSURL: itutils.MustURL(network.URLs[i]), HTTPURL: itutils.MustURL(network.HTTPURLs[i]), }) } From ff8760a098d942ade47fd3411397a6231796d713 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Thu, 7 Nov 2024 23:45:53 +0100 Subject: [PATCH 02/16] Update node config --- core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml index 403ecd7c4b1..0e7ee73beab 100644 --- a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml @@ -2,6 +2,7 @@ ChainID = '11155111' FinalityTagEnabled = true LinkContractAddress = '0x779877A7B0D9E8603169DdbD7836e478b4624789' MinContractPayment = '0.1 link' +LogBroadcasterEnabled = false [GasEstimator] EIP1559DynamicFees = true From 1da8bd4535f61a39040b681fcb1718d7e3e90350 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Fri, 8 Nov 2024 00:27:28 +0100 Subject: [PATCH 03/16] remove ws validation --- integration-tests/types/config/node/core.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/types/config/node/core.go b/integration-tests/types/config/node/core.go index c775cf425a3..30934da8b62 100644 --- a/integration-tests/types/config/node/core.go +++ b/integration-tests/types/config/node/core.go @@ -90,7 +90,7 @@ func WithPrivateEVMs(networks []blockchain.EVMNetwork, commonChainConfig *evmcfg var evmConfigs []*evmcfg.EVMConfig for _, network := range networks { var evmNodes []*evmcfg.Node - for i := range network.URLs { + for i := range network.HTTPURLs { evmNodes = append(evmNodes, &evmcfg.Node{ Name: ptr.Ptr(fmt.Sprintf("%s-%d", network.Name, i)), // WSURL: itutils.MustURL(network.URLs[i]), From f92ca3028f65a2a20f32cad136be6d5566913b60 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Fri, 8 Nov 2024 00:57:10 +0100 Subject: [PATCH 04/16] Add NewHeadsPollInterva configl --- core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml index 0e7ee73beab..f7e7ce73f12 100644 --- a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml @@ -16,3 +16,6 @@ GasLimit = 10500000 [HeadTracker] FinalityTagBypass = false + +[NodePool] +NewHeadsPollInterval = '6s' From 94d20a41f05cae4857e7d698b5d88da10f1a2ab3 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Mon, 11 Nov 2024 12:11:59 +0100 Subject: [PATCH 05/16] Implement forceHttp for OCR soak --- integration-tests/actions/actions.go | 1 + .../docker/test_env/test_env_builder.go | 2 ++ integration-tests/go.mod | 6 +++-- integration-tests/go.sum | 6 ++--- integration-tests/load/go.mod | 4 +-- integration-tests/load/go.sum | 8 +++--- integration-tests/testconfig/default.toml | 11 +++++--- integration-tests/types/config/node/core.go | 25 ++++++++++++------- 8 files changed, 39 insertions(+), 24 deletions(-) diff --git a/integration-tests/actions/actions.go b/integration-tests/actions/actions.go index 76e6cbd4185..4655ebfc2b7 100644 --- a/integration-tests/actions/actions.go +++ b/integration-tests/actions/actions.go @@ -1260,6 +1260,7 @@ func BuildTOMLNodeConfigForK8s(testConfig ctfconfig.GlobalTestConfig, testNetwor nodeConfigInToml.BaseConfigTOML, nodeConfigInToml.CommonChainConfigTOML, nodeConfigInToml.ChainConfigTOMLByChainID, + testConfig.GetNetworkConfig().ForceHttp, ) if err != nil { diff --git a/integration-tests/docker/test_env/test_env_builder.go b/integration-tests/docker/test_env/test_env_builder.go index 610c3e29e1e..5708dbb4343 100644 --- a/integration-tests/docker/test_env/test_env_builder.go +++ b/integration-tests/docker/test_env/test_env_builder.go @@ -436,6 +436,7 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) { nodeConfigInToml.BaseConfigTOML, nodeConfigInToml.CommonChainConfigTOML, nodeConfigInToml.ChainConfigTOMLByChainID, + b.testConfig.GetNetworkConfig().ForceHttp, ) if err != nil { return nil, err @@ -534,6 +535,7 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) { nodeConfigInToml.BaseConfigTOML, nodeConfigInToml.CommonChainConfigTOML, nodeConfigInToml.ChainConfigTOMLByChainID, + b.testConfig.GetNetworkConfig().ForceHttp, ) if err != nil { return nil, err diff --git a/integration-tests/go.mod b/integration-tests/go.mod index b24b7685df6..1465a006435 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -40,9 +40,9 @@ require ( github.com/smartcontractkit/chainlink-common v0.3.1-0.20241107134205-25e45ecd73ba github.com/smartcontractkit/chainlink-protos/job-distributor v0.4.0 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 - github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241107214439-2aa1df1ad45c + github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111105249-b94c39045e1b github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 - github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.5 + github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 github.com/smartcontractkit/chainlink/deployment v0.0.0-00010101000000-000000000000 github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20241106193309-5560cd76211a @@ -531,5 +531,7 @@ replace ( // replicating the replace directive on cosmos SDK github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 + github.com/smartcontractkit/chainlink-testing-framework/lib => ../../chainlink-testing-framework/lib + github.com/sourcegraph/sourcegraph/lib => github.com/sourcegraph/sourcegraph-public-snapshot/lib v0.0.0-20240822153003-c864f15af264 ) diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 84045558593..f6dc627704f 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1423,12 +1423,10 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1 github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 h1:GDGrC5OGiV0RyM1znYWehSQXyZQWTOzrEeJRYmysPCE= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2/go.mod h1:DsT43c1oTBmp3iQkMcoZOoKThwZvt8X3Pz6UmznJ4GY= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241107214439-2aa1df1ad45c h1:DXw71zjWLmy6Nzy6/Gc7fs2M0q+5FSSoQVBXIB93O3c= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241107214439-2aa1df1ad45c/go.mod h1:1CKUOzoK+Ga19WuhRH9pxZ+qUUnrlIx108VEA6qSzeQ= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM= -github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.5 h1:BxN9wddNLiugruN3k7nYoSMQTO0tz9qR+vILFW2l0Ps= -github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.5/go.mod h1:lJk0atEJ5Zyo3Tqrmf1Pl9jUEe79EgDb9bD3K5OTUBI= +github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 h1:yB1x5UXvpZNka+5h57yo1/GrKfXKCqMzChCISpldZx4= +github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9/go.mod h1:lJk0atEJ5Zyo3Tqrmf1Pl9jUEe79EgDb9bD3K5OTUBI= github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 h1:7bCdbTUWzyczQg+kwHCxlx6y07zE8HNB8+ntTne6qd8= github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2/go.mod h1:MltlNu3jcXm/DyLN98I5TFNtu/o1NNAcaPAFKMXWk70= github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 549cc8589db..377e924e903 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -18,8 +18,8 @@ require ( github.com/rs/zerolog v1.33.0 github.com/slack-go/slack v0.15.0 github.com/smartcontractkit/chainlink-common v0.3.1-0.20241107134205-25e45ecd73ba - github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241107214439-2aa1df1ad45c - github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.5 + github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111105249-b94c39045e1b + github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 github.com/smartcontractkit/chainlink/deployment v0.0.0-00010101000000-000000000000 github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20241030133659-9ec788e78b4f diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 4d5cc76ce0f..adf43e5489f 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1410,12 +1410,12 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1 github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 h1:GDGrC5OGiV0RyM1znYWehSQXyZQWTOzrEeJRYmysPCE= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2/go.mod h1:DsT43c1oTBmp3iQkMcoZOoKThwZvt8X3Pz6UmznJ4GY= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241107214439-2aa1df1ad45c h1:DXw71zjWLmy6Nzy6/Gc7fs2M0q+5FSSoQVBXIB93O3c= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241107214439-2aa1df1ad45c/go.mod h1:1CKUOzoK+Ga19WuhRH9pxZ+qUUnrlIx108VEA6qSzeQ= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111105249-b94c39045e1b h1:TYYVqX4zPiY5VbvdmfQblsllTYsk3CMTOuXuN21+F48= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111105249-b94c39045e1b/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM= -github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.5 h1:BxN9wddNLiugruN3k7nYoSMQTO0tz9qR+vILFW2l0Ps= -github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.5/go.mod h1:lJk0atEJ5Zyo3Tqrmf1Pl9jUEe79EgDb9bD3K5OTUBI= +github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 h1:yB1x5UXvpZNka+5h57yo1/GrKfXKCqMzChCISpldZx4= +github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9/go.mod h1:lJk0atEJ5Zyo3Tqrmf1Pl9jUEe79EgDb9bD3K5OTUBI= github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 h1:7bCdbTUWzyczQg+kwHCxlx6y07zE8HNB8+ntTne6qd8= github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2/go.mod h1:MltlNu3jcXm/DyLN98I5TFNtu/o1NNAcaPAFKMXWk70= github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs= diff --git a/integration-tests/testconfig/default.toml b/integration-tests/testconfig/default.toml index 385d35c67cb..667d277deda 100644 --- a/integration-tests/testconfig/default.toml +++ b/integration-tests/testconfig/default.toml @@ -3,9 +3,9 @@ test_log_collect = false [Logging.Grafana] -base_url="https://grafana.ops.prod.cldev.sh" -base_url_github_ci="http://localhost:8080/primary" -dashboard_url="/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs" +base_url = "https://grafana.ops.prod.cldev.sh" +base_url_github_ci = "http://localhost:8080/primary" +dashboard_url = "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs" [Logging.LogStream] # supported targets: file, loki, in-memory. if empty no logs will be persisted @@ -30,6 +30,8 @@ chainlink_node_funding = 0.5 # slice of networks to use; at lesat one network must be selected; each selected network must either be already defined in the CTF as a known network, or be defined in # TOML test files as a new network selected_networks = ["simulated"] +# if set to true, networks will be forced to use HTTP instead of WS +force_http = false [PrivateEthereumNetwork] # ethereum version to use; eth1 or eth2 (post-merge) @@ -168,6 +170,9 @@ check_rpc_health_on_start = false # "eip_1559_fee_equalizer" sets the tip/base fee to the higher value in case there's 3+ orders of magnitude difference between them experiments_enabled = [] +# if set to true, SETH will use HTTP instead of WS. This overrides seth.networks specific urls_secret +force_http = false + [Seth.nonce_manager] # rate-limiting of key syncs, to prevent spamming the node with nonce calls key_sync_rate_limit_per_sec = 10 diff --git a/integration-tests/types/config/node/core.go b/integration-tests/types/config/node/core.go index 30934da8b62..b1eedf3b1d1 100644 --- a/integration-tests/types/config/node/core.go +++ b/integration-tests/types/config/node/core.go @@ -86,16 +86,23 @@ func NewConfigFromToml(tomlConfig []byte, opts ...NodeConfigOpt) (*chainlink.Con return &cfg, nil } -func WithPrivateEVMs(networks []blockchain.EVMNetwork, commonChainConfig *evmcfg.Chain, chainSpecificConfig map[int64]evmcfg.Chain) NodeConfigOpt { +func WithPrivateEVMs(networks []blockchain.EVMNetwork, commonChainConfig *evmcfg.Chain, chainSpecificConfig map[int64]evmcfg.Chain, forceHttp bool) NodeConfigOpt { var evmConfigs []*evmcfg.EVMConfig for _, network := range networks { var evmNodes []*evmcfg.Node - for i := range network.HTTPURLs { - evmNodes = append(evmNodes, &evmcfg.Node{ - Name: ptr.Ptr(fmt.Sprintf("%s-%d", network.Name, i)), - // WSURL: itutils.MustURL(network.URLs[i]), + URLs := network.URLs + if forceHttp { + URLs = network.HTTPURLs + } + for i := range URLs { + node := &evmcfg.Node{ + Name: ptr.Ptr(fmt.Sprintf("%s-%d", network.Name, i)), HTTPURL: itutils.MustURL(network.HTTPURLs[i]), - }) + } + if !forceHttp { + node.WSURL = itutils.MustURL(network.URLs[i]) + } + evmNodes = append(evmNodes, node) } evmConfig := &evmcfg.EVMConfig{ ChainID: ubig.New(big.NewInt(network.ChainID)), @@ -133,7 +140,7 @@ func WithKeySpecificMaxGasPrice(addresses []string, maxGasPriceGWei int64) NodeC } } -func BuildChainlinkNodeConfig(nets []blockchain.EVMNetwork, nodeConfig, commonChain string, configByChain map[string]string) (*corechainlink.Config, string, error) { +func BuildChainlinkNodeConfig(nets []blockchain.EVMNetwork, nodeConfig, commonChain string, configByChain map[string]string, forceHttp bool) (*corechainlink.Config, string, error) { var tomlCfg *corechainlink.Config var err error var commonChainConfig *evmcfg.Chain @@ -159,9 +166,9 @@ func BuildChainlinkNodeConfig(nets []blockchain.EVMNetwork, nodeConfig, commonCh if nodeConfig == "" { tomlCfg = NewConfig( NewBaseConfig(), - WithPrivateEVMs(nets, commonChainConfig, configByChainMap)) + WithPrivateEVMs(nets, commonChainConfig, configByChainMap, forceHttp)) } else { - tomlCfg, err = NewConfigFromToml([]byte(nodeConfig), WithPrivateEVMs(nets, commonChainConfig, configByChainMap)) + tomlCfg, err = NewConfigFromToml([]byte(nodeConfig), WithPrivateEVMs(nets, commonChainConfig, configByChainMap, forceHttp)) if err != nil { return nil, "", err } From 10af150f06034c36c3d2ec3df8802af0b3cefc35 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Mon, 11 Nov 2024 12:48:59 +0100 Subject: [PATCH 06/16] Update ctf version --- integration-tests/go.mod | 2 -- integration-tests/go.sum | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 1465a006435..e9600abdb0a 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -531,7 +531,5 @@ replace ( // replicating the replace directive on cosmos SDK github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - github.com/smartcontractkit/chainlink-testing-framework/lib => ../../chainlink-testing-framework/lib - github.com/sourcegraph/sourcegraph/lib => github.com/sourcegraph/sourcegraph-public-snapshot/lib v0.0.0-20240822153003-c864f15af264 ) diff --git a/integration-tests/go.sum b/integration-tests/go.sum index f6dc627704f..2c5dcb62ed1 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1423,6 +1423,8 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1 github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 h1:GDGrC5OGiV0RyM1znYWehSQXyZQWTOzrEeJRYmysPCE= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2/go.mod h1:DsT43c1oTBmp3iQkMcoZOoKThwZvt8X3Pz6UmznJ4GY= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111105249-b94c39045e1b h1:TYYVqX4zPiY5VbvdmfQblsllTYsk3CMTOuXuN21+F48= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111105249-b94c39045e1b/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM= github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 h1:yB1x5UXvpZNka+5h57yo1/GrKfXKCqMzChCISpldZx4= From 2aafbaab88785c514b9332702765476a94fda160 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Mon, 11 Nov 2024 21:14:54 +0100 Subject: [PATCH 07/16] Update ctf lib --- integration-tests/go.mod | 4 +++- integration-tests/go.sum | 2 -- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index e9600abdb0a..a039e88cf5b 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -40,7 +40,7 @@ require ( github.com/smartcontractkit/chainlink-common v0.3.1-0.20241107134205-25e45ecd73ba github.com/smartcontractkit/chainlink-protos/job-distributor v0.4.0 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 - github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111105249-b94c39045e1b + github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111201226-0bc53b6db514 github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 @@ -531,5 +531,7 @@ replace ( // replicating the replace directive on cosmos SDK github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 + github.com/smartcontractkit/chainlink-testing-framework/lib => ../../chainlink-testing-framework/lib + github.com/sourcegraph/sourcegraph/lib => github.com/sourcegraph/sourcegraph-public-snapshot/lib v0.0.0-20240822153003-c864f15af264 ) diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 2c5dcb62ed1..f6dc627704f 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1423,8 +1423,6 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1 github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 h1:GDGrC5OGiV0RyM1znYWehSQXyZQWTOzrEeJRYmysPCE= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2/go.mod h1:DsT43c1oTBmp3iQkMcoZOoKThwZvt8X3Pz6UmznJ4GY= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111105249-b94c39045e1b h1:TYYVqX4zPiY5VbvdmfQblsllTYsk3CMTOuXuN21+F48= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111105249-b94c39045e1b/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM= github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 h1:yB1x5UXvpZNka+5h57yo1/GrKfXKCqMzChCISpldZx4= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 377e924e903..ff153c9582d 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -18,7 +18,7 @@ require ( github.com/rs/zerolog v1.33.0 github.com/slack-go/slack v0.15.0 github.com/smartcontractkit/chainlink-common v0.3.1-0.20241107134205-25e45ecd73ba - github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111105249-b94c39045e1b + github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111201226-0bc53b6db514 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 github.com/smartcontractkit/chainlink/deployment v0.0.0-00010101000000-000000000000 diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index adf43e5489f..df5df14cd62 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1410,8 +1410,8 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1 github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 h1:GDGrC5OGiV0RyM1znYWehSQXyZQWTOzrEeJRYmysPCE= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2/go.mod h1:DsT43c1oTBmp3iQkMcoZOoKThwZvt8X3Pz6UmznJ4GY= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111105249-b94c39045e1b h1:TYYVqX4zPiY5VbvdmfQblsllTYsk3CMTOuXuN21+F48= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111105249-b94c39045e1b/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111201226-0bc53b6db514 h1:h2daK2QdY1BLkqOk4vRQziVPl/Uc+90f7tqg9GtBPB8= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111201226-0bc53b6db514/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM= github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 h1:yB1x5UXvpZNka+5h57yo1/GrKfXKCqMzChCISpldZx4= From c424aa9ddc788caf0a773c1d2802da87e53bbf85 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Mon, 11 Nov 2024 21:27:48 +0100 Subject: [PATCH 08/16] Update ctf lib --- integration-tests/go.mod | 2 -- integration-tests/go.sum | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index a039e88cf5b..3ed8c8e0b40 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -531,7 +531,5 @@ replace ( // replicating the replace directive on cosmos SDK github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - github.com/smartcontractkit/chainlink-testing-framework/lib => ../../chainlink-testing-framework/lib - github.com/sourcegraph/sourcegraph/lib => github.com/sourcegraph/sourcegraph-public-snapshot/lib v0.0.0-20240822153003-c864f15af264 ) diff --git a/integration-tests/go.sum b/integration-tests/go.sum index f6dc627704f..54e40870998 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1423,6 +1423,8 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1 github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 h1:GDGrC5OGiV0RyM1znYWehSQXyZQWTOzrEeJRYmysPCE= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2/go.mod h1:DsT43c1oTBmp3iQkMcoZOoKThwZvt8X3Pz6UmznJ4GY= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111201226-0bc53b6db514 h1:h2daK2QdY1BLkqOk4vRQziVPl/Uc+90f7tqg9GtBPB8= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111201226-0bc53b6db514/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM= github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 h1:yB1x5UXvpZNka+5h57yo1/GrKfXKCqMzChCISpldZx4= From 368e381f6aaf8e22d6ef708e61e2c7d0fc4be4c5 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Mon, 11 Nov 2024 22:50:48 +0100 Subject: [PATCH 09/16] Update ctf lib --- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 3ed8c8e0b40..82cd253b8e8 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -40,7 +40,7 @@ require ( github.com/smartcontractkit/chainlink-common v0.3.1-0.20241107134205-25e45ecd73ba github.com/smartcontractkit/chainlink-protos/job-distributor v0.4.0 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 - github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111201226-0bc53b6db514 + github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111214917-fce87d3f16f9 github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 54e40870998..37fc559fdb5 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1423,8 +1423,8 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1 github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 h1:GDGrC5OGiV0RyM1znYWehSQXyZQWTOzrEeJRYmysPCE= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2/go.mod h1:DsT43c1oTBmp3iQkMcoZOoKThwZvt8X3Pz6UmznJ4GY= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111201226-0bc53b6db514 h1:h2daK2QdY1BLkqOk4vRQziVPl/Uc+90f7tqg9GtBPB8= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111201226-0bc53b6db514/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111214917-fce87d3f16f9 h1:NYTC1p+PvI0FXWixkvF3nx1IvDsZB4/HD9NvuQkltk0= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111214917-fce87d3f16f9/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM= github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 h1:yB1x5UXvpZNka+5h57yo1/GrKfXKCqMzChCISpldZx4= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index ff153c9582d..747009c3894 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -18,7 +18,7 @@ require ( github.com/rs/zerolog v1.33.0 github.com/slack-go/slack v0.15.0 github.com/smartcontractkit/chainlink-common v0.3.1-0.20241107134205-25e45ecd73ba - github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111201226-0bc53b6db514 + github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111214917-fce87d3f16f9 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 github.com/smartcontractkit/chainlink/deployment v0.0.0-00010101000000-000000000000 diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index df5df14cd62..63f313b6243 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1410,8 +1410,8 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1 github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 h1:GDGrC5OGiV0RyM1znYWehSQXyZQWTOzrEeJRYmysPCE= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2/go.mod h1:DsT43c1oTBmp3iQkMcoZOoKThwZvt8X3Pz6UmznJ4GY= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111201226-0bc53b6db514 h1:h2daK2QdY1BLkqOk4vRQziVPl/Uc+90f7tqg9GtBPB8= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111201226-0bc53b6db514/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111214917-fce87d3f16f9 h1:NYTC1p+PvI0FXWixkvF3nx1IvDsZB4/HD9NvuQkltk0= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111214917-fce87d3f16f9/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM= github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 h1:yB1x5UXvpZNka+5h57yo1/GrKfXKCqMzChCISpldZx4= From 67b8f9f26d2f6457207c81a190806f8aeca139d5 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Tue, 12 Nov 2024 13:28:15 +0100 Subject: [PATCH 10/16] Simplify setting up http only --- integration-tests/actions/actions.go | 1 - .../docker/test_env/test_env_builder.go | 2 -- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 +-- integration-tests/testconfig/default.toml | 5 --- integration-tests/types/config/node/core.go | 31 ++++++++++++------- 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/integration-tests/actions/actions.go b/integration-tests/actions/actions.go index 4655ebfc2b7..76e6cbd4185 100644 --- a/integration-tests/actions/actions.go +++ b/integration-tests/actions/actions.go @@ -1260,7 +1260,6 @@ func BuildTOMLNodeConfigForK8s(testConfig ctfconfig.GlobalTestConfig, testNetwor nodeConfigInToml.BaseConfigTOML, nodeConfigInToml.CommonChainConfigTOML, nodeConfigInToml.ChainConfigTOMLByChainID, - testConfig.GetNetworkConfig().ForceHttp, ) if err != nil { diff --git a/integration-tests/docker/test_env/test_env_builder.go b/integration-tests/docker/test_env/test_env_builder.go index 5708dbb4343..610c3e29e1e 100644 --- a/integration-tests/docker/test_env/test_env_builder.go +++ b/integration-tests/docker/test_env/test_env_builder.go @@ -436,7 +436,6 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) { nodeConfigInToml.BaseConfigTOML, nodeConfigInToml.CommonChainConfigTOML, nodeConfigInToml.ChainConfigTOMLByChainID, - b.testConfig.GetNetworkConfig().ForceHttp, ) if err != nil { return nil, err @@ -535,7 +534,6 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) { nodeConfigInToml.BaseConfigTOML, nodeConfigInToml.CommonChainConfigTOML, nodeConfigInToml.ChainConfigTOMLByChainID, - b.testConfig.GetNetworkConfig().ForceHttp, ) if err != nil { return nil, err diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 82cd253b8e8..fcc337c047a 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -40,7 +40,7 @@ require ( github.com/smartcontractkit/chainlink-common v0.3.1-0.20241107134205-25e45ecd73ba github.com/smartcontractkit/chainlink-protos/job-distributor v0.4.0 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 - github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111214917-fce87d3f16f9 + github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241112122353-c208375d0cb3 github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 37fc559fdb5..d4b9a86b490 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1423,8 +1423,8 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1 github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 h1:GDGrC5OGiV0RyM1znYWehSQXyZQWTOzrEeJRYmysPCE= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2/go.mod h1:DsT43c1oTBmp3iQkMcoZOoKThwZvt8X3Pz6UmznJ4GY= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111214917-fce87d3f16f9 h1:NYTC1p+PvI0FXWixkvF3nx1IvDsZB4/HD9NvuQkltk0= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111214917-fce87d3f16f9/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241112122353-c208375d0cb3 h1:PXgUcATBnzB+lA7mHl561/6htqr+PmYLkNXAzRCFryc= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241112122353-c208375d0cb3/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM= github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 h1:yB1x5UXvpZNka+5h57yo1/GrKfXKCqMzChCISpldZx4= diff --git a/integration-tests/testconfig/default.toml b/integration-tests/testconfig/default.toml index 667d277deda..67e13e71796 100644 --- a/integration-tests/testconfig/default.toml +++ b/integration-tests/testconfig/default.toml @@ -30,8 +30,6 @@ chainlink_node_funding = 0.5 # slice of networks to use; at lesat one network must be selected; each selected network must either be already defined in the CTF as a known network, or be defined in # TOML test files as a new network selected_networks = ["simulated"] -# if set to true, networks will be forced to use HTTP instead of WS -force_http = false [PrivateEthereumNetwork] # ethereum version to use; eth1 or eth2 (post-merge) @@ -170,9 +168,6 @@ check_rpc_health_on_start = false # "eip_1559_fee_equalizer" sets the tip/base fee to the higher value in case there's 3+ orders of magnitude difference between them experiments_enabled = [] -# if set to true, SETH will use HTTP instead of WS. This overrides seth.networks specific urls_secret -force_http = false - [Seth.nonce_manager] # rate-limiting of key syncs, to prevent spamming the node with nonce calls key_sync_rate_limit_per_sec = 10 diff --git a/integration-tests/types/config/node/core.go b/integration-tests/types/config/node/core.go index b1eedf3b1d1..5f6712b689c 100644 --- a/integration-tests/types/config/node/core.go +++ b/integration-tests/types/config/node/core.go @@ -86,24 +86,33 @@ func NewConfigFromToml(tomlConfig []byte, opts ...NodeConfigOpt) (*chainlink.Con return &cfg, nil } -func WithPrivateEVMs(networks []blockchain.EVMNetwork, commonChainConfig *evmcfg.Chain, chainSpecificConfig map[int64]evmcfg.Chain, forceHttp bool) NodeConfigOpt { +func WithPrivateEVMs(networks []blockchain.EVMNetwork, commonChainConfig *evmcfg.Chain, chainSpecificConfig map[int64]evmcfg.Chain) NodeConfigOpt { var evmConfigs []*evmcfg.EVMConfig for _, network := range networks { var evmNodes []*evmcfg.Node - URLs := network.URLs - if forceHttp { - URLs = network.HTTPURLs + httpURLsAvailable := len(network.HTTPURLs) > 0 + wsURLsAvailable := len(network.URLs) > 0 + + urlCount := len(network.HTTPURLs) + if wsURLsAvailable { + urlCount = len(network.URLs) } - for i := range URLs { + + for i := 0; i < urlCount; i++ { node := &evmcfg.Node{ - Name: ptr.Ptr(fmt.Sprintf("%s-%d", network.Name, i)), - HTTPURL: itutils.MustURL(network.HTTPURLs[i]), + Name: ptr.Ptr(fmt.Sprintf("%s-%d", network.Name, i)), } - if !forceHttp { + // Assign HTTP URL if available + if httpURLsAvailable && i < len(network.HTTPURLs) { + node.HTTPURL = itutils.MustURL(network.HTTPURLs[i]) + } + // Assign WS URL if available + if wsURLsAvailable && i < len(network.URLs) { node.WSURL = itutils.MustURL(network.URLs[i]) } evmNodes = append(evmNodes, node) } + evmConfig := &evmcfg.EVMConfig{ ChainID: ubig.New(big.NewInt(network.ChainID)), Nodes: evmNodes, @@ -140,7 +149,7 @@ func WithKeySpecificMaxGasPrice(addresses []string, maxGasPriceGWei int64) NodeC } } -func BuildChainlinkNodeConfig(nets []blockchain.EVMNetwork, nodeConfig, commonChain string, configByChain map[string]string, forceHttp bool) (*corechainlink.Config, string, error) { +func BuildChainlinkNodeConfig(nets []blockchain.EVMNetwork, nodeConfig, commonChain string, configByChain map[string]string) (*corechainlink.Config, string, error) { var tomlCfg *corechainlink.Config var err error var commonChainConfig *evmcfg.Chain @@ -166,9 +175,9 @@ func BuildChainlinkNodeConfig(nets []blockchain.EVMNetwork, nodeConfig, commonCh if nodeConfig == "" { tomlCfg = NewConfig( NewBaseConfig(), - WithPrivateEVMs(nets, commonChainConfig, configByChainMap, forceHttp)) + WithPrivateEVMs(nets, commonChainConfig, configByChainMap)) } else { - tomlCfg, err = NewConfigFromToml([]byte(nodeConfig), WithPrivateEVMs(nets, commonChainConfig, configByChainMap, forceHttp)) + tomlCfg, err = NewConfigFromToml([]byte(nodeConfig), WithPrivateEVMs(nets, commonChainConfig, configByChainMap)) if err != nil { return nil, "", err } From 4fb4f170e4f3f80f59faf0226ce2d083c630a23b Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Tue, 12 Nov 2024 13:36:39 +0100 Subject: [PATCH 11/16] Go mod tidy --- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 747009c3894..9b336c943f9 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -18,7 +18,7 @@ require ( github.com/rs/zerolog v1.33.0 github.com/slack-go/slack v0.15.0 github.com/smartcontractkit/chainlink-common v0.3.1-0.20241107134205-25e45ecd73ba - github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111214917-fce87d3f16f9 + github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241112122353-c208375d0cb3 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 github.com/smartcontractkit/chainlink/deployment v0.0.0-00010101000000-000000000000 diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 63f313b6243..f7eec57c424 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1410,8 +1410,8 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1 github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 h1:GDGrC5OGiV0RyM1znYWehSQXyZQWTOzrEeJRYmysPCE= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2/go.mod h1:DsT43c1oTBmp3iQkMcoZOoKThwZvt8X3Pz6UmznJ4GY= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111214917-fce87d3f16f9 h1:NYTC1p+PvI0FXWixkvF3nx1IvDsZB4/HD9NvuQkltk0= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241111214917-fce87d3f16f9/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241112122353-c208375d0cb3 h1:PXgUcATBnzB+lA7mHl561/6htqr+PmYLkNXAzRCFryc= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241112122353-c208375d0cb3/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM= github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 h1:yB1x5UXvpZNka+5h57yo1/GrKfXKCqMzChCISpldZx4= From 06d85df0bea537a1378d9ed35c9b713e207ba960 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Wed, 13 Nov 2024 13:47:36 +0100 Subject: [PATCH 12/16] Update to latest CTF lib --- integration-tests/go.mod | 14 +++++++------- integration-tests/go.sum | 28 ++++++++++++++-------------- integration-tests/load/go.mod | 14 +++++++------- integration-tests/load/go.sum | 28 ++++++++++++++-------------- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index fcc337c047a..0650d05aa5d 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -40,7 +40,7 @@ require ( github.com/smartcontractkit/chainlink-common v0.3.1-0.20241107134205-25e45ecd73ba github.com/smartcontractkit/chainlink-protos/job-distributor v0.4.0 github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 - github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241112122353-c208375d0cb3 + github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14 github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 @@ -62,7 +62,7 @@ require ( golang.org/x/text v0.19.0 google.golang.org/grpc v1.67.1 gopkg.in/guregu/null.v4 v4.0.0 - k8s.io/apimachinery v0.31.1 + k8s.io/apimachinery v0.31.2 ) require ( @@ -508,14 +508,14 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.31.1 // indirect + k8s.io/api v0.31.2 // indirect k8s.io/apiextensions-apiserver v0.31.0 // indirect - k8s.io/cli-runtime v0.31.1 // indirect - k8s.io/client-go v0.31.1 // indirect - k8s.io/component-base v0.31.1 // indirect + k8s.io/cli-runtime v0.31.2 // indirect + k8s.io/client-go v0.31.2 // indirect + k8s.io/component-base v0.31.2 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f // indirect - k8s.io/kubectl v0.31.1 // indirect + k8s.io/kubectl v0.31.2 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect pgregory.net/rapid v1.1.0 // indirect rsc.io/tmplfunc v0.0.3 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index d4b9a86b490..bfcd7faa7c3 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1423,8 +1423,8 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1 github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 h1:GDGrC5OGiV0RyM1znYWehSQXyZQWTOzrEeJRYmysPCE= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2/go.mod h1:DsT43c1oTBmp3iQkMcoZOoKThwZvt8X3Pz6UmznJ4GY= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241112122353-c208375d0cb3 h1:PXgUcATBnzB+lA7mHl561/6htqr+PmYLkNXAzRCFryc= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241112122353-c208375d0cb3/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14 h1:elSS3K5m39sCOvtd43SlAw60gxqAcGmkEDeMp9O+CTQ= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14/go.mod h1:wdHrnYLfZznafXeeneNzxQZjUjfwfcVAQFdopBBp5nI= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM= github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 h1:yB1x5UXvpZNka+5h57yo1/GrKfXKCqMzChCISpldZx4= @@ -2199,24 +2199,24 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= -k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= +k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0= +k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk= k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk= k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk= -k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= -k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/cli-runtime v0.31.1 h1:/ZmKhmZ6hNqDM+yf9s3Y4KEYakNXUn5sod2LWGGwCuk= -k8s.io/cli-runtime v0.31.1/go.mod h1:pKv1cDIaq7ehWGuXQ+A//1OIF+7DI+xudXtExMCbe9U= -k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= -k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= -k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8= -k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w= +k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw= +k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/cli-runtime v0.31.2 h1:7FQt4C4Xnqx8V1GJqymInK0FFsoC+fAZtbLqgXYVOLQ= +k8s.io/cli-runtime v0.31.2/go.mod h1:XROyicf+G7rQ6FQJMbeDV9jqxzkWXTYD6Uxd15noe0Q= +k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc= +k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs= +k8s.io/component-base v0.31.2 h1:Z1J1LIaC0AV+nzcPRFqfK09af6bZ4D1nAOpWsy9owlA= +k8s.io/component-base v0.31.2/go.mod h1:9PeyyFN/drHjtJZMCTkSpQJS3U9OXORnHQqMLDz0sUQ= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f h1:2sXuKesAYbRHxL3aE2PN6zX/gcJr22cjrsej+W784Tc= k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc= -k8s.io/kubectl v0.31.1 h1:ih4JQJHxsEggFqDJEHSOdJ69ZxZftgeZvYo7M/cpp24= -k8s.io/kubectl v0.31.1/go.mod h1:aNuQoR43W6MLAtXQ/Bu4GDmoHlbhHKuyD49lmTC8eJM= +k8s.io/kubectl v0.31.2 h1:gTxbvRkMBwvTSAlobiTVqsH6S8Aa1aGyBcu5xYLsn8M= +k8s.io/kubectl v0.31.2/go.mod h1:EyASYVU6PY+032RrTh5ahtSOMgoDRIux9V1JLKtG5xM= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= nhooyr.io/websocket v1.8.10 h1:mv4p+MnGrLDcPlBoWsvPP7XCzTYMXP9F9eIGoKbgx7Q= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 9b336c943f9..8d10711bb60 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -18,7 +18,7 @@ require ( github.com/rs/zerolog v1.33.0 github.com/slack-go/slack v0.15.0 github.com/smartcontractkit/chainlink-common v0.3.1-0.20241107134205-25e45ecd73ba - github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241112122353-c208375d0cb3 + github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 github.com/smartcontractkit/chainlink/deployment v0.0.0-00010101000000-000000000000 @@ -81,7 +81,7 @@ require ( go.opentelemetry.io/otel/sdk/log v0.6.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect - k8s.io/apimachinery v0.31.1 // indirect + k8s.io/apimachinery v0.31.2 // indirect ) // avoids ambigious imports of indirect dependencies @@ -514,14 +514,14 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.31.1 // indirect + k8s.io/api v0.31.2 // indirect k8s.io/apiextensions-apiserver v0.31.0 // indirect - k8s.io/cli-runtime v0.31.1 // indirect - k8s.io/client-go v0.31.1 // indirect - k8s.io/component-base v0.31.1 // indirect + k8s.io/cli-runtime v0.31.2 // indirect + k8s.io/client-go v0.31.2 // indirect + k8s.io/component-base v0.31.2 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f // indirect - k8s.io/kubectl v0.31.1 // indirect + k8s.io/kubectl v0.31.2 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect pgregory.net/rapid v1.1.0 // indirect rsc.io/tmplfunc v0.0.3 // indirect diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index f7eec57c424..73f3b27e327 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1410,8 +1410,8 @@ github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-1 github.com/smartcontractkit/chainlink-starknet/relayer v0.1.1-0.20241017135645-176a23722fd8/go.mod h1:WkBqgBo+g34Gm5vWkDDl8Fh3Mzd7bF5hXp7rryg0t5o= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2 h1:GDGrC5OGiV0RyM1znYWehSQXyZQWTOzrEeJRYmysPCE= github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2/go.mod h1:DsT43c1oTBmp3iQkMcoZOoKThwZvt8X3Pz6UmznJ4GY= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241112122353-c208375d0cb3 h1:PXgUcATBnzB+lA7mHl561/6htqr+PmYLkNXAzRCFryc= -github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14-0.20241112122353-c208375d0cb3/go.mod h1:6x/HQkd2k6AEsQocr9+ssFvksjnf7s/sTJYMfEyV2I0= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14 h1:elSS3K5m39sCOvtd43SlAw60gxqAcGmkEDeMp9O+CTQ= +github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14/go.mod h1:wdHrnYLfZznafXeeneNzxQZjUjfwfcVAQFdopBBp5nI= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0 h1:VIxK8u0Jd0Q/VuhmsNm6Bls6Tb31H/sA3A/rbc5hnhg= github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0/go.mod h1:lyAu+oMXdNUzEDScj2DXB2IueY+SDXPPfyl/kb63tMM= github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 h1:yB1x5UXvpZNka+5h57yo1/GrKfXKCqMzChCISpldZx4= @@ -2184,24 +2184,24 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= -k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= +k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0= +k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk= k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk= k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk= -k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= -k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/cli-runtime v0.31.1 h1:/ZmKhmZ6hNqDM+yf9s3Y4KEYakNXUn5sod2LWGGwCuk= -k8s.io/cli-runtime v0.31.1/go.mod h1:pKv1cDIaq7ehWGuXQ+A//1OIF+7DI+xudXtExMCbe9U= -k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= -k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= -k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8= -k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w= +k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw= +k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/cli-runtime v0.31.2 h1:7FQt4C4Xnqx8V1GJqymInK0FFsoC+fAZtbLqgXYVOLQ= +k8s.io/cli-runtime v0.31.2/go.mod h1:XROyicf+G7rQ6FQJMbeDV9jqxzkWXTYD6Uxd15noe0Q= +k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc= +k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs= +k8s.io/component-base v0.31.2 h1:Z1J1LIaC0AV+nzcPRFqfK09af6bZ4D1nAOpWsy9owlA= +k8s.io/component-base v0.31.2/go.mod h1:9PeyyFN/drHjtJZMCTkSpQJS3U9OXORnHQqMLDz0sUQ= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f h1:2sXuKesAYbRHxL3aE2PN6zX/gcJr22cjrsej+W784Tc= k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc= -k8s.io/kubectl v0.31.1 h1:ih4JQJHxsEggFqDJEHSOdJ69ZxZftgeZvYo7M/cpp24= -k8s.io/kubectl v0.31.1/go.mod h1:aNuQoR43W6MLAtXQ/Bu4GDmoHlbhHKuyD49lmTC8eJM= +k8s.io/kubectl v0.31.2 h1:gTxbvRkMBwvTSAlobiTVqsH6S8Aa1aGyBcu5xYLsn8M= +k8s.io/kubectl v0.31.2/go.mod h1:EyASYVU6PY+032RrTh5ahtSOMgoDRIux9V1JLKtG5xM= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= nhooyr.io/websocket v1.8.10 h1:mv4p+MnGrLDcPlBoWsvPP7XCzTYMXP9F9eIGoKbgx7Q= From 9a81f445a98ec3e0c236cf68c08607bbadf1e106 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Wed, 13 Nov 2024 14:23:09 +0100 Subject: [PATCH 13/16] Revert config changes needed to run on HTTP only --- core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml index f7e7ce73f12..403ecd7c4b1 100644 --- a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml @@ -2,7 +2,6 @@ ChainID = '11155111' FinalityTagEnabled = true LinkContractAddress = '0x779877A7B0D9E8603169DdbD7836e478b4624789' MinContractPayment = '0.1 link' -LogBroadcasterEnabled = false [GasEstimator] EIP1559DynamicFees = true @@ -16,6 +15,3 @@ GasLimit = 10500000 [HeadTracker] FinalityTagBypass = false - -[NodePool] -NewHeadsPollInterval = '6s' From adcddba053ef1ec912b6adae6039c8d61091eb36 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Wed, 13 Nov 2024 14:29:12 +0100 Subject: [PATCH 14/16] Update dep --- integration-tests/load/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 79ff5f57d48..3f07a6d2aa3 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -17,7 +17,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/rs/zerolog v1.33.0 github.com/slack-go/slack v0.15.0 - github.com/smartcontractkit/chainlink-common v0.3.1-0.20241107134205-25e45ecd73ba + github.com/smartcontractkit/chainlink-common v0.3.1-0.20241112140826-0e2daed34ef6 github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.14 github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9 github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2 From dbe4aea42b9f677a43551c3a6eff8828b25bd7a5 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Wed, 13 Nov 2024 20:45:33 +0100 Subject: [PATCH 15/16] Simplify --- integration-tests/types/config/node/core.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/integration-tests/types/config/node/core.go b/integration-tests/types/config/node/core.go index 5f6712b689c..45c25cd4fcc 100644 --- a/integration-tests/types/config/node/core.go +++ b/integration-tests/types/config/node/core.go @@ -90,11 +90,9 @@ func WithPrivateEVMs(networks []blockchain.EVMNetwork, commonChainConfig *evmcfg var evmConfigs []*evmcfg.EVMConfig for _, network := range networks { var evmNodes []*evmcfg.Node - httpURLsAvailable := len(network.HTTPURLs) > 0 - wsURLsAvailable := len(network.URLs) > 0 urlCount := len(network.HTTPURLs) - if wsURLsAvailable { + if len(network.URLs) > 0 { urlCount = len(network.URLs) } @@ -103,11 +101,11 @@ func WithPrivateEVMs(networks []blockchain.EVMNetwork, commonChainConfig *evmcfg Name: ptr.Ptr(fmt.Sprintf("%s-%d", network.Name, i)), } // Assign HTTP URL if available - if httpURLsAvailable && i < len(network.HTTPURLs) { + if i < len(network.HTTPURLs) { node.HTTPURL = itutils.MustURL(network.HTTPURLs[i]) } // Assign WS URL if available - if wsURLsAvailable && i < len(network.URLs) { + if i < len(network.URLs) { node.WSURL = itutils.MustURL(network.URLs[i]) } evmNodes = append(evmNodes, node) From 3aebfc27bb006730f47c660ff570bb3ab1b2beb0 Mon Sep 17 00:00:00 2001 From: davidcauchi Date: Thu, 14 Nov 2024 11:59:03 +0100 Subject: [PATCH 16/16] Simplify --- integration-tests/types/config/node/core.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/integration-tests/types/config/node/core.go b/integration-tests/types/config/node/core.go index 45c25cd4fcc..b3c20a26455 100644 --- a/integration-tests/types/config/node/core.go +++ b/integration-tests/types/config/node/core.go @@ -91,10 +91,9 @@ func WithPrivateEVMs(networks []blockchain.EVMNetwork, commonChainConfig *evmcfg for _, network := range networks { var evmNodes []*evmcfg.Node + // The CL node cannot have missing HTTP urls. If there are more WS URLs it will fail validation. + // If len(network.HTTPURLs) == 2 then len(network.URLs) must be 2 or less. urlCount := len(network.HTTPURLs) - if len(network.URLs) > 0 { - urlCount = len(network.URLs) - } for i := 0; i < urlCount; i++ { node := &evmcfg.Node{