From 606e5f2b113bca494199a8385819132d6625403d Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Thu, 9 Nov 2023 09:24:14 -0600 Subject: [PATCH] switch sqlx from smartcontractkit to jmoiron (#11238) --- core/bridges/orm.go | 2 +- core/bridges/orm_test.go | 2 +- core/chains/evm/chain.go | 2 +- core/chains/evm/chain_test.go | 2 +- core/chains/evm/evm_txm.go | 2 +- .../evm/forwarders/forwarder_manager.go | 3 +- core/chains/evm/forwarders/orm.go | 2 +- core/chains/evm/forwarders/orm_test.go | 2 +- .../evm/headtracker/head_tracker_test.go | 2 +- core/chains/evm/headtracker/orm.go | 2 +- core/chains/evm/log/helpers_test.go | 2 +- core/chains/evm/log/orm.go | 2 +- core/chains/evm/logpoller/observability.go | 2 +- core/chains/evm/logpoller/orm.go | 2 +- core/chains/evm/txmgr/builder.go | 2 +- core/chains/evm/txmgr/evm_tx_store.go | 2 +- core/chains/evm/txmgr/txmgr_test.go | 2 +- core/cmd/ocr2vrf_configure_commands.go | 2 +- core/cmd/shell.go | 2 +- core/cmd/shell_local.go | 2 +- core/internal/cltest/cltest.go | 2 +- core/internal/cltest/factories.go | 2 +- core/internal/cltest/heavyweight/orm.go | 2 +- core/internal/cltest/job_factories.go | 2 +- core/internal/cltest/mocks.go | 2 +- core/internal/mocks/application.go | 2 +- core/internal/testutils/evmtest/evmtest.go | 2 +- core/internal/testutils/pgtest/pgtest.go | 2 +- core/internal/testutils/pgtest/txdb.go | 2 +- core/internal/testutils/pgtest/txdb_test.go | 2 +- core/internal/testutils/testutils.go | 2 +- core/scripts/go.mod | 5 ++-- core/scripts/go.sum | 6 ++-- core/scripts/vrfv2/testnet/main.go | 2 +- core/scripts/vrfv2plus/testnet/main.go | 5 ++-- core/services/chainlink/application.go | 2 +- core/services/chainlink/relayer_factory.go | 2 +- core/services/feeds/orm.go | 2 +- core/services/feeds/orm_test.go | 2 +- core/services/feeds/service.go | 3 +- core/services/fluxmonitorv2/delegate.go | 2 +- core/services/fluxmonitorv2/flux_monitor.go | 3 +- .../fluxmonitorv2/flux_monitor_test.go | 2 +- .../fluxmonitorv2/integrations_test.go | 2 +- core/services/fluxmonitorv2/orm.go | 2 +- core/services/functions/orm.go | 2 +- core/services/job/helpers_test.go | 2 +- core/services/job/job_orm_test.go | 3 +- .../job/job_pipeline_orm_integration_test.go | 2 +- core/services/job/orm.go | 6 ++-- core/services/job/orm_test.go | 2 +- core/services/job/spawner.go | 2 +- core/services/job/spawner_test.go | 2 +- core/services/keeper/delegate.go | 2 +- core/services/keeper/orm.go | 2 +- core/services/keeper/orm_test.go | 2 +- .../registry_synchronizer_helper_test.go | 2 +- core/services/keeper/upkeep_executer_test.go | 2 +- core/services/keystore/helpers_test.go | 2 +- core/services/keystore/keystoretest.go | 2 +- core/services/keystore/master.go | 2 +- core/services/keystore/orm.go | 2 +- core/services/ocr/contract_tracker.go | 3 +- core/services/ocr/database.go | 2 +- core/services/ocr/delegate.go | 2 +- core/services/ocr/helpers_internal_test.go | 2 +- core/services/ocr2/database.go | 2 +- core/services/ocr2/database_test.go | 2 +- core/services/ocr2/delegate.go | 2 +- .../ocr2/plugins/dkg/persistence/db.go | 2 +- .../ocr2/plugins/dkg/persistence/db_test.go | 2 +- core/services/ocr2/plugins/dkg/plugin.go | 2 +- .../services/ocr2/plugins/functions/plugin.go | 2 +- .../evm21/logprovider/integration_test.go | 2 +- .../ocr2/plugins/ocr2keeper/evm21/services.go | 2 +- .../ocr2keeper/evm21/upkeepstate/orm.go | 2 +- core/services/ocr2/plugins/ocr2keeper/util.go | 2 +- core/services/ocrbootstrap/database_test.go | 2 +- core/services/ocrbootstrap/delegate.go | 2 +- core/services/ocrcommon/peer_wrapper.go | 2 +- core/services/ocrcommon/peerstore.go | 3 +- core/services/pg/connection.go | 2 +- core/services/pg/connection_test.go | 2 +- core/services/pg/helpers_test.go | 2 +- core/services/pg/lease_lock.go | 2 +- core/services/pg/lease_lock_test.go | 2 +- core/services/pg/locked_db.go | 2 +- core/services/pg/q.go | 2 +- core/services/pg/sqlx.go | 2 +- core/services/pg/transaction.go | 2 +- core/services/pipeline/orm.go | 2 +- core/services/pipeline/orm_test.go | 2 +- core/services/pipeline/runner_test.go | 2 +- core/services/pipeline/test_helpers_test.go | 2 +- core/services/relay/evm/evm.go | 2 +- core/services/relay/evm/evm_test.go | 2 +- core/services/relay/evm/median.go | 2 +- core/services/relay/evm/mercury/orm.go | 2 +- .../evm/mercury/persistence_manager_test.go | 2 +- .../services/relay/evm/mercury/transmitter.go | 2 +- core/services/relay/evm/ocr2keeper.go | 2 +- core/services/relay/evm/ocr2vrf.go | 2 +- .../relay/evm/request_round_tracker.go | 3 +- core/services/s4/postgres_orm.go | 2 +- core/services/versioning/orm.go | 2 +- core/services/vrf/delegate.go | 2 +- core/services/vrf/delegate_test.go | 2 +- core/services/vrf/v2/integration_v2_test.go | 2 +- core/services/webhook/authorizer_test.go | 2 +- .../webhook/external_initiator_manager.go | 2 +- core/sessions/ldapauth/helpers_test.go | 2 +- core/sessions/ldapauth/ldap.go | 2 +- core/sessions/ldapauth/ldap_test.go | 2 +- core/sessions/ldapauth/sync.go | 2 +- core/sessions/localauth/orm.go | 2 +- core/sessions/localauth/orm_test.go | 2 +- core/sessions/webauthn.go | 2 +- core/sessions/webauthn_test.go | 2 +- core/store/migrate/migrate.go | 2 +- .../migrations/0036_external_job_id.go | 2 +- core/web/jobs_controller_test.go | 2 +- go.mod | 5 ++-- go.sum | 6 ++-- integration-tests/go.mod | 5 ++-- integration-tests/go.sum | 6 ++-- .../universal/log_poller/helpers.go | 28 +++++++++---------- 126 files changed, 156 insertions(+), 157 deletions(-) diff --git a/core/bridges/orm.go b/core/bridges/orm.go index 96801f4484c..cfad1da836e 100644 --- a/core/bridges/orm.go +++ b/core/bridges/orm.go @@ -6,8 +6,8 @@ import ( "sync" "time" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/auth" "github.com/smartcontractkit/chainlink/v2/core/logger" diff --git a/core/bridges/orm_test.go b/core/bridges/orm_test.go index b110b4f519d..0b485764c8b 100644 --- a/core/bridges/orm_test.go +++ b/core/bridges/orm_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/auth" "github.com/smartcontractkit/chainlink/v2/core/bridges" diff --git a/core/chains/evm/chain.go b/core/chains/evm/chain.go index 936abc6216c..b5896393d3c 100644 --- a/core/chains/evm/chain.go +++ b/core/chains/evm/chain.go @@ -11,7 +11,7 @@ import ( gotoml "github.com/pelletier/go-toml/v2" "go.uber.org/multierr" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" relaychains "github.com/smartcontractkit/chainlink-relay/pkg/chains" "github.com/smartcontractkit/chainlink-relay/pkg/services" diff --git a/core/chains/evm/chain_test.go b/core/chains/evm/chain_test.go index ba24598ef73..f25af87a35b 100644 --- a/core/chains/evm/chain_test.go +++ b/core/chains/evm/chain_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/chains/evm" "github.com/smartcontractkit/chainlink/v2/core/chains/evm/mocks" diff --git a/core/chains/evm/evm_txm.go b/core/chains/evm/evm_txm.go index a8673e954a6..bfc0f6378bf 100644 --- a/core/chains/evm/evm_txm.go +++ b/core/chains/evm/evm_txm.go @@ -3,7 +3,7 @@ package evm import ( "fmt" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client" evmconfig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config" diff --git a/core/chains/evm/forwarders/forwarder_manager.go b/core/chains/evm/forwarders/forwarder_manager.go index 46bca95ba30..934da487fd7 100644 --- a/core/chains/evm/forwarders/forwarder_manager.go +++ b/core/chains/evm/forwarders/forwarder_manager.go @@ -10,9 +10,10 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/services" + evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client" evmlogpoller "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller" evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types" diff --git a/core/chains/evm/forwarders/orm.go b/core/chains/evm/forwarders/orm.go index 287698d22f6..df89dbe29e9 100644 --- a/core/chains/evm/forwarders/orm.go +++ b/core/chains/evm/forwarders/orm.go @@ -4,8 +4,8 @@ import ( "database/sql" "github.com/ethereum/go-ethereum/common" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/pg" diff --git a/core/chains/evm/forwarders/orm_test.go b/core/chains/evm/forwarders/orm_test.go index a3d5c2831fe..f6d63dc574f 100644 --- a/core/chains/evm/forwarders/orm_test.go +++ b/core/chains/evm/forwarders/orm_test.go @@ -15,7 +15,7 @@ import ( "github.com/smartcontractkit/chainlink/v2/core/services/pg" "github.com/smartcontractkit/chainlink/v2/core/utils" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" ) type TestORM struct { diff --git a/core/chains/evm/headtracker/head_tracker_test.go b/core/chains/evm/headtracker/head_tracker_test.go index 502aa4ae6db..8af344098f8 100644 --- a/core/chains/evm/headtracker/head_tracker_test.go +++ b/core/chains/evm/headtracker/head_tracker_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/exp/maps" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/services" diff --git a/core/chains/evm/headtracker/orm.go b/core/chains/evm/headtracker/orm.go index 426df68b301..34f46ce44de 100644 --- a/core/chains/evm/headtracker/orm.go +++ b/core/chains/evm/headtracker/orm.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types" "github.com/smartcontractkit/chainlink/v2/core/logger" diff --git a/core/chains/evm/log/helpers_test.go b/core/chains/evm/log/helpers_test.go index 688757a3e96..f787002578e 100644 --- a/core/chains/evm/log/helpers_test.go +++ b/core/chains/evm/log/helpers_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client" evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks" diff --git a/core/chains/evm/log/orm.go b/core/chains/evm/log/orm.go index 4e51940f344..d383419d728 100644 --- a/core/chains/evm/log/orm.go +++ b/core/chains/evm/log/orm.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/pg" diff --git a/core/chains/evm/logpoller/observability.go b/core/chains/evm/logpoller/observability.go index 7f54fa9f09a..c4b58b42a2e 100644 --- a/core/chains/evm/logpoller/observability.go +++ b/core/chains/evm/logpoller/observability.go @@ -5,9 +5,9 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/jmoiron/sqlx" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" diff --git a/core/chains/evm/logpoller/orm.go b/core/chains/evm/logpoller/orm.go index 06f4acbb4f1..e044be2e0c9 100644 --- a/core/chains/evm/logpoller/orm.go +++ b/core/chains/evm/logpoller/orm.go @@ -8,8 +8,8 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/pg" diff --git a/core/chains/evm/txmgr/builder.go b/core/chains/evm/txmgr/builder.go index 9123d1dfc03..5e3d61301ca 100644 --- a/core/chains/evm/txmgr/builder.go +++ b/core/chains/evm/txmgr/builder.go @@ -4,7 +4,7 @@ import ( "math/big" "time" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/common/txmgr" txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types" diff --git a/core/chains/evm/txmgr/evm_tx_store.go b/core/chains/evm/txmgr/evm_tx_store.go index 971103bdfd5..4db7989b466 100644 --- a/core/chains/evm/txmgr/evm_tx_store.go +++ b/core/chains/evm/txmgr/evm_tx_store.go @@ -13,9 +13,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/google/uuid" "github.com/jackc/pgconn" + "github.com/jmoiron/sqlx" "github.com/lib/pq" pkgerrors "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" nullv4 "gopkg.in/guregu/null.v4" "github.com/smartcontractkit/chainlink/v2/common/txmgr" diff --git a/core/chains/evm/txmgr/txmgr_test.go b/core/chains/evm/txmgr/txmgr_test.go index 4aa54bc52a1..4e201b9c6fe 100644 --- a/core/chains/evm/txmgr/txmgr_test.go +++ b/core/chains/evm/txmgr/txmgr_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr" commontxmmocks "github.com/smartcontractkit/chainlink/v2/common/txmgr/types/mocks" diff --git a/core/cmd/ocr2vrf_configure_commands.go b/core/cmd/ocr2vrf_configure_commands.go index a3feddd611d..bb4cef4708b 100644 --- a/core/cmd/ocr2vrf_configure_commands.go +++ b/core/cmd/ocr2vrf_configure_commands.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/chains/evm/forwarders" "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/authorized_forwarder" diff --git a/core/cmd/shell.go b/core/cmd/shell.go index 80ecd2590b0..595c42b9fe1 100644 --- a/core/cmd/shell.go +++ b/core/cmd/shell.go @@ -29,7 +29,7 @@ import ( "go.uber.org/zap/zapcore" "golang.org/x/sync/errgroup" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/loop" diff --git a/core/cmd/shell_local.go b/core/cmd/shell_local.go index dea9a29359e..954cead5c37 100644 --- a/core/cmd/shell_local.go +++ b/core/cmd/shell_local.go @@ -29,7 +29,7 @@ import ( "golang.org/x/sync/errgroup" "gopkg.in/guregu/null.v4" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/assets" "github.com/smartcontractkit/chainlink/v2/core/build" diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go index e5c2ca031a7..778ccbdb154 100644 --- a/core/internal/cltest/cltest.go +++ b/core/internal/cltest/cltest.go @@ -39,8 +39,8 @@ import ( "github.com/tidwall/gjson" "github.com/urfave/cli" + "github.com/jmoiron/sqlx" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/loop" diff --git a/core/internal/cltest/factories.go b/core/internal/cltest/factories.go index 82235baf6b1..a52b9a5d06b 100644 --- a/core/internal/cltest/factories.go +++ b/core/internal/cltest/factories.go @@ -21,7 +21,7 @@ import ( "github.com/urfave/cli" "gopkg.in/guregu/null.v4" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr" txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types" diff --git a/core/internal/cltest/heavyweight/orm.go b/core/internal/cltest/heavyweight/orm.go index b46e7114cf3..5df28a49778 100644 --- a/core/internal/cltest/heavyweight/orm.go +++ b/core/internal/cltest/heavyweight/orm.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/cmd" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils" diff --git a/core/internal/cltest/job_factories.go b/core/internal/cltest/job_factories.go index b76d6c7ec2e..a9e403fb608 100644 --- a/core/internal/cltest/job_factories.go +++ b/core/internal/cltest/job_factories.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/bridges" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest" diff --git a/core/internal/cltest/mocks.go b/core/internal/cltest/mocks.go index 00f72199dd9..540924d7f02 100644 --- a/core/internal/cltest/mocks.go +++ b/core/internal/cltest/mocks.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/chains/evm" evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client" diff --git a/core/internal/mocks/application.go b/core/internal/mocks/application.go index 7853361db93..48f8e12dac3 100644 --- a/core/internal/mocks/application.go +++ b/core/internal/mocks/application.go @@ -31,7 +31,7 @@ import ( sessions "github.com/smartcontractkit/chainlink/v2/core/sessions" - sqlx "github.com/smartcontractkit/sqlx" + sqlx "github.com/jmoiron/sqlx" txmgr "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr" diff --git a/core/internal/testutils/evmtest/evmtest.go b/core/internal/testutils/evmtest/evmtest.go index 3a08c815166..80237d218d7 100644 --- a/core/internal/testutils/evmtest/evmtest.go +++ b/core/internal/testutils/evmtest/evmtest.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/ethereum/go-ethereum" + "github.com/jmoiron/sqlx" "github.com/pelletier/go-toml/v2" - "github.com/smartcontractkit/sqlx" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "gopkg.in/guregu/null.v4" diff --git a/core/internal/testutils/pgtest/pgtest.go b/core/internal/testutils/pgtest/pgtest.go index 283326de85f..1900fcc62b3 100644 --- a/core/internal/testutils/pgtest/pgtest.go +++ b/core/internal/testutils/pgtest/pgtest.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/google/uuid" + "github.com/jmoiron/sqlx" "github.com/scylladb/go-reflectx" - "github.com/smartcontractkit/sqlx" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/core/internal/testutils/pgtest/txdb.go b/core/internal/testutils/pgtest/txdb.go index 598a5dddc55..da9fd6cb2d0 100644 --- a/core/internal/testutils/pgtest/txdb.go +++ b/core/internal/testutils/pgtest/txdb.go @@ -12,7 +12,7 @@ import ( "sync" "testing" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "go.uber.org/multierr" "github.com/smartcontractkit/chainlink/v2/core/config/env" diff --git a/core/internal/testutils/pgtest/txdb_test.go b/core/internal/testutils/pgtest/txdb_test.go index 71960c6150a..c1aeef4b8c2 100644 --- a/core/internal/testutils/pgtest/txdb_test.go +++ b/core/internal/testutils/pgtest/txdb_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/google/uuid" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/stretchr/testify/assert" ) diff --git a/core/internal/testutils/testutils.go b/core/internal/testutils/testutils.go index 79c86f0c5f8..6ffd873d092 100644 --- a/core/internal/testutils/testutils.go +++ b/core/internal/testutils/testutils.go @@ -27,7 +27,7 @@ import ( "github.com/tidwall/gjson" "go.uber.org/zap/zaptest/observer" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/core/scripts/go.mod b/core/scripts/go.mod index aada3850db2..3adcc130bc0 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -13,6 +13,7 @@ require ( github.com/ethereum/go-ethereum v1.12.0 github.com/google/go-cmp v0.5.9 github.com/google/uuid v1.3.1 + github.com/jmoiron/sqlx v1.3.5 github.com/joho/godotenv v1.4.0 github.com/manyminds/api2go v0.0.0-20171030193247-e7b693844a6f github.com/montanaflynn/stats v0.7.1 @@ -24,7 +25,6 @@ require ( github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7 github.com/smartcontractkit/ocr2keepers v0.7.28 github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687 - github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb github.com/spf13/cobra v1.6.1 github.com/spf13/viper v1.15.0 github.com/stretchr/testify v1.8.4 @@ -199,7 +199,6 @@ require ( github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect github.com/jbenet/goprocess v0.1.4 // indirect github.com/jmhodges/levigo v1.0.0 // indirect - github.com/jmoiron/sqlx v1.3.5 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.0 // indirect @@ -304,7 +303,7 @@ require ( github.com/shirou/gopsutil/v3 v3.23.9 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect - github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231101160906-7acebcc1b353 // indirect + github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255 // indirect github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231107132621-6de9cc4fb264 // indirect github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231023133638-72f4e799ab05 // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231024133459-1ef3a11319eb // indirect diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 4f42c84d4ef..7f5d0e227d6 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1462,8 +1462,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231101160906-7acebcc1b353 h1:4iO3Ei1b/Lb0yprzclk93e1aQnYF92sIe+EJzMG87y4= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231101160906-7acebcc1b353/go.mod h1:hMhGr9ok3p4442keFtK6u6Ei9yWfG66fmDwsFi3aHcw= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255 h1:Pt6c7bJU9wIN6PQQnmN8UmYYH6lpfiQ6U/B8yEC2s5s= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255/go.mod h1:EHppaccd/LTlTMI2o4dmBHe4BknEgEFFDjDGMNuGb3k= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231107132621-6de9cc4fb264 h1:64bH7MmWzcy5tB16x40266DzgKr2iIVcDPjOro6Q3Us= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231107132621-6de9cc4fb264/go.mod h1:M9U1JV7IQi8Sfj4JR1qSi1tIh6omgW78W/8SHN/8BUQ= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231023133638-72f4e799ab05 h1:DaPSVnxe7oz1QJ+AVIhQWs1W3ubQvwvGo9NbHpMs1OQ= @@ -1480,8 +1480,6 @@ github.com/smartcontractkit/ocr2keepers v0.7.28 h1:dufAiYl4+uly9aH0+6GkS2jYzHGuj github.com/smartcontractkit/ocr2keepers v0.7.28/go.mod h1:1QGzJURnoWpysguPowOe2bshV0hNp1YX10HHlhDEsas= github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687 h1:NwC3SOc25noBTe1KUQjt45fyTIuInhoE2UfgcHAdihM= github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687/go.mod h1:YYZq52t4wcHoMQeITksYsorD+tZcOyuVU5+lvot3VFM= -github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb h1:OMaBUb4X9IFPLbGbCHsMU+kw/BPCrewaVwWGIBc0I4A= -github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb/go.mod h1:HNUu4cJekUdsJbwRBCiOybtkPJEfGRELQPe2tkoDEyk= github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 h1:yiKnypAqP8l0OX0P3klzZ7SCcBUxy5KqTAKZmQOvSQE= github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1/go.mod h1:q6f4fe39oZPdsh1i57WznEZgxd8siidMaSFq3wdPmVg= github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 h1:Dai1bn+Q5cpeGMQwRdjOdVjG8mmFFROVkSKuUgBErRQ= diff --git a/core/scripts/vrfv2/testnet/main.go b/core/scripts/vrfv2/testnet/main.go index 5b216776bd9..677c0b105ea 100644 --- a/core/scripts/vrfv2/testnet/main.go +++ b/core/scripts/vrfv2/testnet/main.go @@ -21,7 +21,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/shopspring/decimal" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" helpers "github.com/smartcontractkit/chainlink/core/scripts/common" "github.com/smartcontractkit/chainlink/v2/core/assets" diff --git a/core/scripts/vrfv2plus/testnet/main.go b/core/scripts/vrfv2plus/testnet/main.go index 0d1bf9a9481..b7940d6fda0 100644 --- a/core/scripts/vrfv2plus/testnet/main.go +++ b/core/scripts/vrfv2plus/testnet/main.go @@ -6,12 +6,13 @@ import ( "encoding/hex" "flag" "fmt" - "github.com/smartcontractkit/chainlink/core/scripts/vrfv2plus/testnet/v2plusscripts" "log" "math/big" "os" "strings" + "github.com/smartcontractkit/chainlink/core/scripts/vrfv2plus/testnet/v2plusscripts" + "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/chain_specific_util_helper" "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2_5" "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/vrf_coordinator_v2plus_interface" @@ -25,7 +26,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/shopspring/decimal" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" helpers "github.com/smartcontractkit/chainlink/core/scripts/common" "github.com/smartcontractkit/chainlink/v2/core/assets" diff --git a/core/services/chainlink/application.go b/core/services/chainlink/application.go index 3285acdc07a..0d479b1f1ab 100644 --- a/core/services/chainlink/application.go +++ b/core/services/chainlink/application.go @@ -16,7 +16,7 @@ import ( "go.uber.org/multierr" "go.uber.org/zap/zapcore" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/loop" relayservices "github.com/smartcontractkit/chainlink-relay/pkg/services" diff --git a/core/services/chainlink/relayer_factory.go b/core/services/chainlink/relayer_factory.go index 76bfcd16412..d452decda1e 100644 --- a/core/services/chainlink/relayer_factory.go +++ b/core/services/chainlink/relayer_factory.go @@ -7,7 +7,7 @@ import ( "github.com/pelletier/go-toml/v2" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-cosmos/pkg/cosmos" coscfg "github.com/smartcontractkit/chainlink-cosmos/pkg/cosmos/config" diff --git a/core/services/feeds/orm.go b/core/services/feeds/orm.go index 30b6ad632a6..24ed7b8b369 100644 --- a/core/services/feeds/orm.go +++ b/core/services/feeds/orm.go @@ -9,7 +9,7 @@ import ( "github.com/lib/pq" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/pg" diff --git a/core/services/feeds/orm_test.go b/core/services/feeds/orm_test.go index 3d51ad45fff..02b9e24739c 100644 --- a/core/services/feeds/orm_test.go +++ b/core/services/feeds/orm_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/guregu/null.v4" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/bridges" "github.com/smartcontractkit/chainlink/v2/core/internal/cltest" diff --git a/core/services/feeds/service.go b/core/services/feeds/service.go index 20919606faf..f6e8952d6b1 100644 --- a/core/services/feeds/service.go +++ b/core/services/feeds/service.go @@ -15,9 +15,10 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "gopkg.in/guregu/null.v4" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/services" + "github.com/smartcontractkit/chainlink/v2/core/chains/evm" "github.com/smartcontractkit/chainlink/v2/core/logger" pb "github.com/smartcontractkit/chainlink/v2/core/services/feeds/proto" diff --git a/core/services/fluxmonitorv2/delegate.go b/core/services/fluxmonitorv2/delegate.go index d380122f715..e63f3556726 100644 --- a/core/services/fluxmonitorv2/delegate.go +++ b/core/services/fluxmonitorv2/delegate.go @@ -3,7 +3,7 @@ package fluxmonitorv2 import ( "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr" "github.com/smartcontractkit/chainlink/v2/core/chains/evm" diff --git a/core/services/fluxmonitorv2/flux_monitor.go b/core/services/fluxmonitorv2/flux_monitor.go index 99d33c42399..5dbeaeafc31 100644 --- a/core/services/fluxmonitorv2/flux_monitor.go +++ b/core/services/fluxmonitorv2/flux_monitor.go @@ -13,9 +13,10 @@ import ( "github.com/pkg/errors" "github.com/shopspring/decimal" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/services" + "github.com/smartcontractkit/chainlink/v2/core/bridges" evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client" "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log" diff --git a/core/services/fluxmonitorv2/flux_monitor_test.go b/core/services/fluxmonitorv2/flux_monitor_test.go index 26ec520e7cd..e81e1ba9e63 100644 --- a/core/services/fluxmonitorv2/flux_monitor_test.go +++ b/core/services/fluxmonitorv2/flux_monitor_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/guregu/null.v4" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr" "github.com/smartcontractkit/chainlink/v2/core/assets" diff --git a/core/services/fluxmonitorv2/integrations_test.go b/core/services/fluxmonitorv2/integrations_test.go index b2f24e08d54..38c73d3ad74 100644 --- a/core/services/fluxmonitorv2/integrations_test.go +++ b/core/services/fluxmonitorv2/integrations_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/assets" "github.com/smartcontractkit/chainlink/v2/core/bridges" diff --git a/core/services/fluxmonitorv2/orm.go b/core/services/fluxmonitorv2/orm.go index 61395e8708a..f85ab146c7e 100644 --- a/core/services/fluxmonitorv2/orm.go +++ b/core/services/fluxmonitorv2/orm.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/common/txmgr/types" "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr" diff --git a/core/services/functions/orm.go b/core/services/functions/orm.go index b6f692019a1..7838c700858 100644 --- a/core/services/functions/orm.go +++ b/core/services/functions/orm.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/pg" diff --git a/core/services/job/helpers_test.go b/core/services/job/helpers_test.go index 167ed5297cc..4151ed401c8 100644 --- a/core/services/job/helpers_test.go +++ b/core/services/job/helpers_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/guregu/null.v4" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/internal/cltest" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils" diff --git a/core/services/job/job_orm_test.go b/core/services/job/job_orm_test.go index 6306dedcefa..f4471e75c68 100644 --- a/core/services/job/job_orm_test.go +++ b/core/services/job/job_orm_test.go @@ -16,8 +16,6 @@ import ( "github.com/smartcontractkit/chainlink-relay/pkg/types" - "github.com/smartcontractkit/chainlink/v2/core/services/relay" - "github.com/smartcontractkit/chainlink/v2/core/assets" "github.com/smartcontractkit/chainlink/v2/core/bridges" evmcfg "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml" @@ -38,6 +36,7 @@ import ( ocr2validate "github.com/smartcontractkit/chainlink/v2/core/services/ocr2/validate" "github.com/smartcontractkit/chainlink/v2/core/services/ocrbootstrap" "github.com/smartcontractkit/chainlink/v2/core/services/pipeline" + "github.com/smartcontractkit/chainlink/v2/core/services/relay" evmrelay "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm" "github.com/smartcontractkit/chainlink/v2/core/services/vrf/vrfcommon" "github.com/smartcontractkit/chainlink/v2/core/services/webhook" diff --git a/core/services/job/job_pipeline_orm_integration_test.go b/core/services/job/job_pipeline_orm_integration_test.go index a2b6cc4618c..f1307753d29 100644 --- a/core/services/job/job_pipeline_orm_integration_test.go +++ b/core/services/job/job_pipeline_orm_integration_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/bridges" "github.com/smartcontractkit/chainlink/v2/core/internal/cltest" diff --git a/core/services/job/orm.go b/core/services/job/orm.go index c6ec4ed5c8e..fb897bc9281 100644 --- a/core/services/job/orm.go +++ b/core/services/job/orm.go @@ -16,7 +16,7 @@ import ( "github.com/pkg/errors" "go.uber.org/multierr" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/types" @@ -992,11 +992,13 @@ func (o *orm) loadPipelineRunIDs(jobID *int32, offset, limit int, tx pg.Queryer) // range minID <-> maxID. for n := int64(1000); maxID > 0 && len(ids) < limit; n *= 2 { + var batch []int64 minID := maxID - n - if err = tx.Select(&ids, stmt, offset, limit-len(ids), minID, maxID); err != nil { + if err = tx.Select(&batch, stmt, offset, limit-len(ids), minID, maxID); err != nil { err = errors.Wrap(err, "error loading runs") return } + ids = append(ids, batch...) if offset > 0 { if len(ids) > 0 { // If we're already receiving rows back, then we no longer need an offset diff --git a/core/services/job/orm_test.go b/core/services/job/orm_test.go index 48805388a36..41d02dba060 100644 --- a/core/services/job/orm_test.go +++ b/core/services/job/orm_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/bridges" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest" diff --git a/core/services/job/spawner.go b/core/services/job/spawner.go index b2a8dad68f0..03ee8cee13a 100644 --- a/core/services/job/spawner.go +++ b/core/services/job/spawner.go @@ -9,7 +9,7 @@ import ( pkgerrors "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" relayservices "github.com/smartcontractkit/chainlink-relay/pkg/services" diff --git a/core/services/job/spawner_test.go b/core/services/job/spawner_test.go index 1f10a86e9ce..cfe646d8660 100644 --- a/core/services/job/spawner_test.go +++ b/core/services/job/spawner_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/loop" "github.com/smartcontractkit/chainlink-relay/pkg/services" diff --git a/core/services/keeper/delegate.go b/core/services/keeper/delegate.go index 6c68203f843..6d413624969 100644 --- a/core/services/keeper/delegate.go +++ b/core/services/keeper/delegate.go @@ -3,7 +3,7 @@ package keeper import ( "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/chains/evm" "github.com/smartcontractkit/chainlink/v2/core/logger" diff --git a/core/services/keeper/orm.go b/core/services/keeper/orm.go index e281d610644..91883f8056c 100644 --- a/core/services/keeper/orm.go +++ b/core/services/keeper/orm.go @@ -3,9 +3,9 @@ package keeper import ( "math/rand" + "github.com/jmoiron/sqlx" "github.com/lib/pq" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey" diff --git a/core/services/keeper/orm_test.go b/core/services/keeper/orm_test.go index d990effa103..d67baa09a06 100644 --- a/core/services/keeper/orm_test.go +++ b/core/services/keeper/orm_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" evmconfig "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config" "github.com/smartcontractkit/chainlink/v2/core/internal/cltest" diff --git a/core/services/keeper/registry_synchronizer_helper_test.go b/core/services/keeper/registry_synchronizer_helper_test.go index 63dc6343535..966366b1069 100644 --- a/core/services/keeper/registry_synchronizer_helper_test.go +++ b/core/services/keeper/registry_synchronizer_helper_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks" "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log" diff --git a/core/services/keeper/upkeep_executer_test.go b/core/services/keeper/upkeep_executer_test.go index 7f9698435f8..32b1d2c191d 100644 --- a/core/services/keeper/upkeep_executer_test.go +++ b/core/services/keeper/upkeep_executer_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/assets" "github.com/smartcontractkit/chainlink/v2/core/chains/evm" diff --git a/core/services/keystore/helpers_test.go b/core/services/keystore/helpers_test.go index 13627dd0231..d0b2a21ab38 100644 --- a/core/services/keystore/helpers_test.go +++ b/core/services/keystore/helpers_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey" diff --git a/core/services/keystore/keystoretest.go b/core/services/keystore/keystoretest.go index 0b5ce4e0057..6efc8e76bcf 100644 --- a/core/services/keystore/keystoretest.go +++ b/core/services/keystore/keystoretest.go @@ -4,7 +4,7 @@ import ( "errors" "sync" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/pg" diff --git a/core/services/keystore/master.go b/core/services/keystore/master.go index fb28202b527..05f19495f9d 100644 --- a/core/services/keystore/master.go +++ b/core/services/keystore/master.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/cosmoskey" diff --git a/core/services/keystore/orm.go b/core/services/keystore/orm.go index 6f612105ea9..3d75d6f2369 100644 --- a/core/services/keystore/orm.go +++ b/core/services/keystore/orm.go @@ -7,8 +7,8 @@ import ( "github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/ethkey" "github.com/smartcontractkit/chainlink/v2/core/services/pg" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" ) func NewORM(db *sqlx.DB, lggr logger.Logger, cfg pg.QConfig) ksORM { diff --git a/core/services/ocr/contract_tracker.go b/core/services/ocr/contract_tracker.go index f49e556d4e8..db19bdd4f0a 100644 --- a/core/services/ocr/contract_tracker.go +++ b/core/services/ocr/contract_tracker.go @@ -14,13 +14,14 @@ import ( gethTypes "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/libocr/gethwrappers/offchainaggregator" "github.com/smartcontractkit/libocr/offchainreporting/confighelper" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types" "github.com/smartcontractkit/chainlink-relay/pkg/services" + evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client" httypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/headtracker/types" "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log" diff --git a/core/services/ocr/database.go b/core/services/ocr/database.go index cd8e584e39a..524dfa0e7bb 100644 --- a/core/services/ocr/database.go +++ b/core/services/ocr/database.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" "go.uber.org/multierr" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/libocr/gethwrappers/offchainaggregator" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting/types" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/pg" diff --git a/core/services/ocr/delegate.go b/core/services/ocr/delegate.go index 6eb6714a474..0559469abb4 100644 --- a/core/services/ocr/delegate.go +++ b/core/services/ocr/delegate.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" relaylogger "github.com/smartcontractkit/chainlink-relay/pkg/logger" diff --git a/core/services/ocr/helpers_internal_test.go b/core/services/ocr/helpers_internal_test.go index 9a1f887986e..57b669ef401 100644 --- a/core/services/ocr/helpers_internal_test.go +++ b/core/services/ocr/helpers_internal_test.go @@ -3,7 +3,7 @@ package ocr import ( "testing" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest" "github.com/smartcontractkit/chainlink/v2/core/logger" diff --git a/core/services/ocr2/database.go b/core/services/ocr2/database.go index 7061ad0452f..5591f33fd40 100644 --- a/core/services/ocr2/database.go +++ b/core/services/ocr2/database.go @@ -6,11 +6,11 @@ import ( "encoding/binary" "time" + "github.com/jmoiron/sqlx" "github.com/lib/pq" "github.com/pkg/errors" ocrcommon "github.com/smartcontractkit/libocr/commontypes" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/pg" diff --git a/core/services/ocr2/database_test.go b/core/services/ocr2/database_test.go index aabb2b33a79..b70ac629da1 100644 --- a/core/services/ocr2/database_test.go +++ b/core/services/ocr2/database_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/jmoiron/sqlx" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/internal/cltest" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils" diff --git a/core/services/ocr2/delegate.go b/core/services/ocr2/delegate.go index 1e87915bd15..95ec1469156 100644 --- a/core/services/ocr2/delegate.go +++ b/core/services/ocr2/delegate.go @@ -14,6 +14,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/pkg/errors" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/libocr/commontypes" libocr2 "github.com/smartcontractkit/libocr/offchainreporting2plus" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" @@ -27,7 +28,6 @@ import ( "github.com/smartcontractkit/ocr2vrf/altbn_128" dkgpkg "github.com/smartcontractkit/ocr2vrf/dkg" "github.com/smartcontractkit/ocr2vrf/ocr2vrf" - "github.com/smartcontractkit/sqlx" relaylogger "github.com/smartcontractkit/chainlink-relay/pkg/logger" "github.com/smartcontractkit/chainlink-relay/pkg/loop" diff --git a/core/services/ocr2/plugins/dkg/persistence/db.go b/core/services/ocr2/plugins/dkg/persistence/db.go index 75fb3b391fa..c020a68cbe7 100644 --- a/core/services/ocr2/plugins/dkg/persistence/db.go +++ b/core/services/ocr2/plugins/dkg/persistence/db.go @@ -9,13 +9,13 @@ import ( "time" "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" ocr2vrftypes "github.com/smartcontractkit/ocr2vrf/types" "github.com/smartcontractkit/ocr2vrf/types/hash" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/pg" diff --git a/core/services/ocr2/plugins/dkg/persistence/db_test.go b/core/services/ocr2/plugins/dkg/persistence/db_test.go index b830a8db3bc..4e029c1cb2a 100644 --- a/core/services/ocr2/plugins/dkg/persistence/db_test.go +++ b/core/services/ocr2/plugins/dkg/persistence/db_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/ethereum/go-ethereum/crypto" + "github.com/jmoiron/sqlx" ocr2vrftypes "github.com/smartcontractkit/ocr2vrf/types" "github.com/smartcontractkit/ocr2vrf/types/hash" - "github.com/smartcontractkit/sqlx" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/core/services/ocr2/plugins/dkg/plugin.go b/core/services/ocr2/plugins/dkg/plugin.go index 540518b553c..92910ff7bbe 100644 --- a/core/services/ocr2/plugins/dkg/plugin.go +++ b/core/services/ocr2/plugins/dkg/plugin.go @@ -6,12 +6,12 @@ import ( "fmt" "math/big" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" "github.com/smartcontractkit/libocr/commontypes" libocr2 "github.com/smartcontractkit/libocr/offchainreporting2plus" "github.com/smartcontractkit/ocr2vrf/altbn_128" "github.com/smartcontractkit/ocr2vrf/dkg" - "github.com/smartcontractkit/sqlx" evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client" "github.com/smartcontractkit/chainlink/v2/core/logger" diff --git a/core/services/ocr2/plugins/functions/plugin.go b/core/services/ocr2/plugins/functions/plugin.go index 10f780371b2..26cffac5abf 100644 --- a/core/services/ocr2/plugins/functions/plugin.go +++ b/core/services/ocr2/plugins/functions/plugin.go @@ -7,8 +7,8 @@ import ( "time" "github.com/ethereum/go-ethereum/common" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/libocr/commontypes" libocr2 "github.com/smartcontractkit/libocr/offchainreporting2plus" diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/integration_test.go b/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/integration_test.go index 63ed4114b8e..9a1e99610c1 100644 --- a/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/integration_test.go +++ b/core/services/ocr2/plugins/ocr2keeper/evm21/logprovider/integration_test.go @@ -17,7 +17,7 @@ import ( "go.uber.org/zap/zapcore" "golang.org/x/time/rate" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" ocr2keepers "github.com/smartcontractkit/ocr2keepers/pkg/v3/types" diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/services.go b/core/services/ocr2/plugins/ocr2keeper/evm21/services.go index f9d3dd92591..d178a9af574 100644 --- a/core/services/ocr2/plugins/ocr2keeper/evm21/services.go +++ b/core/services/ocr2/plugins/ocr2keeper/evm21/services.go @@ -4,11 +4,11 @@ import ( "fmt" "github.com/ethereum/go-ethereum/common" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" "github.com/smartcontractkit/ocr2keepers/pkg/v3/plugin" ocr2keepers "github.com/smartcontractkit/ocr2keepers/pkg/v3/types" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/chains/evm" iregistry21 "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/i_keeper_registry_master_wrapper_2_1" diff --git a/core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/orm.go b/core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/orm.go index 5db2f8bd0f3..c918ad595fa 100644 --- a/core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/orm.go +++ b/core/services/ocr2/plugins/ocr2keeper/evm21/upkeepstate/orm.go @@ -4,8 +4,8 @@ import ( "math/big" "time" + "github.com/jmoiron/sqlx" "github.com/lib/pq" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/pg" diff --git a/core/services/ocr2/plugins/ocr2keeper/util.go b/core/services/ocr2/plugins/ocr2keeper/util.go index 132afd0d29d..fca98d87005 100644 --- a/core/services/ocr2/plugins/ocr2keeper/util.go +++ b/core/services/ocr2/plugins/ocr2keeper/util.go @@ -3,12 +3,12 @@ package ocr2keeper import ( "fmt" + "github.com/jmoiron/sqlx" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" ocr2keepers20 "github.com/smartcontractkit/ocr2keepers/pkg/v2" ocr2keepers20coordinator "github.com/smartcontractkit/ocr2keepers/pkg/v2/coordinator" ocr2keepers20polling "github.com/smartcontractkit/ocr2keepers/pkg/v2/observer/polling" ocr2keepers20runner "github.com/smartcontractkit/ocr2keepers/pkg/v2/runner" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/types" diff --git a/core/services/ocrbootstrap/database_test.go b/core/services/ocrbootstrap/database_test.go index 2f160eff582..e00e318c69c 100644 --- a/core/services/ocrbootstrap/database_test.go +++ b/core/services/ocrbootstrap/database_test.go @@ -3,7 +3,7 @@ package ocrbootstrap_test import ( "testing" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/stretchr/testify/require" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" diff --git a/core/services/ocrbootstrap/delegate.go b/core/services/ocrbootstrap/delegate.go index 3910ca05d38..34e3ee0a710 100644 --- a/core/services/ocrbootstrap/delegate.go +++ b/core/services/ocrbootstrap/delegate.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" + "github.com/jmoiron/sqlx" ocr "github.com/smartcontractkit/libocr/offchainreporting2plus" - "github.com/smartcontractkit/sqlx" relaylogger "github.com/smartcontractkit/chainlink-relay/pkg/logger" "github.com/smartcontractkit/chainlink-relay/pkg/loop" diff --git a/core/services/ocrcommon/peer_wrapper.go b/core/services/ocrcommon/peer_wrapper.go index 0781303275d..1daa84b7212 100644 --- a/core/services/ocrcommon/peer_wrapper.go +++ b/core/services/ocrcommon/peer_wrapper.go @@ -11,11 +11,11 @@ import ( "github.com/pkg/errors" "go.uber.org/multierr" + "github.com/jmoiron/sqlx" ocrnetworking "github.com/smartcontractkit/libocr/networking" ocrnetworkingtypes "github.com/smartcontractkit/libocr/networking/types" ocr1types "github.com/smartcontractkit/libocr/offchainreporting/types" ocr2types "github.com/smartcontractkit/libocr/offchainreporting2plus/types" - "github.com/smartcontractkit/sqlx" relaylogger "github.com/smartcontractkit/chainlink-relay/pkg/logger" "github.com/smartcontractkit/chainlink-relay/pkg/services" diff --git a/core/services/ocrcommon/peerstore.go b/core/services/ocrcommon/peerstore.go index f1c318a3bff..02a4d90f578 100644 --- a/core/services/ocrcommon/peerstore.go +++ b/core/services/ocrcommon/peerstore.go @@ -12,9 +12,10 @@ import ( ma "github.com/multiformats/go-multiaddr" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/services" + "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/recovery" "github.com/smartcontractkit/chainlink/v2/core/services/keystore/keys/p2pkey" diff --git a/core/services/pg/connection.go b/core/services/pg/connection.go index 19c48a118b9..0bafd5dcd0f 100644 --- a/core/services/pg/connection.go +++ b/core/services/pg/connection.go @@ -6,8 +6,8 @@ import ( "github.com/google/uuid" _ "github.com/jackc/pgx/v4/stdlib" // need to make sure pgx driver is registered before opening connection + "github.com/jmoiron/sqlx" "github.com/scylladb/go-reflectx" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/store/dialects" ) diff --git a/core/services/pg/connection_test.go b/core/services/pg/connection_test.go index 92781343c61..651bf9d2d9b 100644 --- a/core/services/pg/connection_test.go +++ b/core/services/pg/connection_test.go @@ -5,7 +5,7 @@ import ( "github.com/google/uuid" _ "github.com/jackc/pgx/v4/stdlib" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/stretchr/testify/require" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils" diff --git a/core/services/pg/helpers_test.go b/core/services/pg/helpers_test.go index c5ccda6bd9a..52158535a2e 100644 --- a/core/services/pg/helpers_test.go +++ b/core/services/pg/helpers_test.go @@ -1,6 +1,6 @@ package pg -import "github.com/smartcontractkit/sqlx" +import "github.com/jmoiron/sqlx" func SetConn(lock interface{}, conn *sqlx.Conn) { switch v := lock.(type) { diff --git a/core/services/pg/lease_lock.go b/core/services/pg/lease_lock.go index 656005016ef..e21cec44bda 100644 --- a/core/services/pg/lease_lock.go +++ b/core/services/pg/lease_lock.go @@ -8,8 +8,8 @@ import ( "time" "github.com/google/uuid" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" "go.uber.org/multierr" "github.com/smartcontractkit/chainlink/v2/core/logger" diff --git a/core/services/pg/lease_lock_test.go b/core/services/pg/lease_lock_test.go index 483e03e0039..1b4116b5bf9 100644 --- a/core/services/pg/lease_lock_test.go +++ b/core/services/pg/lease_lock_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/internal/cltest" "github.com/smartcontractkit/chainlink/v2/core/internal/cltest/heavyweight" diff --git a/core/services/pg/locked_db.go b/core/services/pg/locked_db.go index af4481285ce..a9157fe1ae1 100644 --- a/core/services/pg/locked_db.go +++ b/core/services/pg/locked_db.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/config" "github.com/smartcontractkit/chainlink/v2/core/logger" diff --git a/core/services/pg/q.go b/core/services/pg/q.go index 9c70d813ab6..470d39c825c 100644 --- a/core/services/pg/q.go +++ b/core/services/pg/q.go @@ -15,7 +15,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/logger" ) diff --git a/core/services/pg/sqlx.go b/core/services/pg/sqlx.go index cd5427463dd..820cd51712e 100644 --- a/core/services/pg/sqlx.go +++ b/core/services/pg/sqlx.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" mapper "github.com/scylladb/go-reflectx" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/logger" ) diff --git a/core/services/pg/transaction.go b/core/services/pg/transaction.go index 932b1120859..d237c20d4c6 100644 --- a/core/services/pg/transaction.go +++ b/core/services/pg/transaction.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "go.uber.org/multierr" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/logger" diff --git a/core/services/pipeline/orm.go b/core/services/pipeline/orm.go index 148901bb36c..d60050700f7 100644 --- a/core/services/pipeline/orm.go +++ b/core/services/pipeline/orm.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/services" diff --git a/core/services/pipeline/orm_test.go b/core/services/pipeline/orm_test.go index 295ad20a007..dcbbfd9c97e 100644 --- a/core/services/pipeline/orm_test.go +++ b/core/services/pipeline/orm_test.go @@ -10,7 +10,7 @@ import ( "go.uber.org/zap/zapcore" "gopkg.in/guregu/null.v4" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/bridges" "github.com/smartcontractkit/chainlink/v2/core/internal/cltest" diff --git a/core/services/pipeline/runner_test.go b/core/services/pipeline/runner_test.go index 3abcdbe0abe..695590e7bd0 100644 --- a/core/services/pipeline/runner_test.go +++ b/core/services/pipeline/runner_test.go @@ -37,7 +37,7 @@ import ( "github.com/smartcontractkit/chainlink/v2/core/services/pipeline/mocks" "github.com/smartcontractkit/chainlink/v2/core/utils" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" ) func newRunner(t testing.TB, db *sqlx.DB, bridgeORM bridges.ORM, cfg chainlink.GeneralConfig) (pipeline.Runner, *mocks.ORM) { diff --git a/core/services/pipeline/test_helpers_test.go b/core/services/pipeline/test_helpers_test.go index 8353f5fb5b4..3b72a1625be 100644 --- a/core/services/pipeline/test_helpers_test.go +++ b/core/services/pipeline/test_helpers_test.go @@ -16,7 +16,7 @@ import ( "github.com/smartcontractkit/chainlink/v2/core/services/pg" "github.com/smartcontractkit/chainlink/v2/core/services/pipeline" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" ) func fakeExternalAdapter(t *testing.T, expectedRequest, response interface{}) http.Handler { diff --git a/core/services/relay/evm/evm.go b/core/services/relay/evm/evm.go index 3f45b41f46e..111e3622b19 100644 --- a/core/services/relay/evm/evm.go +++ b/core/services/relay/evm/evm.go @@ -13,12 +13,12 @@ import ( pkgerrors "github.com/pkg/errors" "go.uber.org/multierr" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/libocr/gethwrappers2/ocr2aggregator" "github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median" "github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median/evmreportcodec" "github.com/smartcontractkit/libocr/offchainreporting2plus/chains/evmutil" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/services" relaytypes "github.com/smartcontractkit/chainlink-relay/pkg/types" diff --git a/core/services/relay/evm/evm_test.go b/core/services/relay/evm/evm_test.go index 4e9c44a7b93..8f49128ff2d 100644 --- a/core/services/relay/evm/evm_test.go +++ b/core/services/relay/evm/evm_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils/configtest" "github.com/smartcontractkit/chainlink/v2/core/services/pg" diff --git a/core/services/relay/evm/median.go b/core/services/relay/evm/median.go index b7d751e01e1..5184326cf25 100644 --- a/core/services/relay/evm/median.go +++ b/core/services/relay/evm/median.go @@ -7,12 +7,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" "github.com/smartcontractkit/libocr/gethwrappers2/ocr2aggregator" "github.com/smartcontractkit/libocr/offchainreporting2/reportingplugin/median" "github.com/smartcontractkit/libocr/offchainreporting2plus/types" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/chains/evm" offchain_aggregator_wrapper "github.com/smartcontractkit/chainlink/v2/core/internal/gethwrappers2/generated/offchainaggregator" diff --git a/core/services/relay/evm/mercury/orm.go b/core/services/relay/evm/mercury/orm.go index 7273519f6b6..f8d4c8cb1ee 100644 --- a/core/services/relay/evm/mercury/orm.go +++ b/core/services/relay/evm/mercury/orm.go @@ -8,9 +8,9 @@ import ( "sync" "github.com/ethereum/go-ethereum/common" + "github.com/jmoiron/sqlx" "github.com/lib/pq" pkgerrors "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" diff --git a/core/services/relay/evm/mercury/persistence_manager_test.go b/core/services/relay/evm/mercury/persistence_manager_test.go index d185a64a8f1..dbdb9777252 100644 --- a/core/services/relay/evm/mercury/persistence_manager_test.go +++ b/core/services/relay/evm/mercury/persistence_manager_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/cometbft/cometbft/libs/rand" + "github.com/jmoiron/sqlx" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" - "github.com/smartcontractkit/sqlx" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/zap/zapcore" diff --git a/core/services/relay/evm/mercury/transmitter.go b/core/services/relay/evm/mercury/transmitter.go index 557210e58a5..269f28b122d 100644 --- a/core/services/relay/evm/mercury/transmitter.go +++ b/core/services/relay/evm/mercury/transmitter.go @@ -16,9 +16,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/libocr/offchainreporting2plus/chains/evmutil" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" - "github.com/smartcontractkit/sqlx" relaymercury "github.com/smartcontractkit/chainlink-relay/pkg/reportingplugins/mercury" "github.com/smartcontractkit/chainlink-relay/pkg/services" diff --git a/core/services/relay/evm/ocr2keeper.go b/core/services/relay/evm/ocr2keeper.go index baf98b9b006..a284d677ebf 100644 --- a/core/services/relay/evm/ocr2keeper.go +++ b/core/services/relay/evm/ocr2keeper.go @@ -8,12 +8,12 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" "github.com/smartcontractkit/libocr/gethwrappers2/ocr2aggregator" "github.com/smartcontractkit/libocr/offchainreporting2plus/chains/evmutil" "github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types" "github.com/smartcontractkit/ocr2keepers/pkg/v3/plugin" - "github.com/smartcontractkit/sqlx" relaytypes "github.com/smartcontractkit/chainlink-relay/pkg/types" diff --git a/core/services/relay/evm/ocr2vrf.go b/core/services/relay/evm/ocr2vrf.go index 14004d0b1aa..0c9414068e3 100644 --- a/core/services/relay/evm/ocr2vrf.go +++ b/core/services/relay/evm/ocr2vrf.go @@ -7,11 +7,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" "github.com/smartcontractkit/libocr/gethwrappers2/ocr2aggregator" "github.com/smartcontractkit/libocr/offchainreporting2plus/chains/evmutil" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" - "github.com/smartcontractkit/sqlx" relaytypes "github.com/smartcontractkit/chainlink-relay/pkg/types" diff --git a/core/services/relay/evm/request_round_tracker.go b/core/services/relay/evm/request_round_tracker.go index 4e065f2dfdf..c1c3a49e0e4 100644 --- a/core/services/relay/evm/request_round_tracker.go +++ b/core/services/relay/evm/request_round_tracker.go @@ -9,11 +9,12 @@ import ( gethTypes "github.com/ethereum/go-ethereum/core/types" "github.com/pkg/errors" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/libocr/gethwrappers2/ocr2aggregator" ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink-relay/pkg/services" + evmclient "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client" "github.com/smartcontractkit/chainlink/v2/core/chains/evm/log" offchain_aggregator_wrapper "github.com/smartcontractkit/chainlink/v2/core/internal/gethwrappers2/generated/offchainaggregator" diff --git a/core/services/s4/postgres_orm.go b/core/services/s4/postgres_orm.go index d0a79dba959..1f91270fd08 100644 --- a/core/services/s4/postgres_orm.go +++ b/core/services/s4/postgres_orm.go @@ -9,8 +9,8 @@ import ( "github.com/smartcontractkit/chainlink/v2/core/services/pg" "github.com/smartcontractkit/chainlink/v2/core/utils" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" ) const ( diff --git a/core/services/versioning/orm.go b/core/services/versioning/orm.go index 03bd64fdd2b..8ed745955dc 100644 --- a/core/services/versioning/orm.go +++ b/core/services/versioning/orm.go @@ -7,8 +7,8 @@ import ( "github.com/Masterminds/semver/v3" "github.com/jackc/pgconn" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/pg" diff --git a/core/services/vrf/delegate.go b/core/services/vrf/delegate.go index 558d48752d2..e976d01b995 100644 --- a/core/services/vrf/delegate.go +++ b/core/services/vrf/delegate.go @@ -10,7 +10,7 @@ import ( "github.com/theodesp/go-heaps/pairing" "go.uber.org/multierr" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/assets" "github.com/smartcontractkit/chainlink/v2/core/chains/evm" diff --git a/core/services/vrf/delegate_test.go b/core/services/vrf/delegate_test.go index 927e2ae6829..389e1159be1 100644 --- a/core/services/vrf/delegate_test.go +++ b/core/services/vrf/delegate_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/assets" "github.com/smartcontractkit/chainlink/v2/core/bridges" diff --git a/core/services/vrf/v2/integration_v2_test.go b/core/services/vrf/v2/integration_v2_test.go index e50ed91491b..1f607da2f26 100644 --- a/core/services/vrf/v2/integration_v2_test.go +++ b/core/services/vrf/v2/integration_v2_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/guregu/null.v4" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr" txmgrtypes "github.com/smartcontractkit/chainlink/v2/common/txmgr/types" diff --git a/core/services/webhook/authorizer_test.go b/core/services/webhook/authorizer_test.go index 19dbf381408..b6eb2feaccb 100644 --- a/core/services/webhook/authorizer_test.go +++ b/core/services/webhook/authorizer_test.go @@ -3,7 +3,7 @@ package webhook_test import ( "testing" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/bridges" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils" diff --git a/core/services/webhook/external_initiator_manager.go b/core/services/webhook/external_initiator_manager.go index 2e881ec42d6..01edf82b114 100644 --- a/core/services/webhook/external_initiator_manager.go +++ b/core/services/webhook/external_initiator_manager.go @@ -10,7 +10,7 @@ import ( "github.com/lib/pq" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/bridges" "github.com/smartcontractkit/chainlink/v2/core/logger" diff --git a/core/sessions/ldapauth/helpers_test.go b/core/sessions/ldapauth/helpers_test.go index c554d5436ed..3566ea84380 100644 --- a/core/sessions/ldapauth/helpers_test.go +++ b/core/sessions/ldapauth/helpers_test.go @@ -3,7 +3,7 @@ package ldapauth import ( "time" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/config" "github.com/smartcontractkit/chainlink/v2/core/logger" diff --git a/core/sessions/ldapauth/ldap.go b/core/sessions/ldapauth/ldap.go index 188f2684e7e..04f6fbfbbb6 100644 --- a/core/sessions/ldapauth/ldap.go +++ b/core/sessions/ldapauth/ldap.go @@ -32,7 +32,7 @@ import ( "time" "github.com/go-ldap/ldap/v3" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/auth" "github.com/smartcontractkit/chainlink/v2/core/bridges" diff --git a/core/sessions/ldapauth/ldap_test.go b/core/sessions/ldapauth/ldap_test.go index 261141d66e9..c85e0db831e 100644 --- a/core/sessions/ldapauth/ldap_test.go +++ b/core/sessions/ldapauth/ldap_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/internal/cltest" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest" diff --git a/core/sessions/ldapauth/sync.go b/core/sessions/ldapauth/sync.go index ce7a338f40e..67f101b62a4 100644 --- a/core/sessions/ldapauth/sync.go +++ b/core/sessions/ldapauth/sync.go @@ -6,8 +6,8 @@ import ( "time" "github.com/go-ldap/ldap/v3" + "github.com/jmoiron/sqlx" "github.com/lib/pq" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/config" "github.com/smartcontractkit/chainlink/v2/core/logger" diff --git a/core/sessions/localauth/orm.go b/core/sessions/localauth/orm.go index d6fb8cd5788..090dc468a62 100644 --- a/core/sessions/localauth/orm.go +++ b/core/sessions/localauth/orm.go @@ -6,8 +6,8 @@ import ( "strings" "time" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" - "github.com/smartcontractkit/sqlx" "github.com/smartcontractkit/chainlink/v2/core/auth" "github.com/smartcontractkit/chainlink/v2/core/bridges" diff --git a/core/sessions/localauth/orm_test.go b/core/sessions/localauth/orm_test.go index 7868937ad08..c2e155de282 100644 --- a/core/sessions/localauth/orm_test.go +++ b/core/sessions/localauth/orm_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" "github.com/smartcontractkit/chainlink/v2/core/auth" "github.com/smartcontractkit/chainlink/v2/core/internal/cltest" diff --git a/core/sessions/webauthn.go b/core/sessions/webauthn.go index 41e31d7aaa8..89e7758bc5b 100644 --- a/core/sessions/webauthn.go +++ b/core/sessions/webauthn.go @@ -9,8 +9,8 @@ import ( "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" + sqlxTypes "github.com/jmoiron/sqlx/types" "github.com/pkg/errors" - sqlxTypes "github.com/smartcontractkit/sqlx/types" ) // WebAuthn holds the credentials for API user. diff --git a/core/sessions/webauthn_test.go b/core/sessions/webauthn_test.go index b3c1ecf7897..9c055d9c794 100644 --- a/core/sessions/webauthn_test.go +++ b/core/sessions/webauthn_test.go @@ -7,7 +7,7 @@ import ( "github.com/go-webauthn/webauthn/protocol" "github.com/go-webauthn/webauthn/webauthn" - sqlxTypes "github.com/smartcontractkit/sqlx/types" + sqlxTypes "github.com/jmoiron/sqlx/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/core/store/migrate/migrate.go b/core/store/migrate/migrate.go index 69cf9a78247..1e58d7a0b05 100644 --- a/core/store/migrate/migrate.go +++ b/core/store/migrate/migrate.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" + "github.com/jmoiron/sqlx" "github.com/pkg/errors" "github.com/pressly/goose/v3" - "github.com/smartcontractkit/sqlx" "gopkg.in/guregu/null.v4" "github.com/smartcontractkit/chainlink/v2/core/config/env" diff --git a/core/store/migrate/migrations/0036_external_job_id.go b/core/store/migrate/migrations/0036_external_job_id.go index 8637bd38f56..fc9ec08ec60 100644 --- a/core/store/migrate/migrations/0036_external_job_id.go +++ b/core/store/migrate/migrations/0036_external_job_id.go @@ -6,8 +6,8 @@ import ( "fmt" "github.com/google/uuid" + "github.com/jmoiron/sqlx" "github.com/pressly/goose/v3" - "github.com/smartcontractkit/sqlx" ) func init() { diff --git a/core/web/jobs_controller_test.go b/core/web/jobs_controller_test.go index 0bd947bbce3..2e3f3a83693 100644 --- a/core/web/jobs_controller_test.go +++ b/core/web/jobs_controller_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/smartcontractkit/sqlx" + "github.com/jmoiron/sqlx" evmclimocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/client/mocks" "github.com/smartcontractkit/chainlink/v2/core/internal/cltest" diff --git a/go.mod b/go.mod index e6af9533dc7..67896860e09 100644 --- a/go.mod +++ b/go.mod @@ -65,14 +65,13 @@ require ( github.com/shirou/gopsutil/v3 v3.23.9 github.com/shopspring/decimal v1.3.1 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 - github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231101160906-7acebcc1b353 + github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255 github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231107132621-6de9cc4fb264 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231023133638-72f4e799ab05 github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231024133459-1ef3a11319eb github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7 github.com/smartcontractkit/ocr2keepers v0.7.28 github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687 - github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 github.com/smartcontractkit/wsrpc v0.7.2 @@ -238,7 +237,7 @@ require ( github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect github.com/jbenet/goprocess v0.1.4 // indirect github.com/jmhodges/levigo v1.0.0 // indirect - github.com/jmoiron/sqlx v1.3.5 // indirect + github.com/jmoiron/sqlx v1.3.5 github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.0 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect diff --git a/go.sum b/go.sum index 5c70c22a75e..89e9aee85fa 100644 --- a/go.sum +++ b/go.sum @@ -1463,8 +1463,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231101160906-7acebcc1b353 h1:4iO3Ei1b/Lb0yprzclk93e1aQnYF92sIe+EJzMG87y4= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231101160906-7acebcc1b353/go.mod h1:hMhGr9ok3p4442keFtK6u6Ei9yWfG66fmDwsFi3aHcw= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255 h1:Pt6c7bJU9wIN6PQQnmN8UmYYH6lpfiQ6U/B8yEC2s5s= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255/go.mod h1:EHppaccd/LTlTMI2o4dmBHe4BknEgEFFDjDGMNuGb3k= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231107132621-6de9cc4fb264 h1:64bH7MmWzcy5tB16x40266DzgKr2iIVcDPjOro6Q3Us= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231107132621-6de9cc4fb264/go.mod h1:M9U1JV7IQi8Sfj4JR1qSi1tIh6omgW78W/8SHN/8BUQ= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231023133638-72f4e799ab05 h1:DaPSVnxe7oz1QJ+AVIhQWs1W3ubQvwvGo9NbHpMs1OQ= @@ -1481,8 +1481,6 @@ github.com/smartcontractkit/ocr2keepers v0.7.28 h1:dufAiYl4+uly9aH0+6GkS2jYzHGuj github.com/smartcontractkit/ocr2keepers v0.7.28/go.mod h1:1QGzJURnoWpysguPowOe2bshV0hNp1YX10HHlhDEsas= github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687 h1:NwC3SOc25noBTe1KUQjt45fyTIuInhoE2UfgcHAdihM= github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687/go.mod h1:YYZq52t4wcHoMQeITksYsorD+tZcOyuVU5+lvot3VFM= -github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb h1:OMaBUb4X9IFPLbGbCHsMU+kw/BPCrewaVwWGIBc0I4A= -github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb/go.mod h1:HNUu4cJekUdsJbwRBCiOybtkPJEfGRELQPe2tkoDEyk= github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 h1:yiKnypAqP8l0OX0P3klzZ7SCcBUxy5KqTAKZmQOvSQE= github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1/go.mod h1:q6f4fe39oZPdsh1i57WznEZgxd8siidMaSFq3wdPmVg= github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 h1:Dai1bn+Q5cpeGMQwRdjOdVjG8mmFFROVkSKuUgBErRQ= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 8fe63a46d26..c51bd3c4f6e 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -12,6 +12,7 @@ require ( github.com/ethereum/go-ethereum v1.12.0 github.com/go-resty/resty/v2 v2.7.0 github.com/google/uuid v1.3.1 + github.com/jmoiron/sqlx v1.3.5 github.com/kelseyhightower/envconfig v1.4.0 github.com/lib/pq v1.10.9 github.com/manifoldco/promptui v0.9.0 @@ -26,7 +27,6 @@ require ( github.com/smartcontractkit/libocr v0.0.0-20231107151413-13e0202ae8d7 github.com/smartcontractkit/ocr2keepers v0.7.28 github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687 - github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 github.com/smartcontractkit/wasp v0.3.0 github.com/spf13/cobra v1.6.1 @@ -259,7 +259,6 @@ require ( github.com/jbenet/goprocess v0.1.4 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect - github.com/jmoiron/sqlx v1.3.5 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -387,7 +386,7 @@ require ( github.com/shopspring/decimal v1.3.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect - github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231101160906-7acebcc1b353 // indirect + github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255 // indirect github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231107132621-6de9cc4fb264 // indirect github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231023133638-72f4e799ab05 // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20231024133459-1ef3a11319eb // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index b8e8b205c87..4afa0de1d38 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -2367,8 +2367,8 @@ github.com/slack-go/slack v0.12.2 h1:x3OppyMyGIbbiyFhsBmpf9pwkUzMhthJMRNmNlA4LaQ github.com/slack-go/slack v0.12.2/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231101160906-7acebcc1b353 h1:4iO3Ei1b/Lb0yprzclk93e1aQnYF92sIe+EJzMG87y4= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231101160906-7acebcc1b353/go.mod h1:hMhGr9ok3p4442keFtK6u6Ei9yWfG66fmDwsFi3aHcw= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255 h1:Pt6c7bJU9wIN6PQQnmN8UmYYH6lpfiQ6U/B8yEC2s5s= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20231109141932-cb1ea9020255/go.mod h1:EHppaccd/LTlTMI2o4dmBHe4BknEgEFFDjDGMNuGb3k= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231107132621-6de9cc4fb264 h1:64bH7MmWzcy5tB16x40266DzgKr2iIVcDPjOro6Q3Us= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231107132621-6de9cc4fb264/go.mod h1:M9U1JV7IQi8Sfj4JR1qSi1tIh6omgW78W/8SHN/8BUQ= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231023133638-72f4e799ab05 h1:DaPSVnxe7oz1QJ+AVIhQWs1W3ubQvwvGo9NbHpMs1OQ= @@ -2387,8 +2387,6 @@ github.com/smartcontractkit/ocr2keepers v0.7.28 h1:dufAiYl4+uly9aH0+6GkS2jYzHGuj github.com/smartcontractkit/ocr2keepers v0.7.28/go.mod h1:1QGzJURnoWpysguPowOe2bshV0hNp1YX10HHlhDEsas= github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687 h1:NwC3SOc25noBTe1KUQjt45fyTIuInhoE2UfgcHAdihM= github.com/smartcontractkit/ocr2vrf v0.0.0-20230804151440-2f1eb1e20687/go.mod h1:YYZq52t4wcHoMQeITksYsorD+tZcOyuVU5+lvot3VFM= -github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb h1:OMaBUb4X9IFPLbGbCHsMU+kw/BPCrewaVwWGIBc0I4A= -github.com/smartcontractkit/sqlx v1.3.5-0.20210805004948-4be295aacbeb/go.mod h1:HNUu4cJekUdsJbwRBCiOybtkPJEfGRELQPe2tkoDEyk= github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1 h1:yiKnypAqP8l0OX0P3klzZ7SCcBUxy5KqTAKZmQOvSQE= github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20230906073235-9e478e5e19f1/go.mod h1:q6f4fe39oZPdsh1i57WznEZgxd8siidMaSFq3wdPmVg= github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20230906073235-9e478e5e19f1 h1:Dai1bn+Q5cpeGMQwRdjOdVjG8mmFFROVkSKuUgBErRQ= diff --git a/integration-tests/universal/log_poller/helpers.go b/integration-tests/universal/log_poller/helpers.go index aa488eb1be5..ab7a221955b 100644 --- a/integration-tests/universal/log_poller/helpers.go +++ b/integration-tests/universal/log_poller/helpers.go @@ -17,36 +17,36 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" geth_types "github.com/ethereum/go-ethereum/core/types" + "github.com/jmoiron/sqlx" "github.com/rs/zerolog" + "github.com/scylladb/go-reflectx" + "github.com/stretchr/testify/require" + "github.com/smartcontractkit/chainlink-testing-framework/blockchain" ctf_blockchain "github.com/smartcontractkit/chainlink-testing-framework/blockchain" + ctf_test_env "github.com/smartcontractkit/chainlink-testing-framework/docker/test_env" "github.com/smartcontractkit/chainlink-testing-framework/logging" "github.com/smartcontractkit/chainlink-testing-framework/networks" - "github.com/smartcontractkit/chainlink/integration-tests/actions" - "github.com/smartcontractkit/chainlink/integration-tests/client" - "github.com/smartcontractkit/chainlink/integration-tests/contracts/ethereum" - "github.com/smartcontractkit/chainlink/integration-tests/types/config/node" "github.com/smartcontractkit/wasp" + evmcfg "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml" "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller" + lpEvm "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller" cltypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types" "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/automation_utils_2_1" + le "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/log_emitter" + core_logger "github.com/smartcontractkit/chainlink/v2/core/logger" + "github.com/smartcontractkit/chainlink/v2/core/services/pg" "github.com/smartcontractkit/chainlink/v2/core/store/models" - ctf_test_env "github.com/smartcontractkit/chainlink-testing-framework/docker/test_env" + "github.com/smartcontractkit/chainlink/integration-tests/actions" + "github.com/smartcontractkit/chainlink/integration-tests/client" "github.com/smartcontractkit/chainlink/integration-tests/contracts" + "github.com/smartcontractkit/chainlink/integration-tests/contracts/ethereum" "github.com/smartcontractkit/chainlink/integration-tests/docker/test_env" - "github.com/stretchr/testify/require" - - "github.com/scylladb/go-reflectx" + "github.com/smartcontractkit/chainlink/integration-tests/types/config/node" it_utils "github.com/smartcontractkit/chainlink/integration-tests/utils" utils2 "github.com/smartcontractkit/chainlink/integration-tests/utils" - evmcfg "github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml" - lpEvm "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller" - le "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/log_emitter" - core_logger "github.com/smartcontractkit/chainlink/v2/core/logger" - "github.com/smartcontractkit/chainlink/v2/core/services/pg" - "github.com/smartcontractkit/sqlx" ) var (