Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TT-1992] use CTF/lib that supports Docker running go-ethereum v1.15.0 #16477

Merged
merged 10 commits into from
Feb 26, 2025
5 changes: 5 additions & 0 deletions .changeset/swift-nails-yell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

go.mod update in core/scripts #updated
4 changes: 1 addition & 3 deletions core/scripts/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/smartcontractkit/chainlink/core/scripts

go 1.24

toolchain go1.24.0
go 1.24.0

// Make sure we're working with the latest chainlink libs
replace github.com/smartcontractkit/chainlink/v2 => ../../
Expand Down
4 changes: 1 addition & 3 deletions deployment/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/smartcontractkit/chainlink/deployment

go 1.24

toolchain go1.24.0
go 1.24.0

// Make sure we're working with the latest chainlink libs
replace github.com/smartcontractkit/chainlink/v2 => ../
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/smartcontractkit/chainlink/v2

go 1.24

toolchain go1.24.0
go 1.24.0

require (
github.com/Depado/ginprom v1.8.0
Expand Down
10 changes: 5 additions & 5 deletions integration-tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ require (
github.com/smartcontractkit/chainlink-common v0.4.2-0.20250221174903-e1e47fdb11b0
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250213145514-41d874782c02
github.com/smartcontractkit/chainlink-protos/job-distributor v0.9.0
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5-0.20250225210020-fc215b29321e
github.com/smartcontractkit/chainlink-testing-framework/lib v1.51.1-0.20250225210020-fc215b29321e
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.1-0.20250225210020-fc215b29321e
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.0
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.51.0
github.com/smartcontractkit/chainlink-testing-framework/sentinel v0.1.2
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.10
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.6-0.20250225210020-fc215b29321e
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.0
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.0
github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298
github.com/spf13/cobra v1.8.1
github.com/stretchr/testify v1.10.0
Expand Down
20 changes: 10 additions & 10 deletions integration-tests/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1458,18 +1458,18 @@ github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14a/go.mod h1:aFm1QC/n99mVeBDtv0SE0co56+IECY6Y1fR3OfNYy3c=
github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.8-0.20250225210020-fc215b29321e h1:6poVaumg1KZYW/K8Aeip2VN2k9TnSjK6ujwfxJnIsoY=
github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.8-0.20250225210020-fc215b29321e/go.mod h1:tnyujVNgajqe67i2/0iwS4Y3mvbA30XBQWLEAArpwfw=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5-0.20250225210020-fc215b29321e h1:2LFrQLx5VoilcbmiDC9+0rENoNLNECEVYYj3c/VDpHs=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5-0.20250225210020-fc215b29321e/go.mod h1:SKBYQvtnl3OqOTr5aQyt9YbIckuNNn40LOJUCR0vlMo=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.51.1-0.20250225210020-fc215b29321e h1:8fgAWzBdPrJcqX/QJMxYB3Xoi3v0IZkML7pOiLyV/tQ=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.51.1-0.20250225210020-fc215b29321e/go.mod h1:jNxIJa9Fl/zM7rFahUFE8E55VGPC/2e6ilqVKoSbr8U=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.1-0.20250225210020-fc215b29321e h1:g1fOH4P+JLU70bpjQVL7viDU7EhB+JKr1SpvpIDce+g=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.1-0.20250225210020-fc215b29321e/go.mod h1:ym1yBKknQkGfgSQF7EGXSevDuex1YZbz+zgDwRvhY3U=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5 h1:S5HND0EDtlA+xp2E+mD11DlUTp2wD6uojwixye8ZB/k=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5/go.mod h1:SKBYQvtnl3OqOTr5aQyt9YbIckuNNn40LOJUCR0vlMo=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.0 h1:rNjLZrwY3TcrANHVz/JUm55vufzoeRogSlgjAH7plvU=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.0/go.mod h1:jNxIJa9Fl/zM7rFahUFE8E55VGPC/2e6ilqVKoSbr8U=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.51.0 h1:+6L/PVxWsaYCr9jmxtKfyCcEJm1o6UaKrFJU9jAiZwA=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.51.0/go.mod h1:ym1yBKknQkGfgSQF7EGXSevDuex1YZbz+zgDwRvhY3U=
github.com/smartcontractkit/chainlink-testing-framework/sentinel v0.1.2 h1:ihRlWrii5nr4RUuMu1hStTbwFvVuHUDoQQwXmCU5IdQ=
github.com/smartcontractkit/chainlink-testing-framework/sentinel v0.1.2/go.mod h1:J1Za5EuI/vWDsQSIh6qbPXlVvuEhmHmnvLQBN0XVxqA=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.10 h1:Yf+n3T/fnUWcYyfe7bsygV4sWAkNo0QhN58APJFIKIc=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.10/go.mod h1:05duR85P8YHuIfIkA7sn2bvrhKo/pDpFKV2rliYHNOo=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.6-0.20250225210020-fc215b29321e h1:Xuulg3EfQdsgO4j+IaMkffpmd0UbIcppB4wsIafKPsA=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.6-0.20250225210020-fc215b29321e/go.mod h1:eqV2n0vpqnY5N51je5/1vC/Qm8MMXVKvOXjLM+53Sog=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.0 h1:cH+/lRpm7VN1a/tX7HmJCtQfZjLRyw1khG7CEQS94jA=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.0/go.mod h1:kHYJnZUqiPF7/xN5273prV+srrLJkS77GbBXHLKQpx0=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.0 h1:qaLw7J7oRRsj+lUzzIjGVlXAVNmkAEwjj7xTXe0hcAk=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.0/go.mod h1:eqV2n0vpqnY5N51je5/1vC/Qm8MMXVKvOXjLM+53Sog=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7/go.mod h1:FX7/bVdoep147QQhsOPkYsPEXhGZjeYx6lBSaSXtZOA=
github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298 h1:PKiqnVOTChlH4a4ljJKL3OKGRgYfIpJS4YD1daAIKks=
Expand Down
10 changes: 5 additions & 5 deletions integration-tests/load/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ require (
github.com/smartcontractkit/chainlink-ccip v0.0.0-20250226083129-e596590f48f7
github.com/smartcontractkit/chainlink-common v0.4.2-0.20250221174903-e1e47fdb11b0
github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250213145514-41d874782c02
github.com/smartcontractkit/chainlink-testing-framework/lib v1.51.1-0.20250225210020-fc215b29321e
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.14-0.20250225174253-0fe1e95e89b2
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.6-0.20250225210020-fc215b29321e
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.0
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.0
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.0
github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20241009055228-33d0c0bf38de
github.com/stretchr/testify v1.10.0
github.com/wiremock/go-wiremock v1.9.0
Expand Down Expand Up @@ -440,8 +440,8 @@ require (
github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 // indirect
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14a // indirect
github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.8-0.20250225210020-fc215b29321e // indirect
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5-0.20250225210020-fc215b29321e // indirect
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.1-0.20250225210020-fc215b29321e // indirect
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5 // indirect
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.51.0 // indirect
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298 // indirect
github.com/smartcontractkit/mcms v0.12.2 // indirect
Expand Down
20 changes: 10 additions & 10 deletions integration-tests/load/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1443,16 +1443,16 @@ github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14
github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14a/go.mod h1:aFm1QC/n99mVeBDtv0SE0co56+IECY6Y1fR3OfNYy3c=
github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.8-0.20250225210020-fc215b29321e h1:6poVaumg1KZYW/K8Aeip2VN2k9TnSjK6ujwfxJnIsoY=
github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.8-0.20250225210020-fc215b29321e/go.mod h1:tnyujVNgajqe67i2/0iwS4Y3mvbA30XBQWLEAArpwfw=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5-0.20250225210020-fc215b29321e h1:2LFrQLx5VoilcbmiDC9+0rENoNLNECEVYYj3c/VDpHs=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5-0.20250225210020-fc215b29321e/go.mod h1:SKBYQvtnl3OqOTr5aQyt9YbIckuNNn40LOJUCR0vlMo=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.51.1-0.20250225210020-fc215b29321e h1:8fgAWzBdPrJcqX/QJMxYB3Xoi3v0IZkML7pOiLyV/tQ=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.51.1-0.20250225210020-fc215b29321e/go.mod h1:jNxIJa9Fl/zM7rFahUFE8E55VGPC/2e6ilqVKoSbr8U=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.1-0.20250225210020-fc215b29321e h1:g1fOH4P+JLU70bpjQVL7viDU7EhB+JKr1SpvpIDce+g=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.1-0.20250225210020-fc215b29321e/go.mod h1:ym1yBKknQkGfgSQF7EGXSevDuex1YZbz+zgDwRvhY3U=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.14-0.20250225174253-0fe1e95e89b2 h1:DFP15nHtZntUnhAsHFxeE40jgHf5qgBX9TvzX49yRdU=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.14-0.20250225174253-0fe1e95e89b2/go.mod h1:kHYJnZUqiPF7/xN5273prV+srrLJkS77GbBXHLKQpx0=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.6-0.20250225210020-fc215b29321e h1:Xuulg3EfQdsgO4j+IaMkffpmd0UbIcppB4wsIafKPsA=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.6-0.20250225210020-fc215b29321e/go.mod h1:eqV2n0vpqnY5N51je5/1vC/Qm8MMXVKvOXjLM+53Sog=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5 h1:S5HND0EDtlA+xp2E+mD11DlUTp2wD6uojwixye8ZB/k=
github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5/go.mod h1:SKBYQvtnl3OqOTr5aQyt9YbIckuNNn40LOJUCR0vlMo=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.0 h1:rNjLZrwY3TcrANHVz/JUm55vufzoeRogSlgjAH7plvU=
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.0/go.mod h1:jNxIJa9Fl/zM7rFahUFE8E55VGPC/2e6ilqVKoSbr8U=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.51.0 h1:+6L/PVxWsaYCr9jmxtKfyCcEJm1o6UaKrFJU9jAiZwA=
github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.51.0/go.mod h1:ym1yBKknQkGfgSQF7EGXSevDuex1YZbz+zgDwRvhY3U=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.0 h1:cH+/lRpm7VN1a/tX7HmJCtQfZjLRyw1khG7CEQS94jA=
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.0/go.mod h1:kHYJnZUqiPF7/xN5273prV+srrLJkS77GbBXHLKQpx0=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.0 h1:qaLw7J7oRRsj+lUzzIjGVlXAVNmkAEwjj7xTXe0hcAk=
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.0/go.mod h1:eqV2n0vpqnY5N51je5/1vC/Qm8MMXVKvOXjLM+53Sog=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7/go.mod h1:FX7/bVdoep147QQhsOPkYsPEXhGZjeYx6lBSaSXtZOA=
github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298 h1:PKiqnVOTChlH4a4ljJKL3OKGRgYfIpJS4YD1daAIKks=
Expand Down
9 changes: 7 additions & 2 deletions integration-tests/testsetups/automation_benchmark.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/pkg/errors"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
Expand Down Expand Up @@ -230,10 +231,14 @@ func (k *KeeperBenchmarkTest) Run() {
var startedObservations = atomic.Int32{}
var finishedObservations = atomic.Int32{}

// since Seth can also be using simulated.Backend we need to make sure we are using ethclient.Client
sethAsEthClient, ok := k.chainClient.Client.(*ethclient.Client)
require.True(k.t, ok, "chainClient (Seth) client should be an ethclient.Client")

// We create as many channels as listening goroutines (1 per upkeep). In the background we will be fanning out
// headers that we get from a single channel connected to EVM node to all upkeep-specific channels.
headerCh := make(chan *blockchain.SafeEVMHeader, 10)
sub, err := k.chainClient.Client.Client().EthSubscribe(context.Background(), headerCh, "newHeads")
sub, err := sethAsEthClient.Client().EthSubscribe(context.Background(), headerCh, "newHeads")
require.NoError(k.t, err, "Subscribing to new headers for upkeep observation shouldn't fail")

totalNumberOfChannels := 0
Expand Down Expand Up @@ -279,7 +284,7 @@ func (k *KeeperBenchmarkTest) Run() {
// we use infinite loop here on purposes, these nodes can be down for extended periods of time ¯\_(ツ)_/¯
RECONNECT:
for {
sub, err = k.chainClient.Client.Client().EthSubscribe(context.Background(), headerCh, "newHeads")
sub, err = sethAsEthClient.Client().EthSubscribe(context.Background(), headerCh, "newHeads")
if err == nil {
break RECONNECT
}
Expand Down
6 changes: 0 additions & 6 deletions integration-tests/testsetups/ocr.go
Original file line number Diff line number Diff line change
Expand Up @@ -1314,9 +1314,3 @@ func (l ocrTestChaosListener) OnChaosEnded(_ havoc.Chaos) {

func (l ocrTestChaosListener) OnChaosStatusUnknown(_ havoc.Chaos) {
}

func (l ocrTestChaosListener) OnScheduleCreated(_ havoc.Schedule) {
}

func (l ocrTestChaosListener) OnScheduleDeleted(_ havoc.Schedule) {
}
82 changes: 64 additions & 18 deletions integration-tests/wrappers/contract_caller.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,20 @@ func MustNewRetryingWrappedContractBackend(sethClient *seth.Client, logger zerol
}
}

func (w *WrappedContractBackend) getGethClient() *ethclient.Client {
func (w *WrappedContractBackend) getGethClient() (*ethclient.Client, error) {
if w.sethClient != nil {
return w.sethClient.Client
if asEthClient, ok := w.sethClient.Client.(*ethclient.Client); ok {
return asEthClient, nil
}

return nil, fmt.Errorf("seth client is not an ethclient, but %T", w.sethClient.Client)
}

if w.evmClient != nil {
return w.evmClient.GetEthClient()
return w.evmClient.GetEthClient(), nil
}

panic("No client found")
return nil, errors.New("no client found")
}

func (w *WrappedContractBackend) CodeAt(ctx context.Context, contract common.Address, blockNumber *big.Int) ([]byte, error) {
Expand All @@ -81,7 +85,10 @@ func (w *WrappedContractBackend) CodeAt(ctx context.Context, contract common.Add
}

var fn = func() ([]byte, error) {
client := w.getGethClient()
client, clientErr := w.getGethClient()
if clientErr != nil {
return nil, clientErr
}
return client.CodeAt(ctx, contract, blockNumber)
}

Expand All @@ -95,7 +102,10 @@ func (w *WrappedContractBackend) PendingCodeAt(ctx context.Context, contract com
}

var fn = func() ([]byte, error) {
client := w.getGethClient()
client, clientErr := w.getGethClient()
if clientErr != nil {
return nil, clientErr
}
return client.PendingCodeAt(ctx, contract)
}

Expand All @@ -109,7 +119,10 @@ func (w *WrappedContractBackend) CodeAtHash(ctx context.Context, contract common
}

var fn = func() ([]byte, error) {
client := w.getGethClient()
client, clientErr := w.getGethClient()
if clientErr != nil {
return nil, clientErr
}
return client.CodeAtHash(ctx, contract, blockHash)
}

Expand All @@ -123,7 +136,10 @@ func (w *WrappedContractBackend) CallContractAtHash(ctx context.Context, call et
}

var fn = func() ([]byte, error) {
client := w.getGethClient()
client, clientErr := w.getGethClient()
if clientErr != nil {
return nil, clientErr
}
return client.CallContractAtHash(ctx, call, blockHash)
}

Expand All @@ -137,7 +153,10 @@ func (w *WrappedContractBackend) HeaderByNumber(ctx context.Context, number *big
}

var fn = func() (*types.Header, error) {
client := w.getGethClient()
client, clientErr := w.getGethClient()
if clientErr != nil {
return nil, clientErr
}
return client.HeaderByNumber(ctx, number)
}

Expand All @@ -151,7 +170,10 @@ func (w *WrappedContractBackend) PendingNonceAt(ctx context.Context, account com
}

var fn = func() (uint64, error) {
client := w.getGethClient()
client, clientErr := w.getGethClient()
if clientErr != nil {
return 0, clientErr
}
return client.PendingNonceAt(ctx, account)
}

Expand All @@ -165,7 +187,10 @@ func (w *WrappedContractBackend) SuggestGasPrice(ctx context.Context) (*big.Int,
}

var fn = func() (*big.Int, error) {
client := w.getGethClient()
client, clientErr := w.getGethClient()
if clientErr != nil {
return nil, clientErr
}
return client.SuggestGasPrice(ctx)
}

Expand All @@ -179,7 +204,10 @@ func (w *WrappedContractBackend) SuggestGasTipCap(ctx context.Context) (*big.Int
}

var fn = func() (*big.Int, error) {
client := w.getGethClient()
client, clientErr := w.getGethClient()
if clientErr != nil {
return nil, clientErr
}
return client.SuggestGasTipCap(ctx)
}

Expand All @@ -193,7 +221,10 @@ func (w *WrappedContractBackend) EstimateGas(ctx context.Context, call ethereum.
}

var fn = func() (uint64, error) {
client := w.getGethClient()
client, clientErr := w.getGethClient()
if clientErr != nil {
return 0, clientErr
}
return client.EstimateGas(ctx, call)
}

Expand All @@ -206,7 +237,10 @@ func (w *WrappedContractBackend) SendTransaction(ctx context.Context, tx *types.
return errors.Wrapf(ctxErr, "the context you passed had an error set. Won't call SendTransaction")
}

client := w.getGethClient()
client, clientErr := w.getGethClient()
if clientErr != nil {
return clientErr
}
return client.SendTransaction(ctx, tx)
}

Expand All @@ -216,7 +250,10 @@ func (w *WrappedContractBackend) FilterLogs(ctx context.Context, query ethereum.
}

var fn = func() ([]types.Log, error) {
client := w.getGethClient()
client, clientErr := w.getGethClient()
if clientErr != nil {
return nil, clientErr
}
return client.FilterLogs(ctx, query)
}

Expand All @@ -230,7 +267,10 @@ func (w *WrappedContractBackend) SubscribeFilterLogs(ctx context.Context, query
}

var fn = func() (ethereum.Subscription, error) {
client := w.getGethClient()
client, clientErr := w.getGethClient()
if clientErr != nil {
return nil, clientErr
}
return client.SubscribeFilterLogs(ctx, query, ch)
}

Expand All @@ -245,7 +285,10 @@ func (w *WrappedContractBackend) CallContract(ctx context.Context, msg ethereum.

var fn = func() ([]byte, error) {
var hex hexutil.Bytes
client := w.getGethClient()
client, clientErr := w.getGethClient()
if clientErr != nil {
return nil, clientErr
}
err := client.Client().CallContext(ctx, &hex, "eth_call", evmClient.ToBackwardCompatibleCallArg(msg), evmClient.ToBackwardCompatibleBlockNumArg(blockNumber))
if err != nil {
return nil, err
Expand All @@ -264,7 +307,10 @@ func (w *WrappedContractBackend) PendingCallContract(ctx context.Context, msg et

var fn = func() ([]byte, error) {
var hex hexutil.Bytes
client := w.getGethClient()
client, clientErr := w.getGethClient()
if clientErr != nil {
return nil, clientErr
}
err := client.Client().CallContext(ctx, &hex, "eth_call", evmClient.ToBackwardCompatibleCallArg(msg), "pending")
if err != nil {
return nil, err
Expand Down
10 changes: 4 additions & 6 deletions system-tests/lib/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/smartcontractkit/chainlink/system-tests/lib

go 1.24

toolchain go1.24.0
go 1.24.0

require (
github.com/smartcontractkit/chainlink/deployment v0.0.0-20250221182743-098d1b0a763a
Expand All @@ -21,9 +19,9 @@ require (
github.com/rs/zerolog v1.33.0
github.com/smartcontractkit/chainlink-common v0.4.2-0.20250221174903-e1e47fdb11b0
github.com/smartcontractkit/chainlink-protos/job-distributor v0.9.0
github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.4
github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.23
github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.10
github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.8
github.com/smartcontractkit/chainlink-testing-framework/lib v1.52.0
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.0
google.golang.org/grpc v1.70.0
gopkg.in/yaml.v3 v3.0.1
)
Expand Down
Loading
Loading