From b72db164ec4a84d183279d29ed9ee1bcc331c673 Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Tue, 31 Mar 2026 13:33:06 -0500 Subject: [PATCH] bump go 1.26.1 --- .tool-versions | 2 +- common/chains/mocks/chain.go | 19 ++------ common/log/mocks/broadcast.go | 3 +- common/log/mocks/broadcaster.go | 6 +-- common/logpoller/mocks/log_poller.go | 11 ++--- common/txmgr/mocks/broadcaster.go | 8 ++-- common/txmgr/mocks/chain_receipt.go | 1 - common/txmgr/mocks/confirmer.go | 11 ++--- common/txmgr/mocks/evm_tx_store.go | 12 ++--- common/txmgr/mocks/tracker.go | 5 +-- common/txmgr/mocks/tx_manager.go | 15 ++----- common/txmgr/types/mocks/finalizer.go | 1 - common/txmgr/types/mocks/forwarder_manager.go | 1 - common/txmgr/types/mocks/key_store.go | 1 - .../txmgr/types/mocks/tx_attempt_builder.go | 8 +--- common/txmgr/types/mocks/tx_store.go | 12 ++--- common/txmgr/types/mocks/tx_strategy.go | 3 +- core/bridges/mocks/orm.go | 11 ++--- .../ccip/configs/evm/contract_reader.go | 4 +- .../mocks/contract_transmitter_factory.go | 7 +-- core/capabilities/mocks/base_capability.go | 1 - core/capabilities/mocks/executable.go | 1 - .../executable_and_trigger_capability.go | 1 - .../mocks/executable_capability.go | 1 - core/capabilities/mocks/trigger_capability.go | 1 - core/capabilities/mocks/trigger_executable.go | 1 - .../remote/types/mocks/dispatcher.go | 3 +- .../targets/mocks/contract_writer.go | 3 +- core/capabilities/vault/mocks/authorizer.go | 3 +- core/chainlink.Dockerfile | 2 +- core/config/mocks/telemetry_ingress.go | 4 +- core/internal/mocks/application.go | 44 +++++-------------- core/internal/mocks/flags.go | 9 +--- core/internal/mocks/flux_aggregator.go | 9 +--- core/scripts/ccip/manual-execution/go.mod | 2 +- .../v1/proof-of-reserve/cron-based/go.mod | 2 +- .../examples/workflows/v2/cron/go.mod | 2 +- .../examples/workflows/v2/http/go.mod | 2 +- .../examples/workflows/v2/http_simple/go.mod | 2 +- .../examples/workflows/v2/node-mode/go.mod | 2 +- .../v2/proof-of-reserve/cron-based/go.mod | 2 +- .../examples/workflows/v2/time/go.mod | 2 +- .../workflows/v2/time_consensus/go.mod | 2 +- core/scripts/go.mod | 2 +- core/services/blockhashstore/mocks/bhs.go | 1 - core/services/ccip/mocks/orm.go | 4 +- .../chainlink/mocks/general_config.go | 15 +++---- .../feeds/mocks/connections_manager.go | 1 - core/services/feeds/mocks/orm.go | 7 +-- core/services/feeds/mocks/service.go | 1 - core/services/fluxmonitorv2/mocks/flags.go | 4 +- .../mocks/key_store_interface.go | 1 - core/services/fluxmonitorv2/mocks/orm.go | 5 +-- core/services/functions/mocks/orm.go | 3 +- .../connector/mocks/gateway_connector.go | 7 +-- .../v2/mocks/http_trigger_handler.go | 7 +-- .../allowlist/mocks/onchain_allowlist.go | 1 - .../handlers/functions/allowlist/mocks/orm.go | 1 - .../mocks/onchain_subscriptions.go | 1 - core/services/gateway/handlers/mocks/don.go | 1 - .../gateway/handlers/mocks/handler.go | 8 +--- .../gateway/network/httpclient_test.go | 18 ++++---- .../gateway/network/parse_go126_test.go | 8 ++++ core/services/gateway/network/parse_test.go | 8 ++++ core/services/job/mocks/kv_store.go | 4 +- core/services/job/mocks/orm.go | 12 ++--- core/services/job/mocks/spawner.go | 3 +- core/services/keystore/mocks/eth.go | 4 -- core/services/keystore/mocks/ocr.go | 3 +- core/services/keystore/mocks/ocr2.go | 3 +- core/services/keystore/mocks/p2p.go | 3 +- core/services/keystore/mocks/solana.go | 3 +- core/services/keystore/mocks/starknet.go | 3 +- core/services/keystore/mocks/sui.go | 3 +- core/services/keystore/mocks/ton.go | 3 +- core/services/keystore/mocks/tron.go | 3 +- core/services/keystore/mocks/vrf.go | 3 +- core/services/keystore/mocks/workflow.go | 3 +- .../ocr/mocks/ocr_contract_tracker_db.go | 6 +-- .../mocks/token_pool_batched_reader_mock.go | 1 - .../mocks/commit_store_reader_mock.go | 4 +- .../contracts/evm2_evm_off_ramp_interface.go | 9 +--- .../mocks/price_registry_reader_mock.go | 3 +- .../ccipdb/mocks/price_service_mock.go | 6 +-- .../pricegetter/all_price_getter_mock.go | 1 - .../plugins/ccip/internal/pricegetter/mock.go | 1 - .../prices/gas_price_estimator_exec_mock.go | 1 - .../ccip/prices/gas_price_estimator_mock.go | 1 - .../plugins/ccip/tokendata/reader_mock.go | 1 - .../evmregistry/v20/mocks/registry.go | 5 +-- .../evmregistry/v21/mocks/registry.go | 5 +-- core/services/p2p/types/mocks/peer.go | 3 +- core/services/p2p/types/mocks/shared_peer.go | 3 +- core/services/pipeline/mocks/orm.go | 9 ++-- core/services/pipeline/mocks/runner.go | 6 +-- .../evm/types/mocks/log_poller_wrapper.go | 1 - core/services/s4/mocks/orm.go | 6 +-- core/services/s4/mocks/storage.go | 4 +- .../monitoring_endpoint_generator_mock.go | 3 +- core/services/vrf/mocks/fee_config.go | 2 - .../mocks/external_initiator_manager.go | 1 - .../metering/mocks/billing_client.go | 1 - .../sessions/mocks/authentication_provider.go | 9 ++-- .../v1_0/mocks/workflow_registry_interface.go | 9 +--- deployment/go.mod | 2 +- devenv/fakes/go.mod | 2 +- devenv/go.mod | 2 +- go.mod | 2 +- integration-tests/.tool-versions | 2 +- integration-tests/go.mod | 2 +- integration-tests/load/go.mod | 2 +- plugins/chainlink.Dockerfile | 2 +- system-tests/lib/go.mod | 2 +- .../proof-of-reserve/cron-based/go.mod | 2 +- system-tests/tests/go.mod | 2 +- .../tests/regression/cre/consensus/go.mod | 2 +- .../cre/evm/evmread-negative/go.mod | 2 +- .../cre/evm/evmwrite-negative/go.mod | 2 +- .../cre/evm/logtrigger-negative/go.mod | 2 +- system-tests/tests/regression/cre/http/go.mod | 2 +- .../regression/cre/httpaction-negative/go.mod | 2 +- .../tests/smoke/cre/evm/evmread/go.mod | 2 +- .../tests/smoke/cre/evm/logtrigger/go.mod | 2 +- .../tests/smoke/cre/httpaction/go.mod | 2 +- .../tests/smoke/cre/solana/solwrite/go.mod | 2 +- .../tests/smoke/cre/vaultsecret/go.mod | 2 +- 126 files changed, 179 insertions(+), 365 deletions(-) create mode 100644 core/services/gateway/network/parse_go126_test.go create mode 100644 core/services/gateway/network/parse_test.go diff --git a/.tool-versions b/.tool-versions index 1fbc9c600ff..fffe52aab70 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,4 @@ -golang 1.25.3 +golang 1.26.1 mockery 2.53.0 nodejs 20.13.1 pnpm 10.6.5 diff --git a/common/chains/mocks/chain.go b/common/chains/mocks/chain.go index 4b5adf4134e..208d69c16b2 100644 --- a/common/chains/mocks/chain.go +++ b/common/chains/mocks/chain.go @@ -3,34 +3,23 @@ package mocks import ( + context "context" big "math/big" common "github.com/ethereum/go-ethereum/common" client "github.com/smartcontractkit/chainlink-evm/pkg/client" - config "github.com/smartcontractkit/chainlink-evm/pkg/config" - - context "context" - gas "github.com/smartcontractkit/chainlink-evm/pkg/gas" - heads "github.com/smartcontractkit/chainlink-framework/chains/heads" - log "github.com/smartcontractkit/chainlink-evm/pkg/log" - logger "github.com/smartcontractkit/chainlink-common/pkg/logger" - + types "github.com/smartcontractkit/chainlink-common/pkg/types" + log "github.com/smartcontractkit/chainlink-evm/pkg/log" logpoller "github.com/smartcontractkit/chainlink-evm/pkg/logpoller" - - mock "github.com/stretchr/testify/mock" - monitor "github.com/smartcontractkit/chainlink-evm/pkg/monitor" - pkgtypes "github.com/smartcontractkit/chainlink-evm/pkg/types" - txmgr "github.com/smartcontractkit/chainlink-framework/chains/txmgr" - - types "github.com/smartcontractkit/chainlink-common/pkg/types" + mock "github.com/stretchr/testify/mock" ) // Chain is an autogenerated mock type for the Chain type diff --git a/common/log/mocks/broadcast.go b/common/log/mocks/broadcast.go index bf2c136ed13..bd92e1b6367 100644 --- a/common/log/mocks/broadcast.go +++ b/common/log/mocks/broadcast.go @@ -7,9 +7,8 @@ import ( common "github.com/ethereum/go-ethereum/common" - mock "github.com/stretchr/testify/mock" - types "github.com/ethereum/go-ethereum/core/types" + mock "github.com/stretchr/testify/mock" ) // Broadcast is an autogenerated mock type for the Broadcast type diff --git a/common/log/mocks/broadcaster.go b/common/log/mocks/broadcaster.go index c73a7ae0af4..2cfa2dc6fa1 100644 --- a/common/log/mocks/broadcaster.go +++ b/common/log/mocks/broadcaster.go @@ -5,12 +5,10 @@ package mocks import ( context "context" - log "github.com/smartcontractkit/chainlink-evm/pkg/log" - mock "github.com/stretchr/testify/mock" - sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" - + log "github.com/smartcontractkit/chainlink-evm/pkg/log" types "github.com/smartcontractkit/chainlink-evm/pkg/types" + mock "github.com/stretchr/testify/mock" ) // Broadcaster is an autogenerated mock type for the Broadcaster type diff --git a/common/logpoller/mocks/log_poller.go b/common/logpoller/mocks/log_poller.go index f53a046490f..34be649211b 100644 --- a/common/logpoller/mocks/log_poller.go +++ b/common/logpoller/mocks/log_poller.go @@ -4,18 +4,13 @@ package mocks import ( context "context" + time "time" common "github.com/ethereum/go-ethereum/common" - - logpoller "github.com/smartcontractkit/chainlink-evm/pkg/logpoller" - - mock "github.com/stretchr/testify/mock" - query "github.com/smartcontractkit/chainlink-common/pkg/types/query" - - time "time" - + logpoller "github.com/smartcontractkit/chainlink-evm/pkg/logpoller" types "github.com/smartcontractkit/chainlink-evm/pkg/types" + mock "github.com/stretchr/testify/mock" ) // LogPoller is an autogenerated mock type for the LogPoller type diff --git a/common/txmgr/mocks/broadcaster.go b/common/txmgr/mocks/broadcaster.go index dd2ff7a923f..b8eeee44c40 100644 --- a/common/txmgr/mocks/broadcaster.go +++ b/common/txmgr/mocks/broadcaster.go @@ -3,14 +3,12 @@ package mocks import ( - common "github.com/ethereum/go-ethereum/common" - chains "github.com/smartcontractkit/chainlink-framework/chains" - context "context" - mock "github.com/stretchr/testify/mock" - + common "github.com/ethereum/go-ethereum/common" + chains "github.com/smartcontractkit/chainlink-framework/chains" txmgr "github.com/smartcontractkit/chainlink-framework/chains/txmgr" + mock "github.com/stretchr/testify/mock" ) // Broadcaster is an autogenerated mock type for the BroadcasterI type diff --git a/common/txmgr/mocks/chain_receipt.go b/common/txmgr/mocks/chain_receipt.go index e886a3ff704..cbf9c1bb804 100644 --- a/common/txmgr/mocks/chain_receipt.go +++ b/common/txmgr/mocks/chain_receipt.go @@ -7,7 +7,6 @@ import ( common "github.com/ethereum/go-ethereum/common" chains "github.com/smartcontractkit/chainlink-framework/chains" - mock "github.com/stretchr/testify/mock" ) diff --git a/common/txmgr/mocks/confirmer.go b/common/txmgr/mocks/confirmer.go index 13e98ebeef4..67ae0adaa59 100644 --- a/common/txmgr/mocks/confirmer.go +++ b/common/txmgr/mocks/confirmer.go @@ -3,16 +3,13 @@ package mocks import ( - common "github.com/ethereum/go-ethereum/common" - chains "github.com/smartcontractkit/chainlink-framework/chains" - context "context" - mock "github.com/stretchr/testify/mock" - - txmgr "github.com/smartcontractkit/chainlink-framework/chains/txmgr" - + common "github.com/ethereum/go-ethereum/common" types "github.com/smartcontractkit/chainlink-evm/pkg/types" + chains "github.com/smartcontractkit/chainlink-framework/chains" + txmgr "github.com/smartcontractkit/chainlink-framework/chains/txmgr" + mock "github.com/stretchr/testify/mock" ) // Confirmer is an autogenerated mock type for the ConfirmerI type diff --git a/common/txmgr/mocks/evm_tx_store.go b/common/txmgr/mocks/evm_tx_store.go index eaf6241fafd..da1ea938e11 100644 --- a/common/txmgr/mocks/evm_tx_store.go +++ b/common/txmgr/mocks/evm_tx_store.go @@ -5,22 +5,16 @@ package mocks import ( context "context" big "math/big" + time "time" common "github.com/ethereum/go-ethereum/common" - gas "github.com/smartcontractkit/chainlink-evm/pkg/gas" - + pkgtypes "github.com/smartcontractkit/chainlink-evm/pkg/types" mock "github.com/stretchr/testify/mock" - null "gopkg.in/guregu/null.v4" - pkgtypes "github.com/smartcontractkit/chainlink-evm/pkg/types" - - time "time" - - types "github.com/smartcontractkit/chainlink-framework/chains/txmgr/types" - uuid "github.com/google/uuid" + types "github.com/smartcontractkit/chainlink-framework/chains/txmgr/types" ) // EvmTxStore is an autogenerated mock type for the EvmTxStore type diff --git a/common/txmgr/mocks/tracker.go b/common/txmgr/mocks/tracker.go index 6b47c999506..10aa6943637 100644 --- a/common/txmgr/mocks/tracker.go +++ b/common/txmgr/mocks/tracker.go @@ -3,11 +3,10 @@ package mocks import ( - common "github.com/ethereum/go-ethereum/common" - chains "github.com/smartcontractkit/chainlink-framework/chains" - context "context" + common "github.com/ethereum/go-ethereum/common" + chains "github.com/smartcontractkit/chainlink-framework/chains" mock "github.com/stretchr/testify/mock" ) diff --git a/common/txmgr/mocks/tx_manager.go b/common/txmgr/mocks/tx_manager.go index bb45f48673e..1d65b2aa3cf 100644 --- a/common/txmgr/mocks/tx_manager.go +++ b/common/txmgr/mocks/tx_manager.go @@ -6,21 +6,14 @@ import ( context "context" big "math/big" - chains "github.com/smartcontractkit/chainlink-framework/chains" - + pkgtypes "github.com/smartcontractkit/chainlink-common/pkg/types" evm "github.com/smartcontractkit/chainlink-common/pkg/types/chains/evm" - + chains "github.com/smartcontractkit/chainlink-framework/chains" fees "github.com/smartcontractkit/chainlink-framework/chains/fees" - - mock "github.com/stretchr/testify/mock" - - null "gopkg.in/guregu/null.v4" - - pkgtypes "github.com/smartcontractkit/chainlink-common/pkg/types" - txmgr "github.com/smartcontractkit/chainlink-framework/chains/txmgr" - types "github.com/smartcontractkit/chainlink-framework/chains/txmgr/types" + mock "github.com/stretchr/testify/mock" + null "gopkg.in/guregu/null.v4" ) // TxManager is an autogenerated mock type for the TxManager type diff --git a/common/txmgr/types/mocks/finalizer.go b/common/txmgr/types/mocks/finalizer.go index e4b31e576f7..e6c3710d416 100644 --- a/common/txmgr/types/mocks/finalizer.go +++ b/common/txmgr/types/mocks/finalizer.go @@ -6,7 +6,6 @@ import ( context "context" chains "github.com/smartcontractkit/chainlink-framework/chains" - mock "github.com/stretchr/testify/mock" uuid "github.com/google/uuid" diff --git a/common/txmgr/types/mocks/forwarder_manager.go b/common/txmgr/types/mocks/forwarder_manager.go index a8bf922fa82..e9f2fab8ed4 100644 --- a/common/txmgr/types/mocks/forwarder_manager.go +++ b/common/txmgr/types/mocks/forwarder_manager.go @@ -6,7 +6,6 @@ import ( context "context" chains "github.com/smartcontractkit/chainlink-framework/chains" - mock "github.com/stretchr/testify/mock" ) diff --git a/common/txmgr/types/mocks/key_store.go b/common/txmgr/types/mocks/key_store.go index 93651260995..905ce3efc80 100644 --- a/common/txmgr/types/mocks/key_store.go +++ b/common/txmgr/types/mocks/key_store.go @@ -6,7 +6,6 @@ import ( context "context" chains "github.com/smartcontractkit/chainlink-framework/chains" - mock "github.com/stretchr/testify/mock" ) diff --git a/common/txmgr/types/mocks/tx_attempt_builder.go b/common/txmgr/types/mocks/tx_attempt_builder.go index f2d1259a7d4..5c23e33469d 100644 --- a/common/txmgr/types/mocks/tx_attempt_builder.go +++ b/common/txmgr/types/mocks/tx_attempt_builder.go @@ -5,15 +5,11 @@ package mocks import ( context "context" + logger "github.com/smartcontractkit/chainlink-common/pkg/logger" chains "github.com/smartcontractkit/chainlink-framework/chains" - fees "github.com/smartcontractkit/chainlink-framework/chains/fees" - - logger "github.com/smartcontractkit/chainlink-common/pkg/logger" - - mock "github.com/stretchr/testify/mock" - types "github.com/smartcontractkit/chainlink-framework/chains/txmgr/types" + mock "github.com/stretchr/testify/mock" ) // TxAttemptBuilder is an autogenerated mock type for the TxAttemptBuilder type diff --git a/common/txmgr/types/mocks/tx_store.go b/common/txmgr/types/mocks/tx_store.go index 2e5b17fb519..6c20022f6c7 100644 --- a/common/txmgr/types/mocks/tx_store.go +++ b/common/txmgr/types/mocks/tx_store.go @@ -5,20 +5,14 @@ package mocks import ( context "context" big "math/big" + time "time" + uuid "github.com/google/uuid" chains "github.com/smartcontractkit/chainlink-framework/chains" - fees "github.com/smartcontractkit/chainlink-framework/chains/fees" - + types "github.com/smartcontractkit/chainlink-framework/chains/txmgr/types" mock "github.com/stretchr/testify/mock" - null "gopkg.in/guregu/null.v4" - - time "time" - - types "github.com/smartcontractkit/chainlink-framework/chains/txmgr/types" - - uuid "github.com/google/uuid" ) // TxStore is an autogenerated mock type for the TxStore type diff --git a/common/txmgr/types/mocks/tx_strategy.go b/common/txmgr/types/mocks/tx_strategy.go index 5b15e55476e..e5ba352d32f 100644 --- a/common/txmgr/types/mocks/tx_strategy.go +++ b/common/txmgr/types/mocks/tx_strategy.go @@ -5,10 +5,9 @@ package mocks import ( context "context" + uuid "github.com/google/uuid" types "github.com/smartcontractkit/chainlink-framework/chains/txmgr/types" mock "github.com/stretchr/testify/mock" - - uuid "github.com/google/uuid" ) // TxStrategy is an autogenerated mock type for the TxStrategy type diff --git a/core/bridges/mocks/orm.go b/core/bridges/mocks/orm.go index faf4aa3d770..fde76b282b8 100644 --- a/core/bridges/mocks/orm.go +++ b/core/bridges/mocks/orm.go @@ -3,16 +3,13 @@ package mocks import ( - auth "github.com/smartcontractkit/chainlink/v2/core/auth" - bridges "github.com/smartcontractkit/chainlink/v2/core/bridges" - context "context" - - mock "github.com/stretchr/testify/mock" + time "time" sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" - - time "time" + auth "github.com/smartcontractkit/chainlink/v2/core/auth" + bridges "github.com/smartcontractkit/chainlink/v2/core/bridges" + mock "github.com/stretchr/testify/mock" ) // ORM is an autogenerated mock type for the ORM type diff --git a/core/capabilities/ccip/configs/evm/contract_reader.go b/core/capabilities/ccip/configs/evm/contract_reader.go index f60df6b4027..2e9b922916e 100644 --- a/core/capabilities/ccip/configs/evm/contract_reader.go +++ b/core/capabilities/ccip/configs/evm/contract_reader.go @@ -410,7 +410,7 @@ var USDCReaderConfig = config.ChainReaderConfig{ consts.CCTPMessageSentValue: { Name: consts.CCTPMessageSentValue, // Filtering by the 3rd word (indexing starts from 0) so it's ptr(2) - Index: ptr(2), + Index: new(2), Type: "bytes32", }, }, @@ -488,5 +488,5 @@ func mustGetEventName(event string, tabi abi.ABI) string { } func ptr[T any](v T) *T { - return &v + return new(v) } diff --git a/core/capabilities/ccip/types/mocks/contract_transmitter_factory.go b/core/capabilities/ccip/types/mocks/contract_transmitter_factory.go index d107e82d52f..253206d8a05 100644 --- a/core/capabilities/ccip/types/mocks/contract_transmitter_factory.go +++ b/core/capabilities/ccip/types/mocks/contract_transmitter_factory.go @@ -4,13 +4,10 @@ package mocks import ( logger "github.com/smartcontractkit/chainlink-common/pkg/logger" - mock "github.com/stretchr/testify/mock" - + types "github.com/smartcontractkit/chainlink-common/pkg/types" ocr3types "github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types" - offchainreporting2plustypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" - - types "github.com/smartcontractkit/chainlink-common/pkg/types" + mock "github.com/stretchr/testify/mock" ) // ContractTransmitterFactory is an autogenerated mock type for the ContractTransmitterFactory type diff --git a/core/capabilities/mocks/base_capability.go b/core/capabilities/mocks/base_capability.go index 7fd69b0a9d4..542eb24e238 100644 --- a/core/capabilities/mocks/base_capability.go +++ b/core/capabilities/mocks/base_capability.go @@ -6,7 +6,6 @@ import ( context "context" capabilities "github.com/smartcontractkit/chainlink-common/pkg/capabilities" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/capabilities/mocks/executable.go b/core/capabilities/mocks/executable.go index cf6f2ffb0b2..0f0cd118861 100644 --- a/core/capabilities/mocks/executable.go +++ b/core/capabilities/mocks/executable.go @@ -6,7 +6,6 @@ import ( context "context" capabilities "github.com/smartcontractkit/chainlink-common/pkg/capabilities" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/capabilities/mocks/executable_and_trigger_capability.go b/core/capabilities/mocks/executable_and_trigger_capability.go index e471bf206ce..baff329bddb 100644 --- a/core/capabilities/mocks/executable_and_trigger_capability.go +++ b/core/capabilities/mocks/executable_and_trigger_capability.go @@ -6,7 +6,6 @@ import ( context "context" capabilities "github.com/smartcontractkit/chainlink-common/pkg/capabilities" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/capabilities/mocks/executable_capability.go b/core/capabilities/mocks/executable_capability.go index fc3d42bb0d1..0f46b3863ac 100644 --- a/core/capabilities/mocks/executable_capability.go +++ b/core/capabilities/mocks/executable_capability.go @@ -6,7 +6,6 @@ import ( context "context" capabilities "github.com/smartcontractkit/chainlink-common/pkg/capabilities" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/capabilities/mocks/trigger_capability.go b/core/capabilities/mocks/trigger_capability.go index f4f01ba3795..71a5b5939f5 100644 --- a/core/capabilities/mocks/trigger_capability.go +++ b/core/capabilities/mocks/trigger_capability.go @@ -6,7 +6,6 @@ import ( context "context" capabilities "github.com/smartcontractkit/chainlink-common/pkg/capabilities" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/capabilities/mocks/trigger_executable.go b/core/capabilities/mocks/trigger_executable.go index 1e8256679ec..15d3b5dd9c7 100644 --- a/core/capabilities/mocks/trigger_executable.go +++ b/core/capabilities/mocks/trigger_executable.go @@ -6,7 +6,6 @@ import ( context "context" capabilities "github.com/smartcontractkit/chainlink-common/pkg/capabilities" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/capabilities/remote/types/mocks/dispatcher.go b/core/capabilities/remote/types/mocks/dispatcher.go index 2ae57eda87c..e7c21c42815 100644 --- a/core/capabilities/remote/types/mocks/dispatcher.go +++ b/core/capabilities/remote/types/mocks/dispatcher.go @@ -5,10 +5,9 @@ package mocks import ( context "context" + types "github.com/smartcontractkit/chainlink/v2/core/capabilities/remote/types" ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types" mock "github.com/stretchr/testify/mock" - - types "github.com/smartcontractkit/chainlink/v2/core/capabilities/remote/types" ) // Dispatcher is an autogenerated mock type for the Dispatcher type diff --git a/core/capabilities/targets/mocks/contract_writer.go b/core/capabilities/targets/mocks/contract_writer.go index 78ad1a3a0aa..772c5cabcd2 100644 --- a/core/capabilities/targets/mocks/contract_writer.go +++ b/core/capabilities/targets/mocks/contract_writer.go @@ -6,9 +6,8 @@ import ( context "context" big "math/big" - mock "github.com/stretchr/testify/mock" - types "github.com/smartcontractkit/chainlink-common/pkg/types" + mock "github.com/stretchr/testify/mock" ) // ContractWriter is an autogenerated mock type for the ContractWriter type diff --git a/core/capabilities/vault/mocks/authorizer.go b/core/capabilities/vault/mocks/authorizer.go index fbb57897079..8834ce99337 100644 --- a/core/capabilities/vault/mocks/authorizer.go +++ b/core/capabilities/vault/mocks/authorizer.go @@ -7,9 +7,8 @@ import ( json "encoding/json" jsonrpc2 "github.com/smartcontractkit/chainlink-common/pkg/jsonrpc2" - mock "github.com/stretchr/testify/mock" - vault "github.com/smartcontractkit/chainlink/v2/core/capabilities/vault" + mock "github.com/stretchr/testify/mock" ) // Authorizer is an autogenerated mock type for the Authorizer type diff --git a/core/chainlink.Dockerfile b/core/chainlink.Dockerfile index 370fbc6292b..3e85d5bd88e 100644 --- a/core/chainlink.Dockerfile +++ b/core/chainlink.Dockerfile @@ -5,7 +5,7 @@ # Stage: deps-base — module downloads, no source tree. # Stages that don't need the full source (remote plugins, delve) branch from # here so that source-only changes never invalidate their layer cache. -FROM golang:1.25.7-bookworm AS deps-base +FROM golang:1.26.1-bookworm AS deps-base RUN go version RUN apt-get update && apt-get install -y jq && rm -rf /var/lib/apt/lists/* diff --git a/core/config/mocks/telemetry_ingress.go b/core/config/mocks/telemetry_ingress.go index facf1988fbb..a39b0e741ff 100644 --- a/core/config/mocks/telemetry_ingress.go +++ b/core/config/mocks/telemetry_ingress.go @@ -3,10 +3,10 @@ package mocks import ( + time "time" + config "github.com/smartcontractkit/chainlink/v2/core/config" mock "github.com/stretchr/testify/mock" - - time "time" ) // TelemetryIngress is an autogenerated mock type for the TelemetryIngress type diff --git a/core/internal/mocks/application.go b/core/internal/mocks/application.go index 06399cf1fd2..70985a48e90 100644 --- a/core/internal/mocks/application.go +++ b/core/internal/mocks/application.go @@ -3,48 +3,28 @@ package mocks import ( + context "context" big "math/big" - audit "github.com/smartcontractkit/chainlink/v2/core/logger/audit" - + uuid "github.com/google/uuid" + sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" + jsonserializable "github.com/smartcontractkit/chainlink-common/pkg/utils/jsonserializable" + logpoller "github.com/smartcontractkit/chainlink-evm/pkg/logpoller" + txmgr "github.com/smartcontractkit/chainlink-evm/pkg/txmgr" bridges "github.com/smartcontractkit/chainlink/v2/core/bridges" - capabilities "github.com/smartcontractkit/chainlink/v2/core/capabilities" - + logger "github.com/smartcontractkit/chainlink/v2/core/logger" + audit "github.com/smartcontractkit/chainlink/v2/core/logger/audit" + services "github.com/smartcontractkit/chainlink/v2/core/services" chainlink "github.com/smartcontractkit/chainlink/v2/core/services/chainlink" - - context "context" - feeds "github.com/smartcontractkit/chainlink/v2/core/services/feeds" - job "github.com/smartcontractkit/chainlink/v2/core/services/job" - - jsonserializable "github.com/smartcontractkit/chainlink-common/pkg/utils/jsonserializable" - keystore "github.com/smartcontractkit/chainlink/v2/core/services/keystore" - - logger "github.com/smartcontractkit/chainlink/v2/core/logger" - - logpoller "github.com/smartcontractkit/chainlink-evm/pkg/logpoller" - - mock "github.com/stretchr/testify/mock" - pipeline "github.com/smartcontractkit/chainlink/v2/core/services/pipeline" - - plugins "github.com/smartcontractkit/chainlink/v2/plugins" - - services "github.com/smartcontractkit/chainlink/v2/core/services" - - sessions "github.com/smartcontractkit/chainlink/v2/core/sessions" - - sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" - - txmgr "github.com/smartcontractkit/chainlink-evm/pkg/txmgr" - - uuid "github.com/google/uuid" - webhook "github.com/smartcontractkit/chainlink/v2/core/services/webhook" - + sessions "github.com/smartcontractkit/chainlink/v2/core/sessions" + plugins "github.com/smartcontractkit/chainlink/v2/plugins" + mock "github.com/stretchr/testify/mock" zapcore "go.uber.org/zap/zapcore" ) diff --git a/core/internal/mocks/flags.go b/core/internal/mocks/flags.go index 558c5d0c4b9..9c200708bde 100644 --- a/core/internal/mocks/flags.go +++ b/core/internal/mocks/flags.go @@ -5,16 +5,11 @@ package mocks import ( bind "github.com/ethereum/go-ethereum/accounts/abi/bind/v2" common "github.com/ethereum/go-ethereum/common" - + types "github.com/ethereum/go-ethereum/core/types" event "github.com/ethereum/go-ethereum/event" - - flags_wrapper "github.com/smartcontractkit/chainlink-evm/gethwrappers/generated/flags_wrapper" - generated "github.com/smartcontractkit/chainlink-evm/gethwrappers/generated" - + flags_wrapper "github.com/smartcontractkit/chainlink-evm/gethwrappers/generated/flags_wrapper" mock "github.com/stretchr/testify/mock" - - types "github.com/ethereum/go-ethereum/core/types" ) // Flags is an autogenerated mock type for the FlagsInterface type diff --git a/core/internal/mocks/flux_aggregator.go b/core/internal/mocks/flux_aggregator.go index 5b61d7a34c6..b1c7502d704 100644 --- a/core/internal/mocks/flux_aggregator.go +++ b/core/internal/mocks/flux_aggregator.go @@ -7,16 +7,11 @@ import ( bind "github.com/ethereum/go-ethereum/accounts/abi/bind/v2" common "github.com/ethereum/go-ethereum/common" - + types "github.com/ethereum/go-ethereum/core/types" event "github.com/ethereum/go-ethereum/event" - - flux_aggregator_wrapper "github.com/smartcontractkit/chainlink-evm/gethwrappers/generated/flux_aggregator_wrapper" - generated "github.com/smartcontractkit/chainlink-evm/gethwrappers/generated" - + flux_aggregator_wrapper "github.com/smartcontractkit/chainlink-evm/gethwrappers/generated/flux_aggregator_wrapper" mock "github.com/stretchr/testify/mock" - - types "github.com/ethereum/go-ethereum/core/types" ) // FluxAggregator is an autogenerated mock type for the FluxAggregatorInterface type diff --git a/core/scripts/ccip/manual-execution/go.mod b/core/scripts/ccip/manual-execution/go.mod index fb703ac3ff3..38bde0edab9 100644 --- a/core/scripts/ccip/manual-execution/go.mod +++ b/core/scripts/ccip/manual-execution/go.mod @@ -1,6 +1,6 @@ module manual-execution -go 1.25.7 +go 1.26.1 require ( github.com/ethereum/go-ethereum v1.17.1 diff --git a/core/scripts/cre/environment/examples/workflows/v1/proof-of-reserve/cron-based/go.mod b/core/scripts/cre/environment/examples/workflows/v1/proof-of-reserve/cron-based/go.mod index d31a241832b..9ae5d30ef3e 100644 --- a/core/scripts/cre/environment/examples/workflows/v1/proof-of-reserve/cron-based/go.mod +++ b/core/scripts/cre/environment/examples/workflows/v1/proof-of-reserve/cron-based/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/core/scripts/cre/environment/examples/workflows/v1/proof-of-reserve/cron-based -go 1.25.7 +go 1.26.1 require ( github.com/smartcontractkit/chainlink-common v0.11.2-0.20260401185621-720567ef9343 diff --git a/core/scripts/cre/environment/examples/workflows/v2/cron/go.mod b/core/scripts/cre/environment/examples/workflows/v2/cron/go.mod index 01288124c55..a8264aa0477 100644 --- a/core/scripts/cre/environment/examples/workflows/v2/cron/go.mod +++ b/core/scripts/cre/environment/examples/workflows/v2/cron/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/core/scripts/cre/environment/examples/workflows/v2/cron -go 1.25.7 +go 1.26.1 require ( github.com/smartcontractkit/cre-sdk-go v1.5.0 diff --git a/core/scripts/cre/environment/examples/workflows/v2/http/go.mod b/core/scripts/cre/environment/examples/workflows/v2/http/go.mod index 5422d407f61..e6a88f61c04 100644 --- a/core/scripts/cre/environment/examples/workflows/v2/http/go.mod +++ b/core/scripts/cre/environment/examples/workflows/v2/http/go.mod @@ -1,6 +1,6 @@ module main -go 1.25.7 +go 1.26.1 require ( github.com/smartcontractkit/cre-sdk-go v1.5.0 diff --git a/core/scripts/cre/environment/examples/workflows/v2/http_simple/go.mod b/core/scripts/cre/environment/examples/workflows/v2/http_simple/go.mod index 5422d407f61..e6a88f61c04 100644 --- a/core/scripts/cre/environment/examples/workflows/v2/http_simple/go.mod +++ b/core/scripts/cre/environment/examples/workflows/v2/http_simple/go.mod @@ -1,6 +1,6 @@ module main -go 1.25.7 +go 1.26.1 require ( github.com/smartcontractkit/cre-sdk-go v1.5.0 diff --git a/core/scripts/cre/environment/examples/workflows/v2/node-mode/go.mod b/core/scripts/cre/environment/examples/workflows/v2/node-mode/go.mod index 583f2f704e3..f12566e1431 100644 --- a/core/scripts/cre/environment/examples/workflows/v2/node-mode/go.mod +++ b/core/scripts/cre/environment/examples/workflows/v2/node-mode/go.mod @@ -1,6 +1,6 @@ module main -go 1.25.7 +go 1.26.1 require ( github.com/google/uuid v1.6.0 diff --git a/core/scripts/cre/environment/examples/workflows/v2/proof-of-reserve/cron-based/go.mod b/core/scripts/cre/environment/examples/workflows/v2/proof-of-reserve/cron-based/go.mod index cabf07b4362..eba716df496 100644 --- a/core/scripts/cre/environment/examples/workflows/v2/proof-of-reserve/cron-based/go.mod +++ b/core/scripts/cre/environment/examples/workflows/v2/proof-of-reserve/cron-based/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/core/scripts/cre/environment/examples/workflows/v2/proof-of-reserve/cron-based -go 1.25.7 +go 1.26.1 require ( github.com/ethereum/go-ethereum v1.17.1 diff --git a/core/scripts/cre/environment/examples/workflows/v2/time/go.mod b/core/scripts/cre/environment/examples/workflows/v2/time/go.mod index 1ef3165f17f..b1efd0d2334 100644 --- a/core/scripts/cre/environment/examples/workflows/v2/time/go.mod +++ b/core/scripts/cre/environment/examples/workflows/v2/time/go.mod @@ -1,6 +1,6 @@ module main -go 1.25.7 +go 1.26.1 require ( github.com/smartcontractkit/cre-sdk-go v1.5.0 diff --git a/core/scripts/cre/environment/examples/workflows/v2/time_consensus/go.mod b/core/scripts/cre/environment/examples/workflows/v2/time_consensus/go.mod index 1ef3165f17f..b1efd0d2334 100644 --- a/core/scripts/cre/environment/examples/workflows/v2/time_consensus/go.mod +++ b/core/scripts/cre/environment/examples/workflows/v2/time_consensus/go.mod @@ -1,6 +1,6 @@ module main -go 1.25.7 +go 1.26.1 require ( github.com/smartcontractkit/cre-sdk-go v1.5.0 diff --git a/core/scripts/go.mod b/core/scripts/go.mod index a93bbe306f7..c845b0b863b 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/core/scripts -go 1.25.7 +go 1.26.1 // Make sure we're working with the latest chainlink libs replace github.com/smartcontractkit/chainlink/v2 => ../../ diff --git a/core/services/blockhashstore/mocks/bhs.go b/core/services/blockhashstore/mocks/bhs.go index 78a0df98cb4..1875a2ef1b9 100644 --- a/core/services/blockhashstore/mocks/bhs.go +++ b/core/services/blockhashstore/mocks/bhs.go @@ -6,7 +6,6 @@ import ( context "context" common "github.com/ethereum/go-ethereum/common" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/ccip/mocks/orm.go b/core/services/ccip/mocks/orm.go index 8d52a1b2c2d..9b5cd0e9c94 100644 --- a/core/services/ccip/mocks/orm.go +++ b/core/services/ccip/mocks/orm.go @@ -4,12 +4,10 @@ package mocks import ( context "context" + time "time" ccip "github.com/smartcontractkit/chainlink/v2/core/services/ccip" - mock "github.com/stretchr/testify/mock" - - time "time" ) // ORM is an autogenerated mock type for the ORM type diff --git a/core/services/chainlink/mocks/general_config.go b/core/services/chainlink/mocks/general_config.go index f39817c63c0..e0c6395cfa3 100644 --- a/core/services/chainlink/mocks/general_config.go +++ b/core/services/chainlink/mocks/general_config.go @@ -3,19 +3,14 @@ package mocks import ( - config "github.com/smartcontractkit/chainlink/v2/core/config" - chainlink "github.com/smartcontractkit/chainlink/v2/core/services/chainlink" - - mock "github.com/stretchr/testify/mock" - - solanaconfig "github.com/smartcontractkit/chainlink-solana/pkg/solana/config" - time "time" - toml "github.com/smartcontractkit/chainlink-evm/pkg/config/toml" - uuid "github.com/google/uuid" - + toml "github.com/smartcontractkit/chainlink-evm/pkg/config/toml" + solanaconfig "github.com/smartcontractkit/chainlink-solana/pkg/solana/config" + config "github.com/smartcontractkit/chainlink/v2/core/config" + chainlink "github.com/smartcontractkit/chainlink/v2/core/services/chainlink" + mock "github.com/stretchr/testify/mock" zapcore "go.uber.org/zap/zapcore" ) diff --git a/core/services/feeds/mocks/connections_manager.go b/core/services/feeds/mocks/connections_manager.go index c751a12ebea..6f03f6da720 100644 --- a/core/services/feeds/mocks/connections_manager.go +++ b/core/services/feeds/mocks/connections_manager.go @@ -5,7 +5,6 @@ package mocks import ( feedsmanager "github.com/smartcontractkit/chainlink-protos/orchestrator/feedsmanager" feeds "github.com/smartcontractkit/chainlink/v2/core/services/feeds" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/feeds/mocks/orm.go b/core/services/feeds/mocks/orm.go index 7ecfff5da5e..6ce30a0a78c 100644 --- a/core/services/feeds/mocks/orm.go +++ b/core/services/feeds/mocks/orm.go @@ -5,14 +5,11 @@ package mocks import ( context "context" + uuid "github.com/google/uuid" + sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" feeds "github.com/smartcontractkit/chainlink/v2/core/services/feeds" crypto "github.com/smartcontractkit/chainlink/v2/core/utils/crypto" - mock "github.com/stretchr/testify/mock" - - sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" - - uuid "github.com/google/uuid" ) // ORM is an autogenerated mock type for the ORM type diff --git a/core/services/feeds/mocks/service.go b/core/services/feeds/mocks/service.go index 58e9ffe102d..92de9b4ac28 100644 --- a/core/services/feeds/mocks/service.go +++ b/core/services/feeds/mocks/service.go @@ -7,7 +7,6 @@ import ( feedsmanager "github.com/smartcontractkit/chainlink-protos/orchestrator/feedsmanager" feeds "github.com/smartcontractkit/chainlink/v2/core/services/feeds" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/fluxmonitorv2/mocks/flags.go b/core/services/fluxmonitorv2/mocks/flags.go index ba29d1abd75..0fb1f92cbab 100644 --- a/core/services/fluxmonitorv2/mocks/flags.go +++ b/core/services/fluxmonitorv2/mocks/flags.go @@ -5,11 +5,9 @@ package mocks import ( common "github.com/ethereum/go-ethereum/common" + types "github.com/ethereum/go-ethereum/core/types" generated "github.com/smartcontractkit/chainlink-evm/gethwrappers/generated" - mock "github.com/stretchr/testify/mock" - - types "github.com/ethereum/go-ethereum/core/types" ) // Flags is an autogenerated mock type for the Flags type diff --git a/core/services/fluxmonitorv2/mocks/key_store_interface.go b/core/services/fluxmonitorv2/mocks/key_store_interface.go index c021fe4f258..d3aa60f0c31 100644 --- a/core/services/fluxmonitorv2/mocks/key_store_interface.go +++ b/core/services/fluxmonitorv2/mocks/key_store_interface.go @@ -7,7 +7,6 @@ import ( big "math/big" common "github.com/ethereum/go-ethereum/common" - ethkey "github.com/smartcontractkit/chainlink-common/keystore/corekeys/ethkey" mock "github.com/stretchr/testify/mock" diff --git a/core/services/fluxmonitorv2/mocks/orm.go b/core/services/fluxmonitorv2/mocks/orm.go index f44b39f0170..51cce0ab2ee 100644 --- a/core/services/fluxmonitorv2/mocks/orm.go +++ b/core/services/fluxmonitorv2/mocks/orm.go @@ -6,12 +6,9 @@ import ( context "context" common "github.com/ethereum/go-ethereum/common" - + sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" fluxmonitorv2 "github.com/smartcontractkit/chainlink/v2/core/services/fluxmonitorv2" - mock "github.com/stretchr/testify/mock" - - sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" ) // ORM is an autogenerated mock type for the ORM type diff --git a/core/services/functions/mocks/orm.go b/core/services/functions/mocks/orm.go index febf5be1fd5..33bb50be0f4 100644 --- a/core/services/functions/mocks/orm.go +++ b/core/services/functions/mocks/orm.go @@ -4,11 +4,10 @@ package mocks import ( context "context" + time "time" functions "github.com/smartcontractkit/chainlink/v2/core/services/functions" mock "github.com/stretchr/testify/mock" - - time "time" ) // ORM is an autogenerated mock type for the ORM type diff --git a/core/services/gateway/connector/mocks/gateway_connector.go b/core/services/gateway/connector/mocks/gateway_connector.go index 6041d645ec0..5e2f6420ce0 100644 --- a/core/services/gateway/connector/mocks/gateway_connector.go +++ b/core/services/gateway/connector/mocks/gateway_connector.go @@ -5,14 +5,11 @@ package mocks import ( context "context" json "encoding/json" - - core "github.com/smartcontractkit/chainlink-common/pkg/types/core" + url "net/url" jsonrpc2 "github.com/smartcontractkit/chainlink-common/pkg/jsonrpc2" - + core "github.com/smartcontractkit/chainlink-common/pkg/types/core" mock "github.com/stretchr/testify/mock" - - url "net/url" ) // BaseGatewayConnector is an autogenerated mock type for the GatewayConnector type diff --git a/core/services/gateway/handlers/capabilities/v2/mocks/http_trigger_handler.go b/core/services/gateway/handlers/capabilities/v2/mocks/http_trigger_handler.go index 991ef7d41b6..017cad3f621 100644 --- a/core/services/gateway/handlers/capabilities/v2/mocks/http_trigger_handler.go +++ b/core/services/gateway/handlers/capabilities/v2/mocks/http_trigger_handler.go @@ -5,14 +5,11 @@ package mocks import ( context "context" json "encoding/json" - - handlers "github.com/smartcontractkit/chainlink/v2/core/services/gateway/handlers" + time "time" jsonrpc2 "github.com/smartcontractkit/chainlink-common/pkg/jsonrpc2" - + handlers "github.com/smartcontractkit/chainlink/v2/core/services/gateway/handlers" mock "github.com/stretchr/testify/mock" - - time "time" ) // HTTPTriggerHandler is an autogenerated mock type for the HTTPTriggerHandler type diff --git a/core/services/gateway/handlers/functions/allowlist/mocks/onchain_allowlist.go b/core/services/gateway/handlers/functions/allowlist/mocks/onchain_allowlist.go index b60a201450f..7d937bbed85 100644 --- a/core/services/gateway/handlers/functions/allowlist/mocks/onchain_allowlist.go +++ b/core/services/gateway/handlers/functions/allowlist/mocks/onchain_allowlist.go @@ -6,7 +6,6 @@ import ( context "context" common "github.com/ethereum/go-ethereum/common" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/gateway/handlers/functions/allowlist/mocks/orm.go b/core/services/gateway/handlers/functions/allowlist/mocks/orm.go index db9ccd350c4..a851d87169d 100644 --- a/core/services/gateway/handlers/functions/allowlist/mocks/orm.go +++ b/core/services/gateway/handlers/functions/allowlist/mocks/orm.go @@ -6,7 +6,6 @@ import ( context "context" common "github.com/ethereum/go-ethereum/common" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/gateway/handlers/functions/subscriptions/mocks/onchain_subscriptions.go b/core/services/gateway/handlers/functions/subscriptions/mocks/onchain_subscriptions.go index 9e0a68a08f5..4c656315d0f 100644 --- a/core/services/gateway/handlers/functions/subscriptions/mocks/onchain_subscriptions.go +++ b/core/services/gateway/handlers/functions/subscriptions/mocks/onchain_subscriptions.go @@ -7,7 +7,6 @@ import ( big "math/big" common "github.com/ethereum/go-ethereum/common" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/gateway/handlers/mocks/don.go b/core/services/gateway/handlers/mocks/don.go index c3ab80649dc..787bd570cc7 100644 --- a/core/services/gateway/handlers/mocks/don.go +++ b/core/services/gateway/handlers/mocks/don.go @@ -8,7 +8,6 @@ import ( json "encoding/json" jsonrpc2 "github.com/smartcontractkit/chainlink-common/pkg/jsonrpc2" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/gateway/handlers/mocks/handler.go b/core/services/gateway/handlers/mocks/handler.go index bd7d23a4659..31ef1387976 100644 --- a/core/services/gateway/handlers/mocks/handler.go +++ b/core/services/gateway/handlers/mocks/handler.go @@ -4,15 +4,11 @@ package mocks import ( context "context" - - api "github.com/smartcontractkit/chainlink/v2/core/services/gateway/api" - - handlers "github.com/smartcontractkit/chainlink/v2/core/services/gateway/handlers" - json "encoding/json" jsonrpc2 "github.com/smartcontractkit/chainlink-common/pkg/jsonrpc2" - + api "github.com/smartcontractkit/chainlink/v2/core/services/gateway/api" + handlers "github.com/smartcontractkit/chainlink/v2/core/services/gateway/handlers" mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/gateway/network/httpclient_test.go b/core/services/gateway/network/httpclient_test.go index ed0fc484284..2088e98c35c 100644 --- a/core/services/gateway/network/httpclient_test.go +++ b/core/services/gateway/network/httpclient_test.go @@ -393,17 +393,17 @@ func TestHTTPClient_BlocksUnallowed(t *testing.T) { { name: "explicitly blocked IP - loopback - ipv6", url: `https://[::1]`, - expectedError: "ipv6 blocked", + expectedError: expErrIPV6Blocked, }, { name: "explicitly blocked IP - loopback ipv6 mapped ipv4", url: `https://[::FFF:7F00:0001]`, - expectedError: "ipv6 blocked", + expectedError: expErrIPV6Blocked, }, { name: "explicitly blocked IP - loopback long-form", url: `https://[0000:0000:0000:0000:0000:0000:0000:0001]`, - expectedError: "ipv6 blocked", + expectedError: expErrIPV6Blocked, }, { name: "explicitly blocked IP - current network", @@ -445,21 +445,21 @@ func TestHTTPClient_BlocksUnallowed(t *testing.T) { url: "http://42949672961", expectedError: "no such host", }, - /*{ // TODO: failing with go 1.25 + { name: "explicitly blocked IP - ipv6 mapped", url: "http://[::FFFF:0000:0001]", - expectedError: "ip: 0.0.0.1 not found in allowlist", + expectedError: expErrNotAllowed, }, { name: "explicitly blocked IP - ipv6 mapped", url: "http://[::FFFF:0.0.0.1]", - expectedError: "ip: 0.0.0.1 not found in allowlist", + expectedError: expErrNotAllowed, }, { name: "explicitly blocked IP - loopback ipv6 mapped ipv4", url: `https://[::FFFF:127.0.0.1]`, - expectedError: "ip: 127.0.0.1 not found in allowlist", - },*/ + expectedError: expErrNotAllowed, + }, } // Execute test cases @@ -503,7 +503,7 @@ func TestHTTPClient_BlocksUnallowed(t *testing.T) { URL: testURL.String(), Headers: map[string]string{}, Body: nil, - Timeout: 1 * time.Second, + Timeout: 10 * time.Second, }) require.Error(t, err) require.ErrorContains(t, err, tt.expectedError) diff --git a/core/services/gateway/network/parse_go126_test.go b/core/services/gateway/network/parse_go126_test.go new file mode 100644 index 00000000000..f7c02d9d13c --- /dev/null +++ b/core/services/gateway/network/parse_go126_test.go @@ -0,0 +1,8 @@ +//go:build go1.26 + +package network + +var ( + expErrIPV6Blocked = "invalid port" + expErrNotAllowed = "invalid port" +) diff --git a/core/services/gateway/network/parse_test.go b/core/services/gateway/network/parse_test.go new file mode 100644 index 00000000000..310eddf46a9 --- /dev/null +++ b/core/services/gateway/network/parse_test.go @@ -0,0 +1,8 @@ +//go:build !go1.26 + +package network + +var ( + expErrIPV6Blocked = "ipv6 blocked" + expErrNotAllowed = "not found in allowlist" +) diff --git a/core/services/job/mocks/kv_store.go b/core/services/job/mocks/kv_store.go index d282f174518..6898c39a1b1 100644 --- a/core/services/job/mocks/kv_store.go +++ b/core/services/job/mocks/kv_store.go @@ -5,9 +5,9 @@ package mocks import ( context "context" - mock "github.com/stretchr/testify/mock" - time "time" + + mock "github.com/stretchr/testify/mock" ) // KVStore is an autogenerated mock type for the KVStore type diff --git a/core/services/job/mocks/orm.go b/core/services/job/mocks/orm.go index 2e0d3dd82f9..d677c053914 100644 --- a/core/services/job/mocks/orm.go +++ b/core/services/job/mocks/orm.go @@ -6,18 +6,12 @@ import ( context "context" common "github.com/ethereum/go-ethereum/common" - + uuid "github.com/google/uuid" ethkey "github.com/smartcontractkit/chainlink-common/keystore/corekeys/ethkey" - + sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" job "github.com/smartcontractkit/chainlink/v2/core/services/job" - - mock "github.com/stretchr/testify/mock" - pipeline "github.com/smartcontractkit/chainlink/v2/core/services/pipeline" - - sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" - - uuid "github.com/google/uuid" + mock "github.com/stretchr/testify/mock" ) // ORM is an autogenerated mock type for the ORM type diff --git a/core/services/job/mocks/spawner.go b/core/services/job/mocks/spawner.go index cda46f9a98d..28ff46461b1 100644 --- a/core/services/job/mocks/spawner.go +++ b/core/services/job/mocks/spawner.go @@ -5,10 +5,9 @@ package mocks import ( context "context" + sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" job "github.com/smartcontractkit/chainlink/v2/core/services/job" mock "github.com/stretchr/testify/mock" - - sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" ) // Spawner is an autogenerated mock type for the Spawner type diff --git a/core/services/keystore/mocks/eth.go b/core/services/keystore/mocks/eth.go index 8369da8c45b..31d8cc4b43b 100644 --- a/core/services/keystore/mocks/eth.go +++ b/core/services/keystore/mocks/eth.go @@ -7,13 +7,9 @@ import ( big "math/big" common "github.com/ethereum/go-ethereum/common" - ethkey "github.com/smartcontractkit/chainlink-common/keystore/corekeys/ethkey" - keys "github.com/smartcontractkit/chainlink-evm/pkg/keys" - keystore "github.com/smartcontractkit/chainlink/v2/core/services/keystore" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/keystore/mocks/ocr.go b/core/services/keystore/mocks/ocr.go index 0998099292f..811f1a6606d 100644 --- a/core/services/keystore/mocks/ocr.go +++ b/core/services/keystore/mocks/ocr.go @@ -5,9 +5,8 @@ package mocks import ( context "context" - mock "github.com/stretchr/testify/mock" - ocrkey "github.com/smartcontractkit/chainlink-common/keystore/corekeys/ocrkey" + mock "github.com/stretchr/testify/mock" ) // OCR is an autogenerated mock type for the OCR type diff --git a/core/services/keystore/mocks/ocr2.go b/core/services/keystore/mocks/ocr2.go index 70ca6d45ca5..cc9bbd8fa0b 100644 --- a/core/services/keystore/mocks/ocr2.go +++ b/core/services/keystore/mocks/ocr2.go @@ -7,9 +7,8 @@ import ( corekeys "github.com/smartcontractkit/chainlink-common/keystore/corekeys" - mock "github.com/stretchr/testify/mock" - ocr2key "github.com/smartcontractkit/chainlink-common/keystore/corekeys/ocr2key" + mock "github.com/stretchr/testify/mock" ) // OCR2 is an autogenerated mock type for the OCR2 type diff --git a/core/services/keystore/mocks/p2p.go b/core/services/keystore/mocks/p2p.go index 06bb4df54d3..309a138cafe 100644 --- a/core/services/keystore/mocks/p2p.go +++ b/core/services/keystore/mocks/p2p.go @@ -5,9 +5,8 @@ package mocks import ( context "context" - mock "github.com/stretchr/testify/mock" - p2pkey "github.com/smartcontractkit/chainlink-common/keystore/corekeys/p2pkey" + mock "github.com/stretchr/testify/mock" ) // P2P is an autogenerated mock type for the P2P type diff --git a/core/services/keystore/mocks/solana.go b/core/services/keystore/mocks/solana.go index 2acd96620dd..1212aa96bac 100644 --- a/core/services/keystore/mocks/solana.go +++ b/core/services/keystore/mocks/solana.go @@ -5,9 +5,8 @@ package mocks import ( context "context" - mock "github.com/stretchr/testify/mock" - solkey "github.com/smartcontractkit/chainlink-common/keystore/corekeys/solkey" + mock "github.com/stretchr/testify/mock" ) // Solana is an autogenerated mock type for the Solana type diff --git a/core/services/keystore/mocks/starknet.go b/core/services/keystore/mocks/starknet.go index 08d088c5d11..5a4e4a4d020 100644 --- a/core/services/keystore/mocks/starknet.go +++ b/core/services/keystore/mocks/starknet.go @@ -5,9 +5,8 @@ package mocks import ( context "context" - mock "github.com/stretchr/testify/mock" - starkkey "github.com/smartcontractkit/chainlink-common/keystore/corekeys/starkkey" + mock "github.com/stretchr/testify/mock" ) // StarkNet is an autogenerated mock type for the StarkNet type diff --git a/core/services/keystore/mocks/sui.go b/core/services/keystore/mocks/sui.go index 3e53dcc5a9c..8c24e9cdcb5 100644 --- a/core/services/keystore/mocks/sui.go +++ b/core/services/keystore/mocks/sui.go @@ -5,9 +5,8 @@ package mocks import ( context "context" - mock "github.com/stretchr/testify/mock" - suikey "github.com/smartcontractkit/chainlink-common/keystore/corekeys/suikey" + mock "github.com/stretchr/testify/mock" ) // Sui is an autogenerated mock type for the Sui type diff --git a/core/services/keystore/mocks/ton.go b/core/services/keystore/mocks/ton.go index fca75276e55..cdebb3254d3 100644 --- a/core/services/keystore/mocks/ton.go +++ b/core/services/keystore/mocks/ton.go @@ -5,9 +5,8 @@ package mocks import ( context "context" - mock "github.com/stretchr/testify/mock" - tonkey "github.com/smartcontractkit/chainlink-common/keystore/corekeys/tonkey" + mock "github.com/stretchr/testify/mock" ) // TON is an autogenerated mock type for the TON type diff --git a/core/services/keystore/mocks/tron.go b/core/services/keystore/mocks/tron.go index 700af6dda8e..bdc04b0b16f 100644 --- a/core/services/keystore/mocks/tron.go +++ b/core/services/keystore/mocks/tron.go @@ -5,9 +5,8 @@ package mocks import ( context "context" - mock "github.com/stretchr/testify/mock" - tronkey "github.com/smartcontractkit/chainlink-common/keystore/corekeys/tronkey" + mock "github.com/stretchr/testify/mock" ) // Tron is an autogenerated mock type for the Tron type diff --git a/core/services/keystore/mocks/vrf.go b/core/services/keystore/mocks/vrf.go index ca274def36f..66beccbcc5d 100644 --- a/core/services/keystore/mocks/vrf.go +++ b/core/services/keystore/mocks/vrf.go @@ -6,9 +6,8 @@ import ( context "context" big "math/big" - mock "github.com/stretchr/testify/mock" - vrfkey "github.com/smartcontractkit/chainlink-common/keystore/corekeys/vrfkey" + mock "github.com/stretchr/testify/mock" ) // VRF is an autogenerated mock type for the VRF type diff --git a/core/services/keystore/mocks/workflow.go b/core/services/keystore/mocks/workflow.go index 4e902381bf4..151b37a9a99 100644 --- a/core/services/keystore/mocks/workflow.go +++ b/core/services/keystore/mocks/workflow.go @@ -5,9 +5,8 @@ package mocks import ( context "context" - mock "github.com/stretchr/testify/mock" - workflowkey "github.com/smartcontractkit/chainlink-common/keystore/corekeys/workflowkey" + mock "github.com/stretchr/testify/mock" ) // Workflow is an autogenerated mock type for the Workflow type diff --git a/core/services/ocr/mocks/ocr_contract_tracker_db.go b/core/services/ocr/mocks/ocr_contract_tracker_db.go index 9c0f3934977..a803907bb16 100644 --- a/core/services/ocr/mocks/ocr_contract_tracker_db.go +++ b/core/services/ocr/mocks/ocr_contract_tracker_db.go @@ -5,12 +5,10 @@ package mocks import ( context "context" + sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" ocr "github.com/smartcontractkit/chainlink/v2/core/services/ocr" - mock "github.com/stretchr/testify/mock" - offchainaggregator "github.com/smartcontractkit/libocr/gethwrappers/offchainaggregator" - - sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" + mock "github.com/stretchr/testify/mock" ) // OCRContractTrackerDB is an autogenerated mock type for the OCRContractTrackerDB type diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/batchreader/mocks/token_pool_batched_reader_mock.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/batchreader/mocks/token_pool_batched_reader_mock.go index 3c6a2f11842..8d4fefc8f3b 100644 --- a/core/services/ocr2/plugins/ccip/internal/ccipdata/batchreader/mocks/token_pool_batched_reader_mock.go +++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/batchreader/mocks/token_pool_batched_reader_mock.go @@ -6,7 +6,6 @@ import ( context "context" ccip "github.com/smartcontractkit/chainlink-common/pkg/types/ccip" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/commit_store_reader_mock.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/commit_store_reader_mock.go index b2b3bc7cd3f..d958cefaea9 100644 --- a/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/commit_store_reader_mock.go +++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/commit_store_reader_mock.go @@ -8,12 +8,10 @@ import ( ccip "github.com/smartcontractkit/chainlink-common/pkg/types/ccip" context "context" + time "time" gas "github.com/smartcontractkit/chainlink-evm/pkg/gas" - mock "github.com/stretchr/testify/mock" - - time "time" ) // CommitStoreReader is an autogenerated mock type for the CommitStoreReader type diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/contracts/evm2_evm_off_ramp_interface.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/contracts/evm2_evm_off_ramp_interface.go index daa676e23e3..76477527dfc 100644 --- a/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/contracts/evm2_evm_off_ramp_interface.go +++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/contracts/evm2_evm_off_ramp_interface.go @@ -7,16 +7,11 @@ import ( bind "github.com/ethereum/go-ethereum/accounts/abi/bind/v2" common "github.com/ethereum/go-ethereum/common" - + types "github.com/ethereum/go-ethereum/core/types" event "github.com/ethereum/go-ethereum/event" - - evm_2_evm_offramp "github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_2_0/evm_2_evm_offramp" - generated "github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated" - + evm_2_evm_offramp "github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_2_0/evm_2_evm_offramp" mock "github.com/stretchr/testify/mock" - - types "github.com/ethereum/go-ethereum/core/types" ) // EVM2EVMOffRampInterface is an autogenerated mock type for the EVM2EVMOffRampInterface type diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/price_registry_reader_mock.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/price_registry_reader_mock.go index db374a87145..f67ddd55887 100644 --- a/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/price_registry_reader_mock.go +++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/mocks/price_registry_reader_mock.go @@ -6,10 +6,9 @@ import ( ccip "github.com/smartcontractkit/chainlink-common/pkg/types/ccip" context "context" + time "time" mock "github.com/stretchr/testify/mock" - - time "time" ) // PriceRegistryReader is an autogenerated mock type for the PriceRegistryReader type diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdb/mocks/price_service_mock.go b/core/services/ocr2/plugins/ccip/internal/ccipdb/mocks/price_service_mock.go index d60a2382a19..98b8a527954 100644 --- a/core/services/ocr2/plugins/ccip/internal/ccipdb/mocks/price_service_mock.go +++ b/core/services/ocr2/plugins/ccip/internal/ccipdb/mocks/price_service_mock.go @@ -3,16 +3,14 @@ package mocks import ( + context "context" big "math/big" ccip "github.com/smartcontractkit/chainlink-common/pkg/types/ccip" ccipdata "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata" - context "context" - - mock "github.com/stretchr/testify/mock" - prices "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/prices" + mock "github.com/stretchr/testify/mock" ) // PriceService is an autogenerated mock type for the PriceService type diff --git a/core/services/ocr2/plugins/ccip/internal/pricegetter/all_price_getter_mock.go b/core/services/ocr2/plugins/ccip/internal/pricegetter/all_price_getter_mock.go index 73f4b1a4c4d..b4ad8346f63 100644 --- a/core/services/ocr2/plugins/ccip/internal/pricegetter/all_price_getter_mock.go +++ b/core/services/ocr2/plugins/ccip/internal/pricegetter/all_price_getter_mock.go @@ -7,7 +7,6 @@ import ( big "math/big" ccipcommon "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipcommon" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/ocr2/plugins/ccip/internal/pricegetter/mock.go b/core/services/ocr2/plugins/ccip/internal/pricegetter/mock.go index 695b8788a17..499d61a1c50 100644 --- a/core/services/ocr2/plugins/ccip/internal/pricegetter/mock.go +++ b/core/services/ocr2/plugins/ccip/internal/pricegetter/mock.go @@ -7,7 +7,6 @@ import ( big "math/big" ccip "github.com/smartcontractkit/chainlink-common/pkg/types/ccip" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/ocr2/plugins/ccip/prices/gas_price_estimator_exec_mock.go b/core/services/ocr2/plugins/ccip/prices/gas_price_estimator_exec_mock.go index 8ef1eda3f26..f7595580878 100644 --- a/core/services/ocr2/plugins/ccip/prices/gas_price_estimator_exec_mock.go +++ b/core/services/ocr2/plugins/ccip/prices/gas_price_estimator_exec_mock.go @@ -7,7 +7,6 @@ import ( big "math/big" ccip "github.com/smartcontractkit/chainlink-common/pkg/types/ccip" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/ocr2/plugins/ccip/prices/gas_price_estimator_mock.go b/core/services/ocr2/plugins/ccip/prices/gas_price_estimator_mock.go index 0a0dab3d83f..6dd05213665 100644 --- a/core/services/ocr2/plugins/ccip/prices/gas_price_estimator_mock.go +++ b/core/services/ocr2/plugins/ccip/prices/gas_price_estimator_mock.go @@ -7,7 +7,6 @@ import ( big "math/big" ccip "github.com/smartcontractkit/chainlink-common/pkg/types/ccip" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/ocr2/plugins/ccip/tokendata/reader_mock.go b/core/services/ocr2/plugins/ccip/tokendata/reader_mock.go index d98ef035226..fe1fefbe28b 100644 --- a/core/services/ocr2/plugins/ccip/tokendata/reader_mock.go +++ b/core/services/ocr2/plugins/ccip/tokendata/reader_mock.go @@ -6,7 +6,6 @@ import ( context "context" ccip "github.com/smartcontractkit/chainlink-common/pkg/types/ccip" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/mocks/registry.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/mocks/registry.go index 23fee609a78..61d5a2bf253 100644 --- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/mocks/registry.go +++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v20/mocks/registry.go @@ -7,13 +7,10 @@ import ( bind "github.com/ethereum/go-ethereum/accounts/abi/bind/v2" + types "github.com/ethereum/go-ethereum/core/types" generated "github.com/smartcontractkit/chainlink-evm/gethwrappers/generated" - keeper_registry_wrapper2_0 "github.com/smartcontractkit/chainlink-evm/gethwrappers/generated/keeper_registry_wrapper2_0" - mock "github.com/stretchr/testify/mock" - - types "github.com/ethereum/go-ethereum/core/types" ) // Registry is an autogenerated mock type for the Registry type diff --git a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/registry.go b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/registry.go index 1a80a1b8bc4..4449673a704 100644 --- a/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/registry.go +++ b/core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/mocks/registry.go @@ -7,13 +7,10 @@ import ( bind "github.com/ethereum/go-ethereum/accounts/abi/bind/v2" + types "github.com/ethereum/go-ethereum/core/types" generated "github.com/smartcontractkit/chainlink-evm/gethwrappers/generated" - i_automation_v21_plus_common "github.com/smartcontractkit/chainlink-evm/gethwrappers/generated/i_automation_v21_plus_common" - mock "github.com/stretchr/testify/mock" - - types "github.com/ethereum/go-ethereum/core/types" ) // Registry is an autogenerated mock type for the Registry type diff --git a/core/services/p2p/types/mocks/peer.go b/core/services/p2p/types/mocks/peer.go index 8396b3d5cd8..a7ea68f647b 100644 --- a/core/services/p2p/types/mocks/peer.go +++ b/core/services/p2p/types/mocks/peer.go @@ -5,10 +5,9 @@ package mocks import ( context "context" + types "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types" ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types" mock "github.com/stretchr/testify/mock" - - types "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types" ) // Peer is an autogenerated mock type for the Peer type diff --git a/core/services/p2p/types/mocks/shared_peer.go b/core/services/p2p/types/mocks/shared_peer.go index 4041fe3f0a5..8764dedc611 100644 --- a/core/services/p2p/types/mocks/shared_peer.go +++ b/core/services/p2p/types/mocks/shared_peer.go @@ -5,10 +5,9 @@ package mocks import ( context "context" + types "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types" ragep2ptypes "github.com/smartcontractkit/libocr/ragep2p/types" mock "github.com/stretchr/testify/mock" - - types "github.com/smartcontractkit/chainlink/v2/core/services/p2p/types" ) // SharedPeer is an autogenerated mock type for the SharedPeer type diff --git a/core/services/pipeline/mocks/orm.go b/core/services/pipeline/mocks/orm.go index 4e2b17cc911..4cca3ec65dd 100644 --- a/core/services/pipeline/mocks/orm.go +++ b/core/services/pipeline/mocks/orm.go @@ -4,15 +4,12 @@ package mocks import ( context "context" - - pipeline "github.com/smartcontractkit/chainlink/v2/core/services/pipeline" - mock "github.com/stretchr/testify/mock" - - sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" - time "time" uuid "github.com/google/uuid" + sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" + pipeline "github.com/smartcontractkit/chainlink/v2/core/services/pipeline" + mock "github.com/stretchr/testify/mock" ) // ORM is an autogenerated mock type for the ORM type diff --git a/core/services/pipeline/mocks/runner.go b/core/services/pipeline/mocks/runner.go index 613c30f1ef6..0bb44591acb 100644 --- a/core/services/pipeline/mocks/runner.go +++ b/core/services/pipeline/mocks/runner.go @@ -5,12 +5,10 @@ package mocks import ( context "context" + uuid "github.com/google/uuid" + sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" pipeline "github.com/smartcontractkit/chainlink/v2/core/services/pipeline" mock "github.com/stretchr/testify/mock" - - sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" - - uuid "github.com/google/uuid" ) // Runner is an autogenerated mock type for the Runner type diff --git a/core/services/relay/evm/types/mocks/log_poller_wrapper.go b/core/services/relay/evm/types/mocks/log_poller_wrapper.go index 89e201ef406..bb7551498f0 100644 --- a/core/services/relay/evm/types/mocks/log_poller_wrapper.go +++ b/core/services/relay/evm/types/mocks/log_poller_wrapper.go @@ -6,7 +6,6 @@ import ( context "context" config "github.com/smartcontractkit/chainlink-evm/pkg/config" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/s4/mocks/orm.go b/core/services/s4/mocks/orm.go index fd704d52f45..307cb3d694a 100644 --- a/core/services/s4/mocks/orm.go +++ b/core/services/s4/mocks/orm.go @@ -4,13 +4,11 @@ package mocks import ( context "context" + time "time" + sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" s4 "github.com/smartcontractkit/chainlink/v2/core/services/s4" mock "github.com/stretchr/testify/mock" - - sqlutil "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" - - time "time" ) // ORM is an autogenerated mock type for the ORM type diff --git a/core/services/s4/mocks/storage.go b/core/services/s4/mocks/storage.go index dcb981f8c43..8e7b84b0540 100644 --- a/core/services/s4/mocks/storage.go +++ b/core/services/s4/mocks/storage.go @@ -6,10 +6,8 @@ import ( context "context" common "github.com/ethereum/go-ethereum/common" - - mock "github.com/stretchr/testify/mock" - s4 "github.com/smartcontractkit/chainlink/v2/core/services/s4" + mock "github.com/stretchr/testify/mock" ) // Storage is an autogenerated mock type for the Storage type diff --git a/core/services/telemetry/monitoring_endpoint_generator_mock.go b/core/services/telemetry/monitoring_endpoint_generator_mock.go index 6234825f446..6ff3a382213 100644 --- a/core/services/telemetry/monitoring_endpoint_generator_mock.go +++ b/core/services/telemetry/monitoring_endpoint_generator_mock.go @@ -3,10 +3,9 @@ package telemetry import ( + synchronization "github.com/smartcontractkit/chainlink/v2/core/services/synchronization" commontypes "github.com/smartcontractkit/libocr/commontypes" mock "github.com/stretchr/testify/mock" - - synchronization "github.com/smartcontractkit/chainlink/v2/core/services/synchronization" ) // MockMonitoringEndpointGenerator is an autogenerated mock type for the MonitoringEndpointGenerator type diff --git a/core/services/vrf/mocks/fee_config.go b/core/services/vrf/mocks/fee_config.go index 6e7f9069eab..9c8dac62ac7 100644 --- a/core/services/vrf/mocks/fee_config.go +++ b/core/services/vrf/mocks/fee_config.go @@ -5,9 +5,7 @@ package mocks import ( common "github.com/ethereum/go-ethereum/common" assets "github.com/smartcontractkit/chainlink-evm/pkg/assets" - config "github.com/smartcontractkit/chainlink-evm/pkg/config" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/webhook/mocks/external_initiator_manager.go b/core/services/webhook/mocks/external_initiator_manager.go index f7445712b18..c2bb0a53d23 100644 --- a/core/services/webhook/mocks/external_initiator_manager.go +++ b/core/services/webhook/mocks/external_initiator_manager.go @@ -6,7 +6,6 @@ import ( context "context" bridges "github.com/smartcontractkit/chainlink/v2/core/bridges" - mock "github.com/stretchr/testify/mock" ) diff --git a/core/services/workflows/metering/mocks/billing_client.go b/core/services/workflows/metering/mocks/billing_client.go index 2e0972b037f..d1f94a0409e 100644 --- a/core/services/workflows/metering/mocks/billing_client.go +++ b/core/services/workflows/metering/mocks/billing_client.go @@ -6,7 +6,6 @@ import ( context "context" billing "github.com/smartcontractkit/chainlink-protos/billing/go" - emptypb "google.golang.org/protobuf/types/known/emptypb" mock "github.com/stretchr/testify/mock" diff --git a/core/sessions/mocks/authentication_provider.go b/core/sessions/mocks/authentication_provider.go index 7101b692f15..0adfe0e368c 100644 --- a/core/sessions/mocks/authentication_provider.go +++ b/core/sessions/mocks/authentication_provider.go @@ -3,16 +3,13 @@ package mocks import ( - auth "github.com/smartcontractkit/chainlink/v2/core/auth" - bridges "github.com/smartcontractkit/chainlink/v2/core/bridges" - context "context" gin "github.com/gin-gonic/gin" - - mock "github.com/stretchr/testify/mock" - + auth "github.com/smartcontractkit/chainlink/v2/core/auth" + bridges "github.com/smartcontractkit/chainlink/v2/core/bridges" sessions "github.com/smartcontractkit/chainlink/v2/core/sessions" + mock "github.com/stretchr/testify/mock" ) // AuthenticationProvider is an autogenerated mock type for the AuthenticationProvider type diff --git a/deployment/common/view/v1_0/mocks/workflow_registry_interface.go b/deployment/common/view/v1_0/mocks/workflow_registry_interface.go index 63ab681b992..4eec80d20f1 100644 --- a/deployment/common/view/v1_0/mocks/workflow_registry_interface.go +++ b/deployment/common/view/v1_0/mocks/workflow_registry_interface.go @@ -7,16 +7,11 @@ import ( bind "github.com/ethereum/go-ethereum/accounts/abi/bind/v2" common "github.com/ethereum/go-ethereum/common" - + types "github.com/ethereum/go-ethereum/core/types" event "github.com/ethereum/go-ethereum/event" - generated "github.com/smartcontractkit/chainlink-evm/gethwrappers/generated" - - mock "github.com/stretchr/testify/mock" - - types "github.com/ethereum/go-ethereum/core/types" - workflow_registry_wrapper_v1 "github.com/smartcontractkit/chainlink-evm/gethwrappers/workflow/generated/workflow_registry_wrapper_v1" + mock "github.com/stretchr/testify/mock" ) // WorkflowRegistryInterface is an autogenerated mock type for the WorkflowRegistryInterface type diff --git a/deployment/go.mod b/deployment/go.mod index 4ca56e2843a..37d13630bd2 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/deployment -go 1.25.7 +go 1.26.1 // Make sure we're working with the latest chainlink libs replace github.com/smartcontractkit/chainlink/v2 => ../ diff --git a/devenv/fakes/go.mod b/devenv/fakes/go.mod index a204f457a84..379575125e6 100644 --- a/devenv/fakes/go.mod +++ b/devenv/fakes/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/devenv/fakes -go 1.25.7 +go 1.26.1 require ( github.com/gin-gonic/gin v1.10.1 diff --git a/devenv/go.mod b/devenv/go.mod index 89a56cf9e31..cb5b6d6bd08 100644 --- a/devenv/go.mod +++ b/devenv/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/devenv -go 1.25.7 +go 1.26.1 require ( github.com/Masterminds/semver/v3 v3.4.0 diff --git a/go.mod b/go.mod index f37562af34a..4c71cf405a8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/v2 -go 1.25.7 +go 1.26.1 require ( github.com/BurntSushi/toml v1.5.0 diff --git a/integration-tests/.tool-versions b/integration-tests/.tool-versions index 0b368c979bf..245bdcb7744 100644 --- a/integration-tests/.tool-versions +++ b/integration-tests/.tool-versions @@ -1,4 +1,4 @@ -golang 1.25.5 +golang 1.26.1 k3d 5.4.6 kubectl 1.25.5 nodejs 20.13.1 diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 2327a95eb7b..6bd4733d5e9 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/integration-tests -go 1.25.7 +go 1.26.1 // Make sure we're working with the latest chainlink libs replace github.com/smartcontractkit/chainlink/v2 => ../ diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index f00b536b717..9daab80fbb4 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/load-tests -go 1.25.7 +go 1.26.1 // Make sure we're working with the latest chainlink libs replace github.com/smartcontractkit/chainlink/v2 => ../../ diff --git a/plugins/chainlink.Dockerfile b/plugins/chainlink.Dockerfile index ded589a44e6..d039b6cdf7c 100644 --- a/plugins/chainlink.Dockerfile +++ b/plugins/chainlink.Dockerfile @@ -7,7 +7,7 @@ # Stage: deps-base — module downloads, no source tree. # Stages that don't need the full source (remote plugins, delve) branch from # here so that source-only changes never invalidate their layer cache. -FROM golang:1.25.7-bookworm AS deps-base +FROM golang:1.26.1-bookworm AS deps-base RUN go version RUN apt-get update && apt-get install -y jq && rm -rf /var/lib/apt/lists/* diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index 78f84f4c283..930b3b2fb7e 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/system-tests/lib -go 1.25.7 +go 1.26.1 // Using a separate `require` here to avoid surrounding line changes // creating potential merge conflicts. diff --git a/system-tests/tests/canaries_sentinels/proof-of-reserve/cron-based/go.mod b/system-tests/tests/canaries_sentinels/proof-of-reserve/cron-based/go.mod index 76808c5603f..e79d64d5975 100644 --- a/system-tests/tests/canaries_sentinels/proof-of-reserve/cron-based/go.mod +++ b/system-tests/tests/canaries_sentinels/proof-of-reserve/cron-based/go.mod @@ -1,6 +1,6 @@ module main -go 1.25.7 +go 1.26.1 require ( github.com/ethereum/go-ethereum v1.17.1 diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index ab275af04d1..b3c055d2a07 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/system-tests/tests -go 1.25.7 +go 1.26.1 // Using a separate `require` here to avoid surrounding line changes // creating potential merge conflicts. diff --git a/system-tests/tests/regression/cre/consensus/go.mod b/system-tests/tests/regression/cre/consensus/go.mod index 0e8382197fd..8cab5d41d49 100644 --- a/system-tests/tests/regression/cre/consensus/go.mod +++ b/system-tests/tests/regression/cre/consensus/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/system-tests/tests/regression/cre/consensus -go 1.25.7 +go 1.26.1 require ( github.com/ethereum/go-ethereum v1.17.1 diff --git a/system-tests/tests/regression/cre/evm/evmread-negative/go.mod b/system-tests/tests/regression/cre/evm/evmread-negative/go.mod index 5126452bdf9..bc181f74b15 100644 --- a/system-tests/tests/regression/cre/evm/evmread-negative/go.mod +++ b/system-tests/tests/regression/cre/evm/evmread-negative/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/system-tests/tests/regression/cre/evm/evmread-negative -go 1.25.7 +go 1.26.1 require ( github.com/ethereum/go-ethereum v1.17.1 diff --git a/system-tests/tests/regression/cre/evm/evmwrite-negative/go.mod b/system-tests/tests/regression/cre/evm/evmwrite-negative/go.mod index f96f588a5f8..3a3a0bc17ef 100644 --- a/system-tests/tests/regression/cre/evm/evmwrite-negative/go.mod +++ b/system-tests/tests/regression/cre/evm/evmwrite-negative/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/system-tests/tests/regression/cre/evm/evmwrite-negative -go 1.25.7 +go 1.26.1 require ( github.com/ethereum/go-ethereum v1.17.1 diff --git a/system-tests/tests/regression/cre/evm/logtrigger-negative/go.mod b/system-tests/tests/regression/cre/evm/logtrigger-negative/go.mod index 56a6a4f5a69..d19131418cd 100644 --- a/system-tests/tests/regression/cre/evm/logtrigger-negative/go.mod +++ b/system-tests/tests/regression/cre/evm/logtrigger-negative/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/system-tests/tests/regression/cre/evm/logtrigger-negative -go 1.25.7 +go 1.26.1 require ( github.com/smartcontractkit/cre-sdk-go v1.5.0 diff --git a/system-tests/tests/regression/cre/http/go.mod b/system-tests/tests/regression/cre/http/go.mod index afa0b5cb27c..ed391ebad11 100644 --- a/system-tests/tests/regression/cre/http/go.mod +++ b/system-tests/tests/regression/cre/http/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/system-tests/tests/regression/cre/http -go 1.25.7 +go 1.26.1 require ( github.com/smartcontractkit/cre-sdk-go v1.5.0 diff --git a/system-tests/tests/regression/cre/httpaction-negative/go.mod b/system-tests/tests/regression/cre/httpaction-negative/go.mod index b2a747088c9..9239f5c8f6e 100644 --- a/system-tests/tests/regression/cre/httpaction-negative/go.mod +++ b/system-tests/tests/regression/cre/httpaction-negative/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/system-tests/tests/regression/cre/httpaction-negative -go 1.25.7 +go 1.26.1 require ( github.com/smartcontractkit/cre-sdk-go v1.5.0 diff --git a/system-tests/tests/smoke/cre/evm/evmread/go.mod b/system-tests/tests/smoke/cre/evm/evmread/go.mod index 99645da6d3f..ff448e603c8 100644 --- a/system-tests/tests/smoke/cre/evm/evmread/go.mod +++ b/system-tests/tests/smoke/cre/evm/evmread/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/system-tests/tests/smoke/cre/evm/evmread -go 1.25.7 +go 1.26.1 require ( github.com/ethereum/go-ethereum v1.17.1 diff --git a/system-tests/tests/smoke/cre/evm/logtrigger/go.mod b/system-tests/tests/smoke/cre/evm/logtrigger/go.mod index edca8a736f1..e146118c0de 100644 --- a/system-tests/tests/smoke/cre/evm/logtrigger/go.mod +++ b/system-tests/tests/smoke/cre/evm/logtrigger/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/system-tests/tests/smoke/cre/evm/logtrigger -go 1.25.7 +go 1.26.1 require ( github.com/ethereum/go-ethereum v1.17.1 diff --git a/system-tests/tests/smoke/cre/httpaction/go.mod b/system-tests/tests/smoke/cre/httpaction/go.mod index 3d4d504417b..c73d2c096ac 100644 --- a/system-tests/tests/smoke/cre/httpaction/go.mod +++ b/system-tests/tests/smoke/cre/httpaction/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/system-tests/tests/smoke/cre/httpaction -go 1.25.7 +go 1.26.1 require ( github.com/smartcontractkit/cre-sdk-go v1.5.0 diff --git a/system-tests/tests/smoke/cre/solana/solwrite/go.mod b/system-tests/tests/smoke/cre/solana/solwrite/go.mod index 3bba2f47499..47b39cf1153 100644 --- a/system-tests/tests/smoke/cre/solana/solwrite/go.mod +++ b/system-tests/tests/smoke/cre/solana/solwrite/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/system-tests/tests/smoke/cre/solana/solwrite -go 1.25.7 +go 1.26.1 require ( github.com/gagliardetto/binary v0.8.0 diff --git a/system-tests/tests/smoke/cre/vaultsecret/go.mod b/system-tests/tests/smoke/cre/vaultsecret/go.mod index 7f42b4ae6b4..1e2f980245b 100644 --- a/system-tests/tests/smoke/cre/vaultsecret/go.mod +++ b/system-tests/tests/smoke/cre/vaultsecret/go.mod @@ -1,6 +1,6 @@ module github.com/smartcontractkit/chainlink/system-tests/tests/smoke/cre/vaultsecret -go 1.25.7 +go 1.26.1 require ( github.com/smartcontractkit/cre-sdk-go v1.5.0