From cf1786e13b1b55049cfa713e76c04d3eb753f564 Mon Sep 17 00:00:00 2001 From: Jordan Krage Date: Thu, 14 Mar 2024 14:58:40 -0500 Subject: [PATCH] bump common for sqlutil.DB -> DataSource rename (#12435) --- core/chains/evm/forwarders/forwarder_manager.go | 2 +- core/chains/evm/forwarders/forwarder_manager_test.go | 2 +- core/chains/evm/forwarders/mocks/orm.go | 4 ++-- core/chains/evm/forwarders/orm.go | 10 +++++----- core/chains/evm/forwarders/orm_test.go | 4 ++-- core/chains/evm/headtracker/orm.go | 4 ++-- core/chains/evm/logpoller/observability.go | 2 +- core/chains/evm/logpoller/orm.go | 8 ++++---- core/chains/evm/txmgr/builder.go | 2 +- core/chains/legacyevm/chain.go | 2 +- core/chains/legacyevm/evm_txm.go | 2 +- core/cmd/shell.go | 2 +- core/internal/cltest/factories.go | 2 +- core/internal/mocks/application.go | 8 ++++---- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 ++-- core/services/chainlink/application.go | 8 ++++---- core/services/pg/q.go | 4 ++-- core/services/pg/sqlx.go | 2 +- core/services/webhook/authorizer.go | 6 +++--- core/web/evm_forwarders_controller.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 ++-- 27 files changed, 50 insertions(+), 50 deletions(-) diff --git a/core/chains/evm/forwarders/forwarder_manager.go b/core/chains/evm/forwarders/forwarder_manager.go index 491b144a338..f0786c091c4 100644 --- a/core/chains/evm/forwarders/forwarder_manager.go +++ b/core/chains/evm/forwarders/forwarder_manager.go @@ -54,7 +54,7 @@ type FwdMgr struct { wg sync.WaitGroup } -func NewFwdMgr(db sqlutil.DB, client evmclient.Client, logpoller evmlogpoller.LogPoller, l logger.Logger, cfg Config) *FwdMgr { +func NewFwdMgr(db sqlutil.DataSource, client evmclient.Client, logpoller evmlogpoller.LogPoller, l logger.Logger, cfg Config) *FwdMgr { lggr := logger.Sugared(logger.Named(l, "EVMForwarderManager")) fwdMgr := FwdMgr{ logger: lggr, diff --git a/core/chains/evm/forwarders/forwarder_manager_test.go b/core/chains/evm/forwarders/forwarder_manager_test.go index 6752b75eaf3..3a515e7ab39 100644 --- a/core/chains/evm/forwarders/forwarder_manager_test.go +++ b/core/chains/evm/forwarders/forwarder_manager_test.go @@ -89,7 +89,7 @@ func TestFwdMgr_MaybeForwardTransaction(t *testing.T) { require.NoError(t, err) cleanupCalled := false - cleanup := func(tx sqlutil.DB, evmChainId int64, addr common.Address) error { + cleanup := func(tx sqlutil.DataSource, evmChainId int64, addr common.Address) error { require.Equal(t, testutils.FixtureChainID.Int64(), evmChainId) require.Equal(t, forwarderAddr, addr) require.NotNil(t, tx) diff --git a/core/chains/evm/forwarders/mocks/orm.go b/core/chains/evm/forwarders/mocks/orm.go index babde57611f..795c74e27e9 100644 --- a/core/chains/evm/forwarders/mocks/orm.go +++ b/core/chains/evm/forwarders/mocks/orm.go @@ -49,7 +49,7 @@ func (_m *ORM) CreateForwarder(ctx context.Context, addr common.Address, evmChai } // DeleteForwarder provides a mock function with given fields: ctx, id, cleanup -func (_m *ORM) DeleteForwarder(ctx context.Context, id int64, cleanup func(sqlutil.DB, int64, common.Address) error) error { +func (_m *ORM) DeleteForwarder(ctx context.Context, id int64, cleanup func(sqlutil.DataSource, int64, common.Address) error) error { ret := _m.Called(ctx, id, cleanup) if len(ret) == 0 { @@ -57,7 +57,7 @@ func (_m *ORM) DeleteForwarder(ctx context.Context, id int64, cleanup func(sqlut } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, int64, func(sqlutil.DB, int64, common.Address) error) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, int64, func(sqlutil.DataSource, int64, common.Address) error) error); ok { r0 = rf(ctx, id, cleanup) } else { r0 = ret.Error(0) diff --git a/core/chains/evm/forwarders/orm.go b/core/chains/evm/forwarders/orm.go index dc50cd4dfb8..cf498518d6d 100644 --- a/core/chains/evm/forwarders/orm.go +++ b/core/chains/evm/forwarders/orm.go @@ -19,17 +19,17 @@ type ORM interface { CreateForwarder(ctx context.Context, addr common.Address, evmChainId big.Big) (fwd Forwarder, err error) FindForwarders(ctx context.Context, offset, limit int) ([]Forwarder, int, error) FindForwardersByChain(ctx context.Context, evmChainId big.Big) ([]Forwarder, error) - DeleteForwarder(ctx context.Context, id int64, cleanup func(tx sqlutil.DB, evmChainId int64, addr common.Address) error) error + DeleteForwarder(ctx context.Context, id int64, cleanup func(tx sqlutil.DataSource, evmChainId int64, addr common.Address) error) error FindForwardersInListByChain(ctx context.Context, evmChainId big.Big, addrs []common.Address) ([]Forwarder, error) } type DbORM struct { - db sqlutil.DB + db sqlutil.DataSource } var _ ORM = &DbORM{} -func NewORM(db sqlutil.DB) *DbORM { +func NewORM(db sqlutil.DataSource) *DbORM { return &DbORM{db: db} } @@ -38,7 +38,7 @@ func (o *DbORM) Transaction(ctx context.Context, fn func(*DbORM) error) (err err } // new returns a NewORM like o, but backed by q. -func (o *DbORM) new(q sqlutil.DB) *DbORM { return NewORM(q) } +func (o *DbORM) new(q sqlutil.DataSource) *DbORM { return NewORM(q) } // CreateForwarder creates the Forwarder address associated with the current EVM chain id. func (o *DbORM) CreateForwarder(ctx context.Context, addr common.Address, evmChainId big.Big) (fwd Forwarder, err error) { @@ -50,7 +50,7 @@ func (o *DbORM) CreateForwarder(ctx context.Context, addr common.Address, evmCha // DeleteForwarder removes a forwarder address. // If cleanup is non-nil, it can be used to perform any chain- or contract-specific cleanup that need to happen atomically // on forwarder deletion. If cleanup returns an error, forwarder deletion will be aborted. -func (o *DbORM) DeleteForwarder(ctx context.Context, id int64, cleanup func(tx sqlutil.DB, evmChainID int64, addr common.Address) error) (err error) { +func (o *DbORM) DeleteForwarder(ctx context.Context, id int64, cleanup func(tx sqlutil.DataSource, evmChainID int64, addr common.Address) error) (err error) { return o.Transaction(ctx, func(orm *DbORM) error { var dest struct { EvmChainId int64 diff --git a/core/chains/evm/forwarders/orm_test.go b/core/chains/evm/forwarders/orm_test.go index e54fe8bf925..7af55896b16 100644 --- a/core/chains/evm/forwarders/orm_test.go +++ b/core/chains/evm/forwarders/orm_test.go @@ -18,7 +18,7 @@ import ( type TestORM struct { ORM - db sqlutil.DB + db sqlutil.DataSource } func setupORM(t *testing.T) *TestORM { @@ -54,7 +54,7 @@ func Test_DeleteForwarder(t *testing.T) { rets := []error{ErrCleaningUp, nil, nil, ErrCleaningUp} expected := []error{ErrCleaningUp, nil, sql.ErrNoRows, sql.ErrNoRows} - testCleanupFn := func(q sqlutil.DB, evmChainID int64, addr common.Address) error { + testCleanupFn := func(q sqlutil.DataSource, evmChainID int64, addr common.Address) error { require.Less(t, cleanupCalled, len(rets)) cleanupCalled++ return rets[cleanupCalled-1] diff --git a/core/chains/evm/headtracker/orm.go b/core/chains/evm/headtracker/orm.go index f87ffe88af3..8912bafecdf 100644 --- a/core/chains/evm/headtracker/orm.go +++ b/core/chains/evm/headtracker/orm.go @@ -31,11 +31,11 @@ var _ ORM = &DbORM{} type DbORM struct { chainID ubig.Big - db sqlutil.DB + db sqlutil.DataSource } // NewORM creates an ORM scoped to chainID. -func NewORM(chainID big.Int, db sqlutil.DB) *DbORM { +func NewORM(chainID big.Int, db sqlutil.DataSource) *DbORM { return &DbORM{ chainID: ubig.Big(chainID), db: db, diff --git a/core/chains/evm/logpoller/observability.go b/core/chains/evm/logpoller/observability.go index c3e162d260b..07a0f58ce78 100644 --- a/core/chains/evm/logpoller/observability.go +++ b/core/chains/evm/logpoller/observability.go @@ -76,7 +76,7 @@ type ObservedORM struct { // NewObservedORM creates an observed version of log poller's ORM created by NewORM // Please see ObservedLogPoller for more details on how latencies are measured -func NewObservedORM(chainID *big.Int, db sqlutil.DB, lggr logger.Logger) *ObservedORM { +func NewObservedORM(chainID *big.Int, db sqlutil.DataSource, lggr logger.Logger) *ObservedORM { return &ObservedORM{ ORM: NewORM(chainID, db, lggr), queryDuration: lpQueryDuration, diff --git a/core/chains/evm/logpoller/orm.go b/core/chains/evm/logpoller/orm.go index 945bbdc5699..ebba3cffc08 100644 --- a/core/chains/evm/logpoller/orm.go +++ b/core/chains/evm/logpoller/orm.go @@ -61,14 +61,14 @@ type ORM interface { type DbORM struct { chainID *big.Int - db sqlutil.DB + db sqlutil.DataSource lggr logger.Logger } var _ ORM = &DbORM{} // NewORM creates an DbORM scoped to chainID. -func NewORM(chainID *big.Int, db sqlutil.DB, lggr logger.Logger) *DbORM { +func NewORM(chainID *big.Int, db sqlutil.DataSource, lggr logger.Logger) *DbORM { return &DbORM{ chainID: chainID, db: db, @@ -81,7 +81,7 @@ func (o *DbORM) Transaction(ctx context.Context, fn func(*DbORM) error) (err err } // new returns a NewORM like o, but backed by q. -func (o *DbORM) new(q sqlutil.DB) *DbORM { return NewORM(o.chainID, q, o.lggr) } +func (o *DbORM) new(q sqlutil.DataSource) *DbORM { return NewORM(o.chainID, q, o.lggr) } // InsertBlock is idempotent to support replays. func (o *DbORM) InsertBlock(ctx context.Context, blockHash common.Hash, blockNumber int64, blockTimestamp time.Time, finalizedBlock int64) error { @@ -373,7 +373,7 @@ func (o *DbORM) InsertLogsWithBlock(ctx context.Context, logs []Log, block LogPo }) } -func (o *DbORM) insertLogsWithinTx(ctx context.Context, logs []Log, tx sqlutil.DB) error { +func (o *DbORM) insertLogsWithinTx(ctx context.Context, logs []Log, tx sqlutil.DataSource) error { batchInsertSize := 4000 for i := 0; i < len(logs); i += batchInsertSize { start, end := i, i+batchInsertSize diff --git a/core/chains/evm/txmgr/builder.go b/core/chains/evm/txmgr/builder.go index d4420302598..58e37d633d9 100644 --- a/core/chains/evm/txmgr/builder.go +++ b/core/chains/evm/txmgr/builder.go @@ -22,7 +22,7 @@ import ( // NewTxm constructs the necessary dependencies for the EvmTxm (broadcaster, confirmer, etc) and returns a new EvmTxManager func NewTxm( sqlxDB *sqlx.DB, - db sqlutil.DB, + db sqlutil.DataSource, chainConfig ChainConfig, fCfg FeeConfig, txConfig config.Transactions, diff --git a/core/chains/legacyevm/chain.go b/core/chains/legacyevm/chain.go index 877478b32a4..f00f4b64b36 100644 --- a/core/chains/legacyevm/chain.go +++ b/core/chains/legacyevm/chain.go @@ -163,7 +163,7 @@ type ChainOpts struct { GasEstimator gas.EvmFeeEstimator SqlxDB *sqlx.DB // Deprecated: use DB instead - DB sqlutil.DB + DB sqlutil.DataSource // TODO BCF-2513 remove test code from the API // Gen-functions are useful for dependency injection by tests diff --git a/core/chains/legacyevm/evm_txm.go b/core/chains/legacyevm/evm_txm.go index 4ef515759f2..c4959b78a47 100644 --- a/core/chains/legacyevm/evm_txm.go +++ b/core/chains/legacyevm/evm_txm.go @@ -16,7 +16,7 @@ import ( func newEvmTxm( sqlxDB *sqlx.DB, - db sqlutil.DB, + db sqlutil.DataSource, cfg evmconfig.EVM, evmRPCEnabled bool, databaseConfig txmgr.DatabaseConfig, diff --git a/core/cmd/shell.go b/core/cmd/shell.go index 0eb909623e5..7662ef5d781 100644 --- a/core/cmd/shell.go +++ b/core/cmd/shell.go @@ -156,7 +156,7 @@ func (n ChainlinkAppFactory) NewApplication(ctx context.Context, cfg chainlink.G return nil, err } - db := sqlutil.NewWrappedDB(sqlxDB, appLggr, sqlutil.TimeoutHook(pg.DefaultQueryTimeout), sqlutil.MonitorHook(cfg.Database().LogSQL)) + db := sqlutil.WrapDataSource(sqlxDB, appLggr, sqlutil.TimeoutHook(pg.DefaultQueryTimeout), sqlutil.MonitorHook(cfg.Database().LogSQL)) err = handleNodeVersioning(ctx, sqlxDB, appLggr, cfg.RootDir(), cfg.Database(), cfg.WebServer().HTTPPort()) if err != nil { diff --git a/core/internal/cltest/factories.go b/core/internal/cltest/factories.go index 44626b4f3b8..02f56e756d9 100644 --- a/core/internal/cltest/factories.go +++ b/core/internal/cltest/factories.go @@ -315,7 +315,7 @@ func MustGenerateRandomKeyState(_ testing.TB) ethkey.State { return ethkey.State{Address: NewEIP55Address()} } -func MustInsertHead(t *testing.T, db sqlutil.DB, number int64) evmtypes.Head { +func MustInsertHead(t *testing.T, db sqlutil.DataSource, number int64) evmtypes.Head { h := evmtypes.NewHead(big.NewInt(number), evmutils.NewHash(), evmutils.NewHash(), 0, ubig.New(&FixtureChainID)) horm := headtracker.NewORM(FixtureChainID, db) diff --git a/core/internal/mocks/application.go b/core/internal/mocks/application.go index cb0415e9203..98d4e8809e0 100644 --- a/core/internal/mocks/application.go +++ b/core/internal/mocks/application.go @@ -208,19 +208,19 @@ func (_m *Application) GetConfig() chainlink.GeneralConfig { } // GetDB provides a mock function with given fields: -func (_m *Application) GetDB() sqlutil.DB { +func (_m *Application) GetDB() sqlutil.DataSource { ret := _m.Called() if len(ret) == 0 { panic("no return value specified for GetDB") } - var r0 sqlutil.DB - if rf, ok := ret.Get(0).(func() sqlutil.DB); ok { + var r0 sqlutil.DataSource + if rf, ok := ret.Get(0).(func() sqlutil.DataSource); ok { r0 = rf() } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(sqlutil.DB) + r0 = ret.Get(0).(sqlutil.DataSource) } } diff --git a/core/scripts/go.mod b/core/scripts/go.mod index a581e1682ce..e9f31ae2ed8 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -21,7 +21,7 @@ require ( github.com/prometheus/client_golang v1.17.0 github.com/shopspring/decimal v1.3.1 github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240311111125-22812a072c35 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240312193929-9bf02a194958 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240314172156-049609b8e1f9 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20240229181116-bfb2432a7a66 diff --git a/core/scripts/go.sum b/core/scripts/go.sum index cfad8d4f260..d59e0db8d58 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1174,8 +1174,8 @@ github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCq github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE= github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240311111125-22812a072c35 h1:GNhRKD3izyzAoGMXDvVUAwEuzz4Atdj3U3RH7eak5Is= github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240311111125-22812a072c35/go.mod h1:2I0dWdYdK6jHPnSYYy7Y7Xp7L0YTnJ3KZtkhLQflsTU= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240312193929-9bf02a194958 h1:3AspKDXioDI0ROiFby3bcgWdRaDh3OYa8mPsud0HjHg= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240312193929-9bf02a194958/go.mod h1:/bJGelrpXvCcDCuaIgt91UN4B9YxZdK1O7VX5lzbysI= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240314172156-049609b8e1f9 h1:rlvE17wHiSnrl2d42TWQ2VVx8ho8c9vgznysXj68sRU= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240314172156-049609b8e1f9/go.mod h1:/bJGelrpXvCcDCuaIgt91UN4B9YxZdK1O7VX5lzbysI= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240213120401-01a23955f9f8 h1:I326nw5GwHQHsLKHwtu5Sb9EBLylC8CfUd7BFAS0jtg= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240213120401-01a23955f9f8/go.mod h1:a65NtrK4xZb01mf0dDNghPkN2wXgcqFQ55ADthVBgMc= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 h1:xFSv8561jsLtF6gYZr/zW2z5qUUAkcFkApin2mnbYTo= diff --git a/core/services/chainlink/application.go b/core/services/chainlink/application.go index beaa532c73c..bb6c0030a95 100644 --- a/core/services/chainlink/application.go +++ b/core/services/chainlink/application.go @@ -76,7 +76,7 @@ type Application interface { GetAuditLogger() audit.AuditLogger GetHealthChecker() services.Checker GetSqlxDB() *sqlx.DB // Deprecated: use GetDB - GetDB() sqlutil.DB + GetDB() sqlutil.DataSource GetConfig() GeneralConfig SetLogLevel(lvl zapcore.Level) error GetKeyStore() keystore.Master @@ -143,7 +143,7 @@ type ChainlinkApplication struct { AuditLogger audit.AuditLogger closeLogger func() error sqlxDB *sqlx.DB // Deprecated: use db instead - db sqlutil.DB + db sqlutil.DataSource secretGenerator SecretGenerator profiler *pyroscope.Profiler loopRegistry *plugins.LoopRegistry @@ -157,7 +157,7 @@ type ApplicationOpts struct { Logger logger.Logger MailMon *mailbox.Monitor SqlxDB *sqlx.DB // Deprecated: use DB instead - DB sqlutil.DB + DB sqlutil.DataSource KeyStore keystore.Master RelayerChainInteroperators *CoreRelayerChainInteroperators AuditLogger audit.AuditLogger @@ -831,7 +831,7 @@ func (app *ChainlinkApplication) GetSqlxDB() *sqlx.DB { return app.sqlxDB } -func (app *ChainlinkApplication) GetDB() sqlutil.DB { +func (app *ChainlinkApplication) GetDB() sqlutil.DataSource { return app.db } diff --git a/core/services/pg/q.go b/core/services/pg/q.go index 30f2d01c511..433023ddbc9 100644 --- a/core/services/pg/q.go +++ b/core/services/pg/q.go @@ -18,7 +18,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" ) -// QOpt is deprecated. Use [sqlutil.DB] with [sqlutil.QueryHook]s instead. +// QOpt is deprecated. Use [sqlutil.DataSource] with [sqlutil.QueryHook]s instead. // // QOpt pattern for ORM methods aims to clarify usage and remove some common footguns, notably: // @@ -108,7 +108,7 @@ type QConfig interface { // // This is not the prettiest construct but without macros its about the best we // can do. -// Deprecated: Use a `sqlutil.DB` with `sqlutil.QueryHook`s instead +// Deprecated: Use a `sqlutil.DataSource` with `sqlutil.QueryHook`s instead type Q struct { Queryer ParentCtx context.Context diff --git a/core/services/pg/sqlx.go b/core/services/pg/sqlx.go index 1316ba9c103..76eae792cbf 100644 --- a/core/services/pg/sqlx.go +++ b/core/services/pg/sqlx.go @@ -12,7 +12,7 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/logger" ) -// Queryer is deprecated. Use sqlutil.DB instead +// Queryer is deprecated. Use sqlutil.DataSource instead type Queryer interface { sqlx.Ext sqlx.ExtContext diff --git a/core/services/webhook/authorizer.go b/core/services/webhook/authorizer.go index 88a26188948..c745c5d0b09 100644 --- a/core/services/webhook/authorizer.go +++ b/core/services/webhook/authorizer.go @@ -24,7 +24,7 @@ var ( _ Authorizer = &neverAuthorizer{} ) -func NewAuthorizer(db sqlutil.DB, user *sessions.User, ei *bridges.ExternalInitiator) Authorizer { +func NewAuthorizer(db sqlutil.DataSource, user *sessions.User, ei *bridges.ExternalInitiator) Authorizer { if user != nil { return &alwaysAuthorizer{} } else if ei != nil { @@ -34,11 +34,11 @@ func NewAuthorizer(db sqlutil.DB, user *sessions.User, ei *bridges.ExternalIniti } type eiAuthorizer struct { - db sqlutil.DB + db sqlutil.DataSource ei bridges.ExternalInitiator } -func NewEIAuthorizer(db sqlutil.DB, ei bridges.ExternalInitiator) *eiAuthorizer { +func NewEIAuthorizer(db sqlutil.DataSource, ei bridges.ExternalInitiator) *eiAuthorizer { return &eiAuthorizer{db, ei} } diff --git a/core/web/evm_forwarders_controller.go b/core/web/evm_forwarders_controller.go index 674d0285d81..8fa6b56de7a 100644 --- a/core/web/evm_forwarders_controller.go +++ b/core/web/evm_forwarders_controller.go @@ -80,7 +80,7 @@ func (cc *EVMForwardersController) Delete(c *gin.Context) { return } - filterCleanup := func(tx sqlutil.DB, evmChainID int64, addr common.Address) error { + filterCleanup := func(tx sqlutil.DataSource, evmChainID int64, addr common.Address) error { chain, err2 := cc.App.GetRelayers().LegacyEVMChains().Get(big.NewInt(evmChainID).String()) if err2 != nil { // If the chain id doesn't even exist, or logpoller is disabled, then there isn't any filter to clean up. Returning an error diff --git a/go.mod b/go.mod index 9a51b8e73ef..effdb90b062 100644 --- a/go.mod +++ b/go.mod @@ -69,7 +69,7 @@ require ( github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 github.com/smartcontractkit/chain-selectors v1.0.10 github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240311111125-22812a072c35 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240312193929-9bf02a194958 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240314172156-049609b8e1f9 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240213120401-01a23955f9f8 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 github.com/smartcontractkit/chainlink-feeds v0.0.0-20240119021347-3c541a78cdb8 diff --git a/go.sum b/go.sum index 335141568db..5784268d323 100644 --- a/go.sum +++ b/go.sum @@ -1169,8 +1169,8 @@ github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCq github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE= github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240311111125-22812a072c35 h1:GNhRKD3izyzAoGMXDvVUAwEuzz4Atdj3U3RH7eak5Is= github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240311111125-22812a072c35/go.mod h1:2I0dWdYdK6jHPnSYYy7Y7Xp7L0YTnJ3KZtkhLQflsTU= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240312193929-9bf02a194958 h1:3AspKDXioDI0ROiFby3bcgWdRaDh3OYa8mPsud0HjHg= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240312193929-9bf02a194958/go.mod h1:/bJGelrpXvCcDCuaIgt91UN4B9YxZdK1O7VX5lzbysI= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240314172156-049609b8e1f9 h1:rlvE17wHiSnrl2d42TWQ2VVx8ho8c9vgznysXj68sRU= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240314172156-049609b8e1f9/go.mod h1:/bJGelrpXvCcDCuaIgt91UN4B9YxZdK1O7VX5lzbysI= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240213120401-01a23955f9f8 h1:I326nw5GwHQHsLKHwtu5Sb9EBLylC8CfUd7BFAS0jtg= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240213120401-01a23955f9f8/go.mod h1:a65NtrK4xZb01mf0dDNghPkN2wXgcqFQ55ADthVBgMc= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 h1:xFSv8561jsLtF6gYZr/zW2z5qUUAkcFkApin2mnbYTo= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index f5baaf2ef5a..2752cb58342 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -23,7 +23,7 @@ require ( github.com/segmentio/ksuid v1.0.4 github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240311111125-22812a072c35 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240312193929-9bf02a194958 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240314172156-049609b8e1f9 github.com/smartcontractkit/chainlink-testing-framework v1.26.0 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index a7938460866..4819179aad4 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1516,8 +1516,8 @@ github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCq github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE= github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240311111125-22812a072c35 h1:GNhRKD3izyzAoGMXDvVUAwEuzz4Atdj3U3RH7eak5Is= github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240311111125-22812a072c35/go.mod h1:2I0dWdYdK6jHPnSYYy7Y7Xp7L0YTnJ3KZtkhLQflsTU= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240312193929-9bf02a194958 h1:3AspKDXioDI0ROiFby3bcgWdRaDh3OYa8mPsud0HjHg= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240312193929-9bf02a194958/go.mod h1:/bJGelrpXvCcDCuaIgt91UN4B9YxZdK1O7VX5lzbysI= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240314172156-049609b8e1f9 h1:rlvE17wHiSnrl2d42TWQ2VVx8ho8c9vgznysXj68sRU= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240314172156-049609b8e1f9/go.mod h1:/bJGelrpXvCcDCuaIgt91UN4B9YxZdK1O7VX5lzbysI= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240213120401-01a23955f9f8 h1:I326nw5GwHQHsLKHwtu5Sb9EBLylC8CfUd7BFAS0jtg= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240213120401-01a23955f9f8/go.mod h1:a65NtrK4xZb01mf0dDNghPkN2wXgcqFQ55ADthVBgMc= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 h1:xFSv8561jsLtF6gYZr/zW2z5qUUAkcFkApin2mnbYTo= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index e4940287933..f7d947909cc 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -15,7 +15,7 @@ require ( github.com/rs/zerolog v1.30.0 github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240311111125-22812a072c35 - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240312193929-9bf02a194958 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240314172156-049609b8e1f9 github.com/smartcontractkit/chainlink-testing-framework v1.26.0 github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240214231432-4ad5eb95178c github.com/smartcontractkit/chainlink/v2 v2.9.0-beta0.0.20240216210048-da02459ddad8 diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 7758c05aae4..23c01d55223 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1499,8 +1499,8 @@ github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCq github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE= github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240311111125-22812a072c35 h1:GNhRKD3izyzAoGMXDvVUAwEuzz4Atdj3U3RH7eak5Is= github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240311111125-22812a072c35/go.mod h1:2I0dWdYdK6jHPnSYYy7Y7Xp7L0YTnJ3KZtkhLQflsTU= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240312193929-9bf02a194958 h1:3AspKDXioDI0ROiFby3bcgWdRaDh3OYa8mPsud0HjHg= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240312193929-9bf02a194958/go.mod h1:/bJGelrpXvCcDCuaIgt91UN4B9YxZdK1O7VX5lzbysI= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240314172156-049609b8e1f9 h1:rlvE17wHiSnrl2d42TWQ2VVx8ho8c9vgznysXj68sRU= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240314172156-049609b8e1f9/go.mod h1:/bJGelrpXvCcDCuaIgt91UN4B9YxZdK1O7VX5lzbysI= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240213120401-01a23955f9f8 h1:I326nw5GwHQHsLKHwtu5Sb9EBLylC8CfUd7BFAS0jtg= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240213120401-01a23955f9f8/go.mod h1:a65NtrK4xZb01mf0dDNghPkN2wXgcqFQ55ADthVBgMc= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 h1:xFSv8561jsLtF6gYZr/zW2z5qUUAkcFkApin2mnbYTo=