From 556d890bb17ece21c7027de51bc612d2dbba34f0 Mon Sep 17 00:00:00 2001 From: pavel-raykov Date: Mon, 11 May 2026 19:56:44 +0200 Subject: [PATCH 1/5] Minor. --- core/services/llo/telem/telemetry.go | 6 +++--- core/services/ocr2/delegate.go | 4 ++-- .../services/ocr2/plugins/mercury/config/config.go | 8 ++++---- core/services/ocr2/plugins/mercury/plugin.go | 10 +++++----- core/services/ocr2/plugins/mercury/plugin_test.go | 7 +++---- core/services/ocrcommon/telemetry.go | 12 ++++++------ core/services/relay/evm/mercury/v2/data_source.go | 11 +++++------ .../relay/evm/mercury/v2/data_source_test.go | 14 ++++++-------- core/services/relay/evm/mercury/v3/data_source.go | 13 ++++++------- .../relay/evm/mercury/v3/data_source_test.go | 14 ++++++-------- core/services/relay/evm/mercury/v4/data_source.go | 11 +++++------ .../relay/evm/mercury/v4/data_source_test.go | 14 ++++++-------- core/services/relay/evm/mercury_provider.go | 7 +++---- plugins/plugins.public.yaml | 2 +- 14 files changed, 61 insertions(+), 72 deletions(-) diff --git a/core/services/llo/telem/telemetry.go b/core/services/llo/telem/telemetry.go index 2da4dc27c45..04959e1a0e0 100644 --- a/core/services/llo/telem/telemetry.go +++ b/core/services/llo/telem/telemetry.go @@ -12,10 +12,10 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/logger" "github.com/smartcontractkit/chainlink-common/pkg/services" + "github.com/smartcontractkit/chainlink-common/pkg/types/mercury" "github.com/smartcontractkit/chainlink-data-streams/llo" datastreamsllo "github.com/smartcontractkit/chainlink-data-streams/llo" "github.com/smartcontractkit/chainlink-data-streams/llo/reportcodecs/evm" - mercuryutils "github.com/smartcontractkit/chainlink-data-streams/mercury/utils" "github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon" "github.com/smartcontractkit/chainlink/v2/core/services/pipeline" @@ -404,7 +404,7 @@ func (t *telemeter) prepareObservationTelemetry(p any, opts llo.DSOpts) { } func (t *telemeter) prepareV3PremiumLegacyTelemetry(d *TelemetryPipeline) { - eaTelemetryValues := ocrcommon.ParseMercuryEATelemetry(t.eng.SugaredLogger, d.trrs, mercuryutils.REPORT_V3) + eaTelemetryValues := ocrcommon.ParseMercuryEATelemetry(t.eng.SugaredLogger, d.trrs, mercury.REPORT_V3) for _, eaTelem := range eaTelemetryValues { var benchmarkPrice, bidPrice, askPrice int64 var bp, bid, ask string @@ -443,7 +443,7 @@ func (t *telemeter) prepareV3PremiumLegacyTelemetry(d *TelemetryPipeline) { IsNativeFeed: false, ConfigDigest: d.opts.ConfigDigest().Hex(), AssetSymbol: eaTelem.AssetSymbol, - Version: uint32(1000 + mercuryutils.REPORT_V3), // add 1000 to distinguish between legacy feeds, this can be changed if necessary + Version: uint32(1000 + mercury.REPORT_V3), // add 1000 to distinguish between legacy feeds, this can be changed if necessary DonId: t.donID, } epoch, round, err := evm.SeqNrToEpochAndRound(d.opts.OutCtx().SeqNr) diff --git a/core/services/ocr2/delegate.go b/core/services/ocr2/delegate.go index 3c2668599c5..f20bf5bf9d8 100644 --- a/core/services/ocr2/delegate.go +++ b/core/services/ocr2/delegate.go @@ -33,8 +33,8 @@ import ( ocr2keepers20runner "github.com/smartcontractkit/chainlink-automation/pkg/v2/runner" ocr2keepers21config "github.com/smartcontractkit/chainlink-automation/pkg/v3/config" ocr2keepers21 "github.com/smartcontractkit/chainlink-automation/pkg/v3/plugin" + mercurytypes "github.com/smartcontractkit/chainlink-common/pkg/types/mercury" evmmercury "github.com/smartcontractkit/chainlink-data-streams/mercury" - mercuryutils "github.com/smartcontractkit/chainlink-data-streams/mercury/utils" evmconfig "github.com/smartcontractkit/chainlink-evm/pkg/config" functionsRelay "github.com/smartcontractkit/chainlink-evm/pkg/functions" @@ -1516,7 +1516,7 @@ func (d *Delegate) newServicesMercury( mCfg := mercury.NewMercuryConfig(d.cfg.JobPipeline().MaxSuccessfulRuns(), d.cfg.JobPipeline().ResultWriteQueueDepth(), d.cfg) - mercuryServices, err2 := mercury.NewServices(jb, mercuryProvider, d.pipelineRunner, lggr, oracleArgsNoPlugin, mCfg, chEnhancedTelem, d.mercuryORM, (mercuryutils.FeedID)(*spec.FeedID), relayConfig.EnableTriggerCapability) + mercuryServices, err2 := mercury.NewServices(jb, mercuryProvider, d.pipelineRunner, lggr, oracleArgsNoPlugin, mCfg, chEnhancedTelem, d.mercuryORM, (mercurytypes.FeedID)(*spec.FeedID), relayConfig.EnableTriggerCapability) if ocrcommon.ShouldCollectEnhancedTelemetryMercury(jb) { enhancedTelemService := ocrcommon.NewEnhancedTelemetryService(&jb, chEnhancedTelem, make(chan struct{}), d.monitoringEndpointGen.GenMonitoringEndpoint(rid.Network, rid.ChainID, spec.FeedID.String(), synchronization.EnhancedEAMercury), lggr.Named("EnhancedTelemetryMercury")) diff --git a/core/services/ocr2/plugins/mercury/config/config.go b/core/services/ocr2/plugins/mercury/config/config.go index a305ab515a6..bf9b927c2ea 100644 --- a/core/services/ocr2/plugins/mercury/config/config.go +++ b/core/services/ocr2/plugins/mercury/config/config.go @@ -12,7 +12,7 @@ import ( pkgerrors "github.com/pkg/errors" - mercuryutils "github.com/smartcontractkit/chainlink-data-streams/mercury/utils" + "github.com/smartcontractkit/chainlink-common/pkg/types/mercury" "github.com/smartcontractkit/chainlink/v2/core/null" "github.com/smartcontractkit/chainlink/v2/core/utils" ) @@ -36,8 +36,8 @@ type PluginConfig struct { // effectively sets the "first" validFromBlockNumber. InitialBlockNumber null.Int64 `json:"initialBlockNumber" toml:"initialBlockNumber"` - LinkFeedID *mercuryutils.FeedID `json:"linkFeedID" toml:"linkFeedID"` - NativeFeedID *mercuryutils.FeedID `json:"nativeFeedID" toml:"nativeFeedID"` + LinkFeedID *mercury.FeedID `json:"linkFeedID" toml:"linkFeedID"` + NativeFeedID *mercury.FeedID `json:"nativeFeedID" toml:"nativeFeedID"` } func validateURL(rawServerURL string) error { @@ -75,7 +75,7 @@ func (p PluginConfig) GetServers() (servers []Server) { return } -func ValidatePluginConfig(config PluginConfig, feedID mercuryutils.FeedID) (merr error) { +func ValidatePluginConfig(config PluginConfig, feedID mercury.FeedID) (merr error) { if len(config.Servers) > 0 { if config.RawServerURL != "" || len(config.ServerPubKey) != 0 { merr = errors.Join(merr, errors.New("Mercury: Servers and RawServerURL/ServerPubKey may not be specified together")) diff --git a/core/services/ocr2/plugins/mercury/plugin.go b/core/services/ocr2/plugins/mercury/plugin.go index 39c50a79d21..33275b5f45a 100644 --- a/core/services/ocr2/plugins/mercury/plugin.go +++ b/core/services/ocr2/plugins/mercury/plugin.go @@ -11,8 +11,8 @@ import ( libocr2 "github.com/smartcontractkit/libocr/offchainreporting2plus" "github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types" + mercurytypes "github.com/smartcontractkit/chainlink-common/pkg/types/mercury" "github.com/smartcontractkit/chainlink-data-streams/mercury/types" - "github.com/smartcontractkit/chainlink-data-streams/mercury/utils" relaymercuryv2 "github.com/smartcontractkit/chainlink-data-streams/mercury/v2" relaymercuryv3 "github.com/smartcontractkit/chainlink-data-streams/mercury/v3" relaymercuryv4 "github.com/smartcontractkit/chainlink-data-streams/mercury/v4" @@ -71,7 +71,7 @@ func NewServices( cfg Config, chEnhancedTelem chan ocrcommon.EnhancedTelemetryMercuryData, orm types.DataSourceORM, - feedID utils.FeedID, + feedID mercurytypes.FeedID, enableTriggerCapability bool, ) ([]job.ServiceCtx, error) { if jb.PipelineSpec == nil { @@ -169,10 +169,10 @@ type factoryCfg struct { ocr2Provider commontypes.MercuryProvider reportingPluginConfig config.PluginConfig cfg Config - feedID utils.FeedID + feedID mercurytypes.FeedID } -func getPluginFeedIDs(pluginConfig config.PluginConfig) (linkFeedID utils.FeedID, nativeFeedID utils.FeedID) { +func getPluginFeedIDs(pluginConfig config.PluginConfig) (linkFeedID mercurytypes.FeedID, nativeFeedID mercurytypes.FeedID) { if pluginConfig.LinkFeedID != nil { linkFeedID = *pluginConfig.LinkFeedID } @@ -302,7 +302,7 @@ func newv2factory(factoryCfg factoryCfg) (ocr3types.MercuryPluginFactory, []job. return factory, srvs, nil } -func initLoop(cmd string, cfg Config, feedID utils.FeedID, lggr logger.Logger) (func() *exec.Cmd, *loopUnregisterCloser, loop.GRPCOpts, logger.Logger, error) { +func initLoop(cmd string, cfg Config, feedID mercurytypes.FeedID, lggr logger.Logger) (func() *exec.Cmd, *loopUnregisterCloser, loop.GRPCOpts, logger.Logger, error) { lggr.Debugw("Initializing Mercury loop", "command", cmd) mercuryLggr := lggr.Named(fmt.Sprintf("MercuryV%d", feedID.Version())).Named(feedID.String()) envVars, err := plugins.ParseEnvFile(env.MercuryPlugin.Env.Get()) diff --git a/core/services/ocr2/plugins/mercury/plugin_test.go b/core/services/ocr2/plugins/mercury/plugin_test.go index ad4102d2ac5..8a03a5601b9 100644 --- a/core/services/ocr2/plugins/mercury/plugin_test.go +++ b/core/services/ocr2/plugins/mercury/plugin_test.go @@ -23,7 +23,6 @@ import ( v3 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3" v4 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v4" "github.com/smartcontractkit/chainlink-data-streams/mercury/types" - "github.com/smartcontractkit/chainlink-data-streams/mercury/utils" "github.com/smartcontractkit/chainlink/v2/core/config/env" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/job" @@ -91,7 +90,7 @@ var ( func TestNewServices(t *testing.T) { type args struct { pluginConfig job.JSONConfig - feedID utils.FeedID + feedID mercury.FeedID cfg mercuryocr2.Config } testCases := []struct { @@ -227,7 +226,7 @@ func TestNewServices(t *testing.T) { prodCfg := mercuryocr2.NewMercuryConfig(1, 1, loopRegistrarConfig) type args struct { pluginConfig job.JSONConfig - feedID utils.FeedID + feedID mercury.FeedID cfg mercuryocr2.Config } testCases := []struct { @@ -296,7 +295,7 @@ func TestNewServices(t *testing.T) { // we are only varying the version via feedID (and the plugin config) // this wrapper supplies dummy values for the rest of the arguments -func newServicesTestWrapper(t *testing.T, pluginConfig job.JSONConfig, feedID utils.FeedID, cfg mercuryocr2.Config) ([]job.ServiceCtx, error) { +func newServicesTestWrapper(t *testing.T, pluginConfig job.JSONConfig, feedID mercury.FeedID, cfg mercuryocr2.Config) ([]job.ServiceCtx, error) { t.Helper() jb := testJob jb.OCR2OracleSpec.PluginConfig = pluginConfig diff --git a/core/services/ocrcommon/telemetry.go b/core/services/ocrcommon/telemetry.go index b72edcc7455..2bae55c228c 100644 --- a/core/services/ocrcommon/telemetry.go +++ b/core/services/ocrcommon/telemetry.go @@ -15,11 +15,11 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/logger" "github.com/smartcontractkit/chainlink-common/pkg/services" + "github.com/smartcontractkit/chainlink-common/pkg/types/mercury" v1types "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v1" v2types "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v2" v3types "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3" v4types "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v4" - mercuryutils "github.com/smartcontractkit/chainlink-data-streams/mercury/utils" "github.com/smartcontractkit/chainlink/v2/core/services/job" "github.com/smartcontractkit/chainlink/v2/core/services/pipeline" @@ -56,7 +56,7 @@ type EnhancedTelemetryMercuryData struct { V4Observation *v4types.Observation TaskRunResults pipeline.TaskRunResults RepTimestamp ocrtypes.ReportTimestamp - FeedVersion mercuryutils.FeedVersion + FeedVersion mercury.FeedVersion FetchMaxFinalizedTimestamp bool IsLinkFeed bool IsNativeFeed bool @@ -154,7 +154,7 @@ func (e *EnhancedTelemetryService[T]) getChainID() string { } } -func ParseMercuryEATelemetry(lggr logger.Logger, trrs pipeline.TaskRunResults, feedVersion mercuryutils.FeedVersion) (eaTelemetryValues []EATelemetry) { +func ParseMercuryEATelemetry(lggr logger.Logger, trrs pipeline.TaskRunResults, feedVersion mercury.FeedVersion) (eaTelemetryValues []EATelemetry) { for _, trr := range trrs { if trr.Task.Type() != pipeline.TaskTypeBridge { continue @@ -502,7 +502,7 @@ type bridgeRequestData struct { } // parseRequestData parses the requestData of the bridge. -func parseBridgeRequestData(requestData string, mercuryVersion mercuryutils.FeedVersion) bridgeRequestData { +func parseBridgeRequestData(requestData string, mercuryVersion mercury.FeedVersion) bridgeRequestData { type reqDataPayload struct { Endpoint *string `json:"endpoint"` To *string `json:"to"` @@ -553,7 +553,7 @@ const ( exchangeRate = "exchangeRate" ) -func getPricesFromBridgeTask(lggr logger.Logger, bridgeTask pipeline.TaskRunResult, allTasks pipeline.TaskRunResults, mercuryVersion mercuryutils.FeedVersion) (float64, float64, float64) { +func getPricesFromBridgeTask(lggr logger.Logger, bridgeTask pipeline.TaskRunResult, allTasks pipeline.TaskRunResults, mercuryVersion mercury.FeedVersion) (float64, float64, float64) { var benchmarkPrice, bidPrice, askPrice float64 // This will assume that all fields we care about are tagged with the correct priceType @@ -635,7 +635,7 @@ func parsePriceFromTask(lggr logger.Logger, trr pipeline.TaskRunResult) float64 // getPricesFromResultsByOrder parses the pipeline.TaskRunResults for pipeline.TaskTypeJSONParse and gets the benchmarkPrice, // bid and ask. This functions expects the pipeline.TaskRunResults to be correctly ordered -func getPricesFromResultsByOrder(lggr logger.Logger, startTask pipeline.TaskRunResult, allTasks pipeline.TaskRunResults, mercuryVersion mercuryutils.FeedVersion) (float64, float64, float64) { +func getPricesFromResultsByOrder(lggr logger.Logger, startTask pipeline.TaskRunResult, allTasks pipeline.TaskRunResults, mercuryVersion mercury.FeedVersion) (float64, float64, float64) { var benchmarkPrice, askPrice, bidPrice float64 // We rely on task results to be sorted in the correct order diff --git a/core/services/relay/evm/mercury/v2/data_source.go b/core/services/relay/evm/mercury/v2/data_source.go index d62b0d456a8..8b3dae01bca 100644 --- a/core/services/relay/evm/mercury/v2/data_source.go +++ b/core/services/relay/evm/mercury/v2/data_source.go @@ -14,7 +14,6 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/types/mercury" v2types "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v2" mercurytypes "github.com/smartcontractkit/chainlink-data-streams/mercury/types" - mercuryutils "github.com/smartcontractkit/chainlink-data-streams/mercury/utils" v2 "github.com/smartcontractkit/chainlink-data-streams/mercury/v2" "github.com/smartcontractkit/chainlink-data-streams/mercury/v2/reportcodec" @@ -37,15 +36,15 @@ type datasource struct { pipelineRunner Runner jb job.Job spec pipeline.Spec - feedID mercuryutils.FeedID + feedID mercury.FeedID lggr logger.Logger saver ocrcommon.Saver orm mercurytypes.DataSourceORM codec reportcodec.ReportCodec fetcher LatestReportFetcher - linkFeedID mercuryutils.FeedID - nativeFeedID mercuryutils.FeedID + linkFeedID mercury.FeedID + nativeFeedID mercury.FeedID mu sync.RWMutex @@ -54,7 +53,7 @@ type datasource struct { var _ v2.DataSource = &datasource{} -func NewDataSource(orm mercurytypes.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, feedID mercuryutils.FeedID, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, fetcher LatestReportFetcher, linkFeedID, nativeFeedID mercuryutils.FeedID) *datasource { +func NewDataSource(orm mercurytypes.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, feedID mercury.FeedID, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, fetcher LatestReportFetcher, linkFeedID, nativeFeedID mercury.FeedID) *datasource { return &datasource{pr, jb, spec, feedID, lggr, s, orm, reportcodec.ReportCodec{}, fetcher, linkFeedID, nativeFeedID, sync.RWMutex{}, enhancedTelemChan} } @@ -170,7 +169,7 @@ func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestam V2Observation: &obs, TaskRunResults: trrs, RepTimestamp: repts, - FeedVersion: mercuryutils.REPORT_V2, + FeedVersion: mercury.REPORT_V2, FetchMaxFinalizedTimestamp: fetchMaxFinalizedTimestamp, IsLinkFeed: isLink, IsNativeFeed: isNative, diff --git a/core/services/relay/evm/mercury/v2/data_source_test.go b/core/services/relay/evm/mercury/v2/data_source_test.go index f02c510facd..55c3c5c54ef 100644 --- a/core/services/relay/evm/mercury/v2/data_source_test.go +++ b/core/services/relay/evm/mercury/v2/data_source_test.go @@ -12,10 +12,8 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/logger" "github.com/smartcontractkit/chainlink-common/pkg/types/mercury" - "github.com/smartcontractkit/chainlink-data-streams/mercury/utils" v2 "github.com/smartcontractkit/chainlink-data-streams/mercury/v2" reportcodecv2 "github.com/smartcontractkit/chainlink-data-streams/mercury/v2/reportcodec" - "github.com/smartcontractkit/chainlink-evm/pkg/testutils" "github.com/smartcontractkit/chainlink/v2/core/services/job" "github.com/smartcontractkit/chainlink/v2/core/services/pipeline" @@ -33,16 +31,16 @@ type mockFetcher struct { nativePriceErr error } -var feedId utils.FeedID = [32]byte{1} -var linkFeedId utils.FeedID = [32]byte{2} -var nativeFeedId utils.FeedID = [32]byte{3} +var feedId mercury.FeedID = [32]byte{1} +var linkFeedId mercury.FeedID = [32]byte{2} +var nativeFeedId mercury.FeedID = [32]byte{3} func (m *mockFetcher) FetchInitialMaxFinalizedBlockNumber(context.Context) (*int64, error) { return nil, nil } func (m *mockFetcher) LatestPrice(ctx context.Context, fId [32]byte) (*big.Int, error) { - switch utils.FeedID(fId) { + switch mercury.FeedID(fId) { case linkFeedId: return m.linkPrice, m.linkPriceErr case nativeFeedId: @@ -84,7 +82,7 @@ func Test_Datasource(t *testing.T) { }, } ds := &datasource{orm: orm, lggr: logger.Test(t), jb: jb} - ctx := testutils.Context(t) + ctx := t.Context() repts := ocrtypes.ReportTimestamp{} fetcher := &mockFetcher{} @@ -251,7 +249,7 @@ func Test_Datasource(t *testing.T) { ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, linkFeedId, nativeFeedId }) - var feedId utils.FeedID = [32]byte{1} + var feedId mercury.FeedID = [32]byte{1} ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, feedId, feedId obs, err := ds.Observe(ctx, repts, false) diff --git a/core/services/relay/evm/mercury/v3/data_source.go b/core/services/relay/evm/mercury/v3/data_source.go index 2ad6f80d9e3..28d5bb82c1e 100644 --- a/core/services/relay/evm/mercury/v3/data_source.go +++ b/core/services/relay/evm/mercury/v3/data_source.go @@ -14,7 +14,6 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/types/mercury" v3types "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3" mercurytypes "github.com/smartcontractkit/chainlink-data-streams/mercury/types" - mercuryutils "github.com/smartcontractkit/chainlink-data-streams/mercury/utils" v3 "github.com/smartcontractkit/chainlink-data-streams/mercury/v3" "github.com/smartcontractkit/chainlink-data-streams/mercury/v3/reportcodec" @@ -40,15 +39,15 @@ type datasource struct { pipelineRunner Runner jb job.Job spec pipeline.Spec - feedID mercuryutils.FeedID + feedID mercury.FeedID lggr logger.Logger saver ocrcommon.Saver orm mercurytypes.DataSourceORM codec reportcodec.ReportCodec fetcher LatestReportFetcher - linkFeedID mercuryutils.FeedID - nativeFeedID mercuryutils.FeedID + linkFeedID mercury.FeedID + nativeFeedID mercury.FeedID mu sync.RWMutex @@ -57,7 +56,7 @@ type datasource struct { var _ v3.DataSource = &datasource{} -func NewDataSource(orm mercurytypes.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, feedID mercuryutils.FeedID, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, fetcher LatestReportFetcher, linkFeedID, nativeFeedID mercuryutils.FeedID) *datasource { +func NewDataSource(orm mercurytypes.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, feedID mercury.FeedID, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, fetcher LatestReportFetcher, linkFeedID, nativeFeedID mercury.FeedID) *datasource { return &datasource{pr, jb, spec, feedID, lggr, s, orm, reportcodec.ReportCodec{}, fetcher, linkFeedID, nativeFeedID, sync.RWMutex{}, enhancedTelemChan} } @@ -162,7 +161,7 @@ func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestam V3Observation: &obs, TaskRunResults: trrs, RepTimestamp: repts, - FeedVersion: mercuryutils.REPORT_V3, + FeedVersion: mercury.REPORT_V3, FetchMaxFinalizedTimestamp: fetchMaxFinalizedTimestamp, IsLinkFeed: isLink, IsNativeFeed: isNative, @@ -188,7 +187,7 @@ func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestam V3Observation: &obs, TaskRunResults: trrs, RepTimestamp: repts, - FeedVersion: mercuryutils.REPORT_V3, + FeedVersion: mercury.REPORT_V3, FetchMaxFinalizedTimestamp: fetchMaxFinalizedTimestamp, IsLinkFeed: isLink, IsNativeFeed: isNative, diff --git a/core/services/relay/evm/mercury/v3/data_source_test.go b/core/services/relay/evm/mercury/v3/data_source_test.go index c8765794506..1212d517913 100644 --- a/core/services/relay/evm/mercury/v3/data_source_test.go +++ b/core/services/relay/evm/mercury/v3/data_source_test.go @@ -12,10 +12,8 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/logger" mercurytypes "github.com/smartcontractkit/chainlink-common/pkg/types/mercury" - "github.com/smartcontractkit/chainlink-data-streams/mercury/utils" relaymercuryv3 "github.com/smartcontractkit/chainlink-data-streams/mercury/v3" reportcodecv3 "github.com/smartcontractkit/chainlink-data-streams/mercury/v3/reportcodec" - "github.com/smartcontractkit/chainlink-evm/pkg/testutils" "github.com/smartcontractkit/chainlink/v2/core/services/job" "github.com/smartcontractkit/chainlink/v2/core/services/ocrcommon" @@ -35,16 +33,16 @@ type mockFetcher struct { nativePriceErr error } -var feedId utils.FeedID = [32]byte{1} -var linkFeedId utils.FeedID = [32]byte{2} -var nativeFeedId utils.FeedID = [32]byte{3} +var feedId mercurytypes.FeedID = [32]byte{1} +var linkFeedId mercurytypes.FeedID = [32]byte{2} +var nativeFeedId mercurytypes.FeedID = [32]byte{3} func (m *mockFetcher) FetchInitialMaxFinalizedBlockNumber(context.Context) (*int64, error) { return nil, nil } func (m *mockFetcher) LatestPrice(ctx context.Context, fId [32]byte) (*big.Int, error) { - switch utils.FeedID(fId) { + switch mercurytypes.FeedID(fId) { case linkFeedId: return m.linkPrice, m.linkPriceErr case nativeFeedId: @@ -86,7 +84,7 @@ func Test_Datasource(t *testing.T) { }, } ds := &datasource{orm: orm, lggr: logger.Test(t), jb: jb} - ctx := testutils.Context(t) + ctx := t.Context() repts := ocrtypes.ReportTimestamp{} fetcher := &mockFetcher{} @@ -328,7 +326,7 @@ func Test_Datasource(t *testing.T) { ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, linkFeedId, nativeFeedId }) - var feedId utils.FeedID = [32]byte{1} + var feedId mercurytypes.FeedID = [32]byte{1} ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, feedId, feedId obs, err := ds.Observe(ctx, repts, false) diff --git a/core/services/relay/evm/mercury/v4/data_source.go b/core/services/relay/evm/mercury/v4/data_source.go index c3d3fe252c3..950e9b50228 100644 --- a/core/services/relay/evm/mercury/v4/data_source.go +++ b/core/services/relay/evm/mercury/v4/data_source.go @@ -14,7 +14,6 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/types/mercury" v4types "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v4" mercurytypes "github.com/smartcontractkit/chainlink-data-streams/mercury/types" - mercuryutils "github.com/smartcontractkit/chainlink-data-streams/mercury/utils" v4 "github.com/smartcontractkit/chainlink-data-streams/mercury/v4" "github.com/smartcontractkit/chainlink-data-streams/mercury/v4/reportcodec" @@ -37,15 +36,15 @@ type datasource struct { pipelineRunner Runner jb job.Job spec pipeline.Spec - feedID mercuryutils.FeedID + feedID mercury.FeedID lggr logger.Logger saver ocrcommon.Saver orm mercurytypes.DataSourceORM codec reportcodec.ReportCodec fetcher LatestReportFetcher - linkFeedID mercuryutils.FeedID - nativeFeedID mercuryutils.FeedID + linkFeedID mercury.FeedID + nativeFeedID mercury.FeedID mu sync.RWMutex @@ -54,7 +53,7 @@ type datasource struct { var _ v4.DataSource = &datasource{} -func NewDataSource(orm mercurytypes.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, feedID mercuryutils.FeedID, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, fetcher LatestReportFetcher, linkFeedID, nativeFeedID mercuryutils.FeedID) *datasource { +func NewDataSource(orm mercurytypes.DataSourceORM, pr pipeline.Runner, jb job.Job, spec pipeline.Spec, feedID mercury.FeedID, lggr logger.Logger, s ocrcommon.Saver, enhancedTelemChan chan ocrcommon.EnhancedTelemetryMercuryData, fetcher LatestReportFetcher, linkFeedID, nativeFeedID mercury.FeedID) *datasource { return &datasource{pr, jb, spec, feedID, lggr, s, orm, reportcodec.ReportCodec{}, fetcher, linkFeedID, nativeFeedID, sync.RWMutex{}, enhancedTelemChan} } @@ -171,7 +170,7 @@ func (ds *datasource) Observe(ctx context.Context, repts ocrtypes.ReportTimestam V4Observation: &obs, TaskRunResults: trrs, RepTimestamp: repts, - FeedVersion: mercuryutils.REPORT_V4, + FeedVersion: mercury.REPORT_V4, FetchMaxFinalizedTimestamp: fetchMaxFinalizedTimestamp, IsLinkFeed: isLink, IsNativeFeed: isNative, diff --git a/core/services/relay/evm/mercury/v4/data_source_test.go b/core/services/relay/evm/mercury/v4/data_source_test.go index b4d853b83f3..7784a3ca6ea 100644 --- a/core/services/relay/evm/mercury/v4/data_source_test.go +++ b/core/services/relay/evm/mercury/v4/data_source_test.go @@ -12,10 +12,8 @@ import ( "github.com/smartcontractkit/chainlink-common/pkg/logger" mercurytypes "github.com/smartcontractkit/chainlink-common/pkg/types/mercury" - "github.com/smartcontractkit/chainlink-data-streams/mercury/utils" relaymercuryv4 "github.com/smartcontractkit/chainlink-data-streams/mercury/v4" reportcodecv4 "github.com/smartcontractkit/chainlink-data-streams/mercury/v4/reportcodec" - "github.com/smartcontractkit/chainlink-evm/pkg/testutils" "github.com/smartcontractkit/chainlink/v2/core/services/job" "github.com/smartcontractkit/chainlink/v2/core/services/pipeline" mercurymocks "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/mercury/mocks" @@ -32,16 +30,16 @@ type mockFetcher struct { nativePriceErr error } -var feedId utils.FeedID = [32]byte{1} -var linkFeedId utils.FeedID = [32]byte{2} -var nativeFeedId utils.FeedID = [32]byte{3} +var feedId mercurytypes.FeedID = [32]byte{1} +var linkFeedId mercurytypes.FeedID = [32]byte{2} +var nativeFeedId mercurytypes.FeedID = [32]byte{3} func (m *mockFetcher) FetchInitialMaxFinalizedBlockNumber(context.Context) (*int64, error) { return nil, nil } func (m *mockFetcher) LatestPrice(ctx context.Context, fId [32]byte) (*big.Int, error) { - switch utils.FeedID(fId) { + switch mercurytypes.FeedID(fId) { case linkFeedId: return m.linkPrice, m.linkPriceErr case nativeFeedId: @@ -83,7 +81,7 @@ func Test_Datasource(t *testing.T) { }, } ds := &datasource{orm: orm, lggr: logger.Test(t), jb: jb} - ctx := testutils.Context(t) + ctx := t.Context() repts := ocrtypes.ReportTimestamp{} fetcher := &mockFetcher{} @@ -262,7 +260,7 @@ func Test_Datasource(t *testing.T) { ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, linkFeedId, nativeFeedId }) - var feedId utils.FeedID = [32]byte{1} + var feedId mercurytypes.FeedID = [32]byte{1} ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, feedId, feedId obs, err := ds.Observe(ctx, repts, false) diff --git a/core/services/relay/evm/mercury_provider.go b/core/services/relay/evm/mercury_provider.go index 55eb1343eca..ca9cc7ba376 100644 --- a/core/services/relay/evm/mercury_provider.go +++ b/core/services/relay/evm/mercury_provider.go @@ -19,7 +19,6 @@ import ( v3 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v3" v4 "github.com/smartcontractkit/chainlink-common/pkg/types/mercury/v4" "github.com/smartcontractkit/chainlink-data-streams/mercury" - mercuryutils "github.com/smartcontractkit/chainlink-data-streams/mercury/utils" reportcodecv2 "github.com/smartcontractkit/chainlink-data-streams/mercury/v2/reportcodec" reportcodecv3 "github.com/smartcontractkit/chainlink-data-streams/mercury/v3/reportcodec" reportcodecv4 "github.com/smartcontractkit/chainlink-data-streams/mercury/v4/reportcodec" @@ -64,7 +63,7 @@ func NewMercuryProvider( reportCodecV3 := reportcodecv3.NewReportCodec(*relayConfig.FeedID, lggr.Named("ReportCodecV3")) reportCodecV4 := reportcodecv4.NewReportCodec(*relayConfig.FeedID, lggr.Named("ReportCodecV4")) - getCodecForFeed := func(feedID mercuryutils.FeedID) (mercury.TransmitterReportDecoder, error) { + getCodecForFeed := func(feedID mercurytypes.FeedID) (mercury.TransmitterReportDecoder, error) { var transmitterCodec mercury.TransmitterReportDecoder switch feedID.Version() { case 2: @@ -79,7 +78,7 @@ func NewMercuryProvider( return transmitterCodec, nil } - benchmarkPriceDecoder := func(ctx context.Context, feedID mercuryutils.FeedID, report ocrtypes.Report) (*big.Int, error) { + benchmarkPriceDecoder := func(ctx context.Context, feedID mercurytypes.FeedID, report ocrtypes.Report) (*big.Int, error) { benchmarkPriceCodec, benchmarkPriceErr := getCodecForFeed(feedID) if benchmarkPriceErr != nil { return nil, benchmarkPriceErr @@ -99,7 +98,7 @@ func NewMercuryProvider( return nil, err } } - transmitterCodec, err := getCodecForFeed(mercuryutils.FeedID(*relayConfig.FeedID)) + transmitterCodec, err := getCodecForFeed(mercurytypes.FeedID(*relayConfig.FeedID)) if err != nil { return nil, err } diff --git a/plugins/plugins.public.yaml b/plugins/plugins.public.yaml index 4fa7a98df5c..714f7fa9e8d 100644 --- a/plugins/plugins.public.yaml +++ b/plugins/plugins.public.yaml @@ -45,7 +45,7 @@ plugins: streams: - moduleURI: "github.com/smartcontractkit/chainlink-data-streams" - gitRef: "v0.1.14-0.20260504075031-e5aae8c82e91" + gitRef: "v0.1.14-0.20260511174456-27c482950e2e" installPath: "./mercury/cmd/chainlink-mercury" ton: From 4f9ddfe04b1022464568dcbf62d642e147020b9c Mon Sep 17 00:00:00 2001 From: pavel-raykov Date: Mon, 11 May 2026 20:03:58 +0200 Subject: [PATCH 2/5] Minor. --- core/scripts/go.mod | 4 ++-- core/scripts/go.sum | 8 ++++---- deployment/go.mod | 4 ++-- deployment/go.sum | 8 ++++---- go.mod | 4 ++-- go.sum | 8 ++++---- integration-tests/go.mod | 4 ++-- integration-tests/go.sum | 8 ++++---- integration-tests/load/go.mod | 4 ++-- integration-tests/load/go.sum | 8 ++++---- system-tests/lib/go.mod | 4 ++-- system-tests/lib/go.sum | 8 ++++---- system-tests/tests/go.mod | 4 ++-- system-tests/tests/go.sum | 8 ++++---- 14 files changed, 42 insertions(+), 42 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index d06d46a6a6f..577af63bd46 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -45,9 +45,9 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.98 github.com/smartcontractkit/chainlink-automation v0.8.1 github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260506144252-c100eabfda74 - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3 github.com/smartcontractkit/chainlink-common/keystore v1.1.0 - github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91 + github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e github.com/smartcontractkit/chainlink-deployments-framework v0.101.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260507171202-46e6a397da2d github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260421142741-9c7fbaf7c828 diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 160cc941f54..4fad198030c 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1642,14 +1642,14 @@ github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd h github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd/go.mod h1:SBN8Urnh5sQvrQRbSo1Nr8coWatHg8LZoPw3R/42sho= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260428205321-9ce8f4c44d23 h1:1Rt4HLpwbRN1YtBFcbsxSJYIiUP2wJ11qizevOEeCrs= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260428205321-9ce8f4c44d23/go.mod h1:V+wrhuNve+JiFwoBr25d6y0lL1rYSCSJhTFyloL3ueo= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75 h1:Q4JpoGlKfls821po7GdjY8zqSjIYdkQ2GyMkwUnz0KE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3 h1:ZmanXHhhBKPEvrI1QuUc9794LwtIGEcD6Df2NvFuFRM= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= github.com/smartcontractkit/chainlink-common/keystore v1.1.0 h1:2wzySccgk2fpWusPKO0bpeAZzfSU9eq6CS5U+JwYaVo= github.com/smartcontractkit/chainlink-common/keystore v1.1.0/go.mod h1:6JexOOhPhknQ0QMuppFIlOpm6wCp54yZMxai+tWugwY= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20251211140724-319861e514c4 h1:NOUsjsMzNecbjiPWUQGlRSRAutEvCFrqqyETDJeh5q4= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20251211140724-319861e514c4/go.mod h1:Zpvul9sTcZNAZOVzt5vBl1XZGNvQebFpnpn3/KOQvOQ= -github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91 h1:s8E4EYRKEjghJFDnIWQxw8zoCvORVolIY/EKZ+JmzRc= -github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91/go.mod h1:Fl6b/I5qn5TcEh85FP1rNsJ7stcYtmXhVbM2W5RuzQg= +github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e h1:S4hEaw8tXBIAdc2WnbxaG7dYAhzzMQozlQDgxdWCvF4= +github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e/go.mod h1:8VLQ4AUysDbAyYKXolpOSJDdDWHyJ2ARjQAVcCg7eW4= github.com/smartcontractkit/chainlink-deployments-framework v0.101.0 h1:bTPDvJSLlMAibGuuewKK8hgVO3jBcyn/jaAiK2Agj98= github.com/smartcontractkit/chainlink-deployments-framework v0.101.0/go.mod h1:d3twE7zrOtc0iuLs4EhBuaJAtAYOPZr+39nrXv4trw0= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260507171202-46e6a397da2d h1:+zUmapuseG/BWHmBoM3Cl7LEr2frKr59q+eVKgBV9Zk= diff --git a/deployment/go.mod b/deployment/go.mod index 6bc172717ae..daa12843de7 100644 --- a/deployment/go.mod +++ b/deployment/go.mod @@ -42,7 +42,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260504204047-af9826978b72 - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3 github.com/smartcontractkit/chainlink-common/keystore v1.1.0 github.com/smartcontractkit/chainlink-deployments-framework v0.101.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260507171202-46e6a397da2d @@ -420,7 +420,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260408145530-22e2d05695cd // indirect github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd // indirect github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect - github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91 // indirect + github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e // indirect github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20260423135514-5b1a7565a99c // indirect github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20260423135514-5b1a7565a99c // indirect diff --git a/deployment/go.sum b/deployment/go.sum index e3090eba4dc..ccaad01504f 100644 --- a/deployment/go.sum +++ b/deployment/go.sum @@ -1385,14 +1385,14 @@ github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd h github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd/go.mod h1:SBN8Urnh5sQvrQRbSo1Nr8coWatHg8LZoPw3R/42sho= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260428205321-9ce8f4c44d23 h1:1Rt4HLpwbRN1YtBFcbsxSJYIiUP2wJ11qizevOEeCrs= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260428205321-9ce8f4c44d23/go.mod h1:V+wrhuNve+JiFwoBr25d6y0lL1rYSCSJhTFyloL3ueo= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75 h1:Q4JpoGlKfls821po7GdjY8zqSjIYdkQ2GyMkwUnz0KE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3 h1:ZmanXHhhBKPEvrI1QuUc9794LwtIGEcD6Df2NvFuFRM= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= github.com/smartcontractkit/chainlink-common/keystore v1.1.0 h1:2wzySccgk2fpWusPKO0bpeAZzfSU9eq6CS5U+JwYaVo= github.com/smartcontractkit/chainlink-common/keystore v1.1.0/go.mod h1:6JexOOhPhknQ0QMuppFIlOpm6wCp54yZMxai+tWugwY= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 h1:FJAFgXS9oqASnkS03RE1HQwYQQxrO4l46O5JSzxqLgg= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10/go.mod h1:oiDa54M0FwxevWwyAX773lwdWvFYYlYHHQV1LQ5HpWY= -github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91 h1:s8E4EYRKEjghJFDnIWQxw8zoCvORVolIY/EKZ+JmzRc= -github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91/go.mod h1:Fl6b/I5qn5TcEh85FP1rNsJ7stcYtmXhVbM2W5RuzQg= +github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e h1:S4hEaw8tXBIAdc2WnbxaG7dYAhzzMQozlQDgxdWCvF4= +github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e/go.mod h1:8VLQ4AUysDbAyYKXolpOSJDdDWHyJ2ARjQAVcCg7eW4= github.com/smartcontractkit/chainlink-deployments-framework v0.101.0 h1:bTPDvJSLlMAibGuuewKK8hgVO3jBcyn/jaAiK2Agj98= github.com/smartcontractkit/chainlink-deployments-framework v0.101.0/go.mod h1:d3twE7zrOtc0iuLs4EhBuaJAtAYOPZr+39nrXv4trw0= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260507171202-46e6a397da2d h1:+zUmapuseG/BWHmBoM3Cl7LEr2frKr59q+eVKgBV9Zk= diff --git a/go.mod b/go.mod index 47365ab955e..eeea3214c52 100644 --- a/go.mod +++ b/go.mod @@ -85,10 +85,10 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3 github.com/smartcontractkit/chainlink-common/keystore v1.1.0 github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 - github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91 + github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260507171202-46e6a397da2d github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd diff --git a/go.sum b/go.sum index d1e74781690..3f1890b2247 100644 --- a/go.sum +++ b/go.sum @@ -1183,14 +1183,14 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc/go.mod h1:67YbnoglYD61Pz/jTVCgav9wFq7S35OU8UyQSvPllRw= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd h1:IMopuENFVS63AerRELdfWo6o60UNUidcldJOxJLmk24= github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd/go.mod h1:SBN8Urnh5sQvrQRbSo1Nr8coWatHg8LZoPw3R/42sho= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75 h1:Q4JpoGlKfls821po7GdjY8zqSjIYdkQ2GyMkwUnz0KE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3 h1:ZmanXHhhBKPEvrI1QuUc9794LwtIGEcD6Df2NvFuFRM= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= github.com/smartcontractkit/chainlink-common/keystore v1.1.0 h1:2wzySccgk2fpWusPKO0bpeAZzfSU9eq6CS5U+JwYaVo= github.com/smartcontractkit/chainlink-common/keystore v1.1.0/go.mod h1:6JexOOhPhknQ0QMuppFIlOpm6wCp54yZMxai+tWugwY= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 h1:FJAFgXS9oqASnkS03RE1HQwYQQxrO4l46O5JSzxqLgg= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10/go.mod h1:oiDa54M0FwxevWwyAX773lwdWvFYYlYHHQV1LQ5HpWY= -github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91 h1:s8E4EYRKEjghJFDnIWQxw8zoCvORVolIY/EKZ+JmzRc= -github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91/go.mod h1:Fl6b/I5qn5TcEh85FP1rNsJ7stcYtmXhVbM2W5RuzQg= +github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e h1:S4hEaw8tXBIAdc2WnbxaG7dYAhzzMQozlQDgxdWCvF4= +github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e/go.mod h1:8VLQ4AUysDbAyYKXolpOSJDdDWHyJ2ARjQAVcCg7eW4= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260507171202-46e6a397da2d h1:+zUmapuseG/BWHmBoM3Cl7LEr2frKr59q+eVKgBV9Zk= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260507171202-46e6a397da2d/go.mod h1:6EpqRtmiA3smgCRNVSN/IorekINrftZPX5QhoNrCaj4= github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 h1:QJiXTG9CmaQAuMRn5JGi+Jhji7fSkehVnKpjc8oNJJY= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 3f9342f4fe8..5cc30924f23 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -29,7 +29,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260506144252-c100eabfda74 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3 github.com/smartcontractkit/chainlink-common/keystore v1.1.0 github.com/smartcontractkit/chainlink-deployments-framework v0.101.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260507171202-46e6a397da2d @@ -401,7 +401,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260504204047-af9826978b72 // indirect github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd // indirect github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect - github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91 // indirect + github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e // indirect github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 // indirect github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20260423135514-5b1a7565a99c // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index d53675e0973..96617b700ef 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1370,14 +1370,14 @@ github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd h github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd/go.mod h1:SBN8Urnh5sQvrQRbSo1Nr8coWatHg8LZoPw3R/42sho= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260428205321-9ce8f4c44d23 h1:1Rt4HLpwbRN1YtBFcbsxSJYIiUP2wJ11qizevOEeCrs= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260428205321-9ce8f4c44d23/go.mod h1:V+wrhuNve+JiFwoBr25d6y0lL1rYSCSJhTFyloL3ueo= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75 h1:Q4JpoGlKfls821po7GdjY8zqSjIYdkQ2GyMkwUnz0KE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3 h1:ZmanXHhhBKPEvrI1QuUc9794LwtIGEcD6Df2NvFuFRM= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= github.com/smartcontractkit/chainlink-common/keystore v1.1.0 h1:2wzySccgk2fpWusPKO0bpeAZzfSU9eq6CS5U+JwYaVo= github.com/smartcontractkit/chainlink-common/keystore v1.1.0/go.mod h1:6JexOOhPhknQ0QMuppFIlOpm6wCp54yZMxai+tWugwY= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 h1:FJAFgXS9oqASnkS03RE1HQwYQQxrO4l46O5JSzxqLgg= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10/go.mod h1:oiDa54M0FwxevWwyAX773lwdWvFYYlYHHQV1LQ5HpWY= -github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91 h1:s8E4EYRKEjghJFDnIWQxw8zoCvORVolIY/EKZ+JmzRc= -github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91/go.mod h1:Fl6b/I5qn5TcEh85FP1rNsJ7stcYtmXhVbM2W5RuzQg= +github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e h1:S4hEaw8tXBIAdc2WnbxaG7dYAhzzMQozlQDgxdWCvF4= +github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e/go.mod h1:8VLQ4AUysDbAyYKXolpOSJDdDWHyJ2ARjQAVcCg7eW4= github.com/smartcontractkit/chainlink-deployments-framework v0.101.0 h1:bTPDvJSLlMAibGuuewKK8hgVO3jBcyn/jaAiK2Agj98= github.com/smartcontractkit/chainlink-deployments-framework v0.101.0/go.mod h1:d3twE7zrOtc0iuLs4EhBuaJAtAYOPZr+39nrXv4trw0= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260507171202-46e6a397da2d h1:+zUmapuseG/BWHmBoM3Cl7LEr2frKr59q+eVKgBV9Zk= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 9a87b324d40..f4a8fbbc854 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -20,7 +20,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260506144252-c100eabfda74 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3 github.com/smartcontractkit/chainlink-deployments-framework v0.101.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260507171202-46e6a397da2d github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.19 @@ -481,7 +481,7 @@ require ( github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd // indirect github.com/smartcontractkit/chainlink-common/keystore v1.1.0 // indirect github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect - github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91 // indirect + github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e // indirect github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 // indirect github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260421142741-9c7fbaf7c828 // indirect github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 9089444c9b6..9be63c33815 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1638,14 +1638,14 @@ github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd h github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd/go.mod h1:SBN8Urnh5sQvrQRbSo1Nr8coWatHg8LZoPw3R/42sho= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260428205321-9ce8f4c44d23 h1:1Rt4HLpwbRN1YtBFcbsxSJYIiUP2wJ11qizevOEeCrs= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260428205321-9ce8f4c44d23/go.mod h1:V+wrhuNve+JiFwoBr25d6y0lL1rYSCSJhTFyloL3ueo= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75 h1:Q4JpoGlKfls821po7GdjY8zqSjIYdkQ2GyMkwUnz0KE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3 h1:ZmanXHhhBKPEvrI1QuUc9794LwtIGEcD6Df2NvFuFRM= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= github.com/smartcontractkit/chainlink-common/keystore v1.1.0 h1:2wzySccgk2fpWusPKO0bpeAZzfSU9eq6CS5U+JwYaVo= github.com/smartcontractkit/chainlink-common/keystore v1.1.0/go.mod h1:6JexOOhPhknQ0QMuppFIlOpm6wCp54yZMxai+tWugwY= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 h1:FJAFgXS9oqASnkS03RE1HQwYQQxrO4l46O5JSzxqLgg= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10/go.mod h1:oiDa54M0FwxevWwyAX773lwdWvFYYlYHHQV1LQ5HpWY= -github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91 h1:s8E4EYRKEjghJFDnIWQxw8zoCvORVolIY/EKZ+JmzRc= -github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91/go.mod h1:Fl6b/I5qn5TcEh85FP1rNsJ7stcYtmXhVbM2W5RuzQg= +github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e h1:S4hEaw8tXBIAdc2WnbxaG7dYAhzzMQozlQDgxdWCvF4= +github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e/go.mod h1:8VLQ4AUysDbAyYKXolpOSJDdDWHyJ2ARjQAVcCg7eW4= github.com/smartcontractkit/chainlink-deployments-framework v0.101.0 h1:bTPDvJSLlMAibGuuewKK8hgVO3jBcyn/jaAiK2Agj98= github.com/smartcontractkit/chainlink-deployments-framework v0.101.0/go.mod h1:d3twE7zrOtc0iuLs4EhBuaJAtAYOPZr+39nrXv4trw0= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260507171202-46e6a397da2d h1:+zUmapuseG/BWHmBoM3Cl7LEr2frKr59q+eVKgBV9Zk= diff --git a/system-tests/lib/go.mod b/system-tests/lib/go.mod index 0549154c2bf..593d9fc055b 100644 --- a/system-tests/lib/go.mod +++ b/system-tests/lib/go.mod @@ -33,7 +33,7 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.98 github.com/smartcontractkit/chainlink-aptos v0.0.0-20260507123701-77fc93b573bb github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3 github.com/smartcontractkit/chainlink-common/keystore v1.1.0 github.com/smartcontractkit/chainlink-deployments-framework v0.101.0 github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260507171202-46e6a397da2d @@ -455,7 +455,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260504204047-af9826978b72 // indirect github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd // indirect github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20251211140724-319861e514c4 // indirect - github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91 // indirect + github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e // indirect github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 // indirect github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect github.com/smartcontractkit/chainlink-framework/capabilities v0.0.0-20260423135514-5b1a7565a99c // indirect diff --git a/system-tests/lib/go.sum b/system-tests/lib/go.sum index 88796f9a197..dd0ba539795 100644 --- a/system-tests/lib/go.sum +++ b/system-tests/lib/go.sum @@ -1609,14 +1609,14 @@ github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd h github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd/go.mod h1:SBN8Urnh5sQvrQRbSo1Nr8coWatHg8LZoPw3R/42sho= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260428205321-9ce8f4c44d23 h1:1Rt4HLpwbRN1YtBFcbsxSJYIiUP2wJ11qizevOEeCrs= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260428205321-9ce8f4c44d23/go.mod h1:V+wrhuNve+JiFwoBr25d6y0lL1rYSCSJhTFyloL3ueo= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75 h1:Q4JpoGlKfls821po7GdjY8zqSjIYdkQ2GyMkwUnz0KE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3 h1:ZmanXHhhBKPEvrI1QuUc9794LwtIGEcD6Df2NvFuFRM= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= github.com/smartcontractkit/chainlink-common/keystore v1.1.0 h1:2wzySccgk2fpWusPKO0bpeAZzfSU9eq6CS5U+JwYaVo= github.com/smartcontractkit/chainlink-common/keystore v1.1.0/go.mod h1:6JexOOhPhknQ0QMuppFIlOpm6wCp54yZMxai+tWugwY= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20251211140724-319861e514c4 h1:NOUsjsMzNecbjiPWUQGlRSRAutEvCFrqqyETDJeh5q4= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20251211140724-319861e514c4/go.mod h1:Zpvul9sTcZNAZOVzt5vBl1XZGNvQebFpnpn3/KOQvOQ= -github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91 h1:s8E4EYRKEjghJFDnIWQxw8zoCvORVolIY/EKZ+JmzRc= -github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91/go.mod h1:Fl6b/I5qn5TcEh85FP1rNsJ7stcYtmXhVbM2W5RuzQg= +github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e h1:S4hEaw8tXBIAdc2WnbxaG7dYAhzzMQozlQDgxdWCvF4= +github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e/go.mod h1:8VLQ4AUysDbAyYKXolpOSJDdDWHyJ2ARjQAVcCg7eW4= github.com/smartcontractkit/chainlink-deployments-framework v0.101.0 h1:bTPDvJSLlMAibGuuewKK8hgVO3jBcyn/jaAiK2Agj98= github.com/smartcontractkit/chainlink-deployments-framework v0.101.0/go.mod h1:d3twE7zrOtc0iuLs4EhBuaJAtAYOPZr+39nrXv4trw0= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260507171202-46e6a397da2d h1:+zUmapuseG/BWHmBoM3Cl7LEr2frKr59q+eVKgBV9Zk= diff --git a/system-tests/tests/go.mod b/system-tests/tests/go.mod index afad8aec9f5..862d066bb94 100644 --- a/system-tests/tests/go.mod +++ b/system-tests/tests/go.mod @@ -58,9 +58,9 @@ require ( github.com/rs/zerolog v1.34.0 github.com/shopspring/decimal v1.4.0 github.com/smartcontractkit/chain-selectors v1.0.98 - github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75 + github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3 github.com/smartcontractkit/chainlink-common/keystore v1.1.0 - github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91 + github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e github.com/smartcontractkit/chainlink-deployments-framework v0.101.0 github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260403151002-2c91155b5501 github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260421142741-9c7fbaf7c828 diff --git a/system-tests/tests/go.sum b/system-tests/tests/go.sum index f4573a10809..c29627e869d 100644 --- a/system-tests/tests/go.sum +++ b/system-tests/tests/go.sum @@ -1824,14 +1824,14 @@ github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd h github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260428133800-3b1484e8b1fd/go.mod h1:SBN8Urnh5sQvrQRbSo1Nr8coWatHg8LZoPw3R/42sho= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260428205321-9ce8f4c44d23 h1:1Rt4HLpwbRN1YtBFcbsxSJYIiUP2wJ11qizevOEeCrs= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260428205321-9ce8f4c44d23/go.mod h1:V+wrhuNve+JiFwoBr25d6y0lL1rYSCSJhTFyloL3ueo= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75 h1:Q4JpoGlKfls821po7GdjY8zqSjIYdkQ2GyMkwUnz0KE= -github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511142328-0441b446ad75/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3 h1:ZmanXHhhBKPEvrI1QuUc9794LwtIGEcD6Df2NvFuFRM= +github.com/smartcontractkit/chainlink-common v0.11.2-0.20260511163550-f55b0441dfd3/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= github.com/smartcontractkit/chainlink-common/keystore v1.1.0 h1:2wzySccgk2fpWusPKO0bpeAZzfSU9eq6CS5U+JwYaVo= github.com/smartcontractkit/chainlink-common/keystore v1.1.0/go.mod h1:6JexOOhPhknQ0QMuppFIlOpm6wCp54yZMxai+tWugwY= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20251211140724-319861e514c4 h1:NOUsjsMzNecbjiPWUQGlRSRAutEvCFrqqyETDJeh5q4= github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20251211140724-319861e514c4/go.mod h1:Zpvul9sTcZNAZOVzt5vBl1XZGNvQebFpnpn3/KOQvOQ= -github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91 h1:s8E4EYRKEjghJFDnIWQxw8zoCvORVolIY/EKZ+JmzRc= -github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260504075031-e5aae8c82e91/go.mod h1:Fl6b/I5qn5TcEh85FP1rNsJ7stcYtmXhVbM2W5RuzQg= +github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e h1:S4hEaw8tXBIAdc2WnbxaG7dYAhzzMQozlQDgxdWCvF4= +github.com/smartcontractkit/chainlink-data-streams v0.1.14-0.20260511174456-27c482950e2e/go.mod h1:8VLQ4AUysDbAyYKXolpOSJDdDWHyJ2ARjQAVcCg7eW4= github.com/smartcontractkit/chainlink-deployments-framework v0.101.0 h1:bTPDvJSLlMAibGuuewKK8hgVO3jBcyn/jaAiK2Agj98= github.com/smartcontractkit/chainlink-deployments-framework v0.101.0/go.mod h1:d3twE7zrOtc0iuLs4EhBuaJAtAYOPZr+39nrXv4trw0= github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260507171202-46e6a397da2d h1:+zUmapuseG/BWHmBoM3Cl7LEr2frKr59q+eVKgBV9Zk= From 5e20b932a07b133950153112d162595a14a889e9 Mon Sep 17 00:00:00 2001 From: pavel-raykov Date: Mon, 11 May 2026 20:22:56 +0200 Subject: [PATCH 3/5] Minor. --- .../plugins/mercury/config/config_test.go | 6 +++--- .../relay/evm/mercury/v2/data_source_test.go | 20 +++++++++---------- .../relay/evm/mercury/v3/data_source_test.go | 20 +++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/core/services/ocr2/plugins/mercury/config/config_test.go b/core/services/ocr2/plugins/mercury/config/config_test.go index c00d1a3f478..4891cd7c583 100644 --- a/core/services/ocr2/plugins/mercury/config/config_test.go +++ b/core/services/ocr2/plugins/mercury/config/config_test.go @@ -141,15 +141,15 @@ func Test_PluginConfig(t *testing.T) { rawToml := `LinkFeedID = "test"` err := toml.Unmarshal([]byte(rawToml), &mc) - assert.Contains(t, err.Error(), "toml: hex string without 0x prefix") + assert.Contains(t, err.Error(), "toml: FeedID must be 32 bytes (64 hex chars) long") rawToml = `LinkFeedID = "0xtest000000000000000000000000000000000000000000000000000000000000"` err = toml.Unmarshal([]byte(rawToml), &mc) - assert.Contains(t, err.Error(), `toml: invalid hex string`) + assert.Contains(t, err.Error(), `toml: Failed to decode hex: encoding/hex: invalid byte`) rawToml = `LinkFeedID = "0xtest"` err = toml.Unmarshal([]byte(rawToml), &mc) - assert.Contains(t, err.Error(), `toml: hex string has length 4, want 64 for Hash`) + assert.Contains(t, err.Error(), `toml: FeedID must be 32 bytes (64 hex chars) long`) rawToml = ` ServerURL = "example.com:80" diff --git a/core/services/relay/evm/mercury/v2/data_source_test.go b/core/services/relay/evm/mercury/v2/data_source_test.go index 55c3c5c54ef..1349384c125 100644 --- a/core/services/relay/evm/mercury/v2/data_source_test.go +++ b/core/services/relay/evm/mercury/v2/data_source_test.go @@ -31,9 +31,9 @@ type mockFetcher struct { nativePriceErr error } -var feedId mercury.FeedID = [32]byte{1} -var linkFeedId mercury.FeedID = [32]byte{2} -var nativeFeedId mercury.FeedID = [32]byte{3} +var feedID mercury.FeedID = [32]byte{1} +var linkFeedID mercury.FeedID = [32]byte{2} +var nativeFeedID mercury.FeedID = [32]byte{3} func (m *mockFetcher) FetchInitialMaxFinalizedBlockNumber(context.Context) (*int64, error) { return nil, nil @@ -41,9 +41,9 @@ func (m *mockFetcher) FetchInitialMaxFinalizedBlockNumber(context.Context) (*int func (m *mockFetcher) LatestPrice(ctx context.Context, fId [32]byte) (*big.Int, error) { switch mercury.FeedID(fId) { - case linkFeedId: + case linkFeedID: return m.linkPrice, m.linkPriceErr - case nativeFeedId: + case nativeFeedID: return m.nativePrice, m.nativePriceErr } return nil, nil @@ -174,12 +174,12 @@ func Test_Datasource(t *testing.T) { }) t.Run("when run execution succeeded", func(t *testing.T) { - t.Run("when feedId=linkFeedID=nativeFeedId", func(t *testing.T) { + t.Run("when feedID=linkFeedID=nativeFeedID", func(t *testing.T) { t.Cleanup(func() { - ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, linkFeedId, nativeFeedId + ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedID, linkFeedID, nativeFeedID }) - ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, feedId, feedId + ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedID, feedID, feedID fetcher.ts = 123123 fetcher.tsErr = nil @@ -244,9 +244,9 @@ func Test_Datasource(t *testing.T) { }) t.Run("when run execution succeeded", func(t *testing.T) { - t.Run("when feedId=linkFeedID=nativeFeedId", func(t *testing.T) { + t.Run("when feedID=linkFeedID=nativeFeedID", func(t *testing.T) { t.Cleanup(func() { - ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, linkFeedId, nativeFeedId + ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedID, linkFeedID, nativeFeedID }) var feedId mercury.FeedID = [32]byte{1} diff --git a/core/services/relay/evm/mercury/v3/data_source_test.go b/core/services/relay/evm/mercury/v3/data_source_test.go index 1212d517913..d3bb6bae630 100644 --- a/core/services/relay/evm/mercury/v3/data_source_test.go +++ b/core/services/relay/evm/mercury/v3/data_source_test.go @@ -33,9 +33,9 @@ type mockFetcher struct { nativePriceErr error } -var feedId mercurytypes.FeedID = [32]byte{1} -var linkFeedId mercurytypes.FeedID = [32]byte{2} -var nativeFeedId mercurytypes.FeedID = [32]byte{3} +var feedID mercurytypes.FeedID = [32]byte{1} +var linkFeedID mercurytypes.FeedID = [32]byte{2} +var nativeFeedID mercurytypes.FeedID = [32]byte{3} func (m *mockFetcher) FetchInitialMaxFinalizedBlockNumber(context.Context) (*int64, error) { return nil, nil @@ -43,9 +43,9 @@ func (m *mockFetcher) FetchInitialMaxFinalizedBlockNumber(context.Context) (*int func (m *mockFetcher) LatestPrice(ctx context.Context, fId [32]byte) (*big.Int, error) { switch mercurytypes.FeedID(fId) { - case linkFeedId: + case linkFeedID: return m.linkPrice, m.linkPriceErr - case nativeFeedId: + case nativeFeedID: return m.nativePrice, m.nativePriceErr } return nil, nil @@ -186,12 +186,12 @@ func Test_Datasource(t *testing.T) { }) t.Run("when run execution succeeded", func(t *testing.T) { - t.Run("when feedId=linkFeedID=nativeFeedId", func(t *testing.T) { + t.Run("when feedID=linkFeedID=nativeFeedID", func(t *testing.T) { t.Cleanup(func() { - ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, linkFeedId, nativeFeedId + ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedID, linkFeedID, nativeFeedID }) - ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, feedId, feedId + ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedID, feedID, feedID fetcher.ts = 123123 fetcher.tsErr = nil @@ -321,9 +321,9 @@ func Test_Datasource(t *testing.T) { }) t.Run("when run execution succeeded", func(t *testing.T) { - t.Run("when feedId=linkFeedID=nativeFeedId", func(t *testing.T) { + t.Run("when feedID=linkFeedID=nativeFeedID", func(t *testing.T) { t.Cleanup(func() { - ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, linkFeedId, nativeFeedId + ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedID, linkFeedID, nativeFeedID }) var feedId mercurytypes.FeedID = [32]byte{1} From d40b09cfc212026d51d5d43adf0290ce88ac3dd6 Mon Sep 17 00:00:00 2001 From: pavel-raykov Date: Mon, 11 May 2026 20:27:16 +0200 Subject: [PATCH 4/5] Minor. --- core/services/ocr2/plugins/mercury/config/config_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/services/ocr2/plugins/mercury/config/config_test.go b/core/services/ocr2/plugins/mercury/config/config_test.go index 4891cd7c583..1fb802ef39c 100644 --- a/core/services/ocr2/plugins/mercury/config/config_test.go +++ b/core/services/ocr2/plugins/mercury/config/config_test.go @@ -139,9 +139,9 @@ func Test_PluginConfig(t *testing.T) { t.Run("with invalid values", func(t *testing.T) { var mc PluginConfig - rawToml := `LinkFeedID = "test"` + rawToml := `LinkFeedID = "0y0000000000000000000000000000000000000000000000000000000000000000"` err := toml.Unmarshal([]byte(rawToml), &mc) - assert.Contains(t, err.Error(), "toml: FeedID must be 32 bytes (64 hex chars) long") + assert.Contains(t, err.Error(), "toml: FeedID must start with '0x' or '0X' prefix") rawToml = `LinkFeedID = "0xtest000000000000000000000000000000000000000000000000000000000000"` err = toml.Unmarshal([]byte(rawToml), &mc) From 1b04b96f034a929e1f5c8a4800b1109bc7a3a54c Mon Sep 17 00:00:00 2001 From: pavel-raykov Date: Mon, 11 May 2026 20:28:54 +0200 Subject: [PATCH 5/5] Minor. --- .../relay/evm/mercury/v2/data_source_test.go | 4 ++-- .../relay/evm/mercury/v3/data_source_test.go | 4 ++-- .../relay/evm/mercury/v4/data_source_test.go | 24 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/services/relay/evm/mercury/v2/data_source_test.go b/core/services/relay/evm/mercury/v2/data_source_test.go index 1349384c125..7cd9b596676 100644 --- a/core/services/relay/evm/mercury/v2/data_source_test.go +++ b/core/services/relay/evm/mercury/v2/data_source_test.go @@ -249,8 +249,8 @@ func Test_Datasource(t *testing.T) { ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedID, linkFeedID, nativeFeedID }) - var feedId mercury.FeedID = [32]byte{1} - ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, feedId, feedId + var feedID mercury.FeedID = [32]byte{1} + ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedID, feedID, feedID obs, err := ds.Observe(ctx, repts, false) assert.NoError(t, err) diff --git a/core/services/relay/evm/mercury/v3/data_source_test.go b/core/services/relay/evm/mercury/v3/data_source_test.go index d3bb6bae630..6d61153a893 100644 --- a/core/services/relay/evm/mercury/v3/data_source_test.go +++ b/core/services/relay/evm/mercury/v3/data_source_test.go @@ -326,8 +326,8 @@ func Test_Datasource(t *testing.T) { ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedID, linkFeedID, nativeFeedID }) - var feedId mercurytypes.FeedID = [32]byte{1} - ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, feedId, feedId + var feedID mercurytypes.FeedID = [32]byte{1} + ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedID, feedID, feedID obs, err := ds.Observe(ctx, repts, false) assert.NoError(t, err) diff --git a/core/services/relay/evm/mercury/v4/data_source_test.go b/core/services/relay/evm/mercury/v4/data_source_test.go index 7784a3ca6ea..ae7da68be31 100644 --- a/core/services/relay/evm/mercury/v4/data_source_test.go +++ b/core/services/relay/evm/mercury/v4/data_source_test.go @@ -30,9 +30,9 @@ type mockFetcher struct { nativePriceErr error } -var feedId mercurytypes.FeedID = [32]byte{1} -var linkFeedId mercurytypes.FeedID = [32]byte{2} -var nativeFeedId mercurytypes.FeedID = [32]byte{3} +var feedID mercurytypes.FeedID = [32]byte{1} +var linkFeedID mercurytypes.FeedID = [32]byte{2} +var nativeFeedID mercurytypes.FeedID = [32]byte{3} func (m *mockFetcher) FetchInitialMaxFinalizedBlockNumber(context.Context) (*int64, error) { return nil, nil @@ -40,9 +40,9 @@ func (m *mockFetcher) FetchInitialMaxFinalizedBlockNumber(context.Context) (*int func (m *mockFetcher) LatestPrice(ctx context.Context, fId [32]byte) (*big.Int, error) { switch mercurytypes.FeedID(fId) { - case linkFeedId: + case linkFeedID: return m.linkPrice, m.linkPriceErr - case nativeFeedId: + case nativeFeedID: return m.nativePrice, m.nativePriceErr } return nil, nil @@ -178,12 +178,12 @@ func Test_Datasource(t *testing.T) { }) t.Run("when run execution succeeded", func(t *testing.T) { - t.Run("when feedId=linkFeedID=nativeFeedId", func(t *testing.T) { + t.Run("when feedID=linkFeedID=nativeFeedID", func(t *testing.T) { t.Cleanup(func() { - ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, linkFeedId, nativeFeedId + ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedID, linkFeedID, nativeFeedID }) - ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, feedId, feedId + ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedID, feedID, feedID fetcher.ts = 123123 fetcher.tsErr = nil @@ -255,13 +255,13 @@ func Test_Datasource(t *testing.T) { }) t.Run("when run execution succeeded", func(t *testing.T) { - t.Run("when feedId=linkFeedID=nativeFeedId", func(t *testing.T) { + t.Run("when feedID=linkFeedID=nativeFeedID", func(t *testing.T) { t.Cleanup(func() { - ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, linkFeedId, nativeFeedId + ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedID, linkFeedID, nativeFeedID }) - var feedId mercurytypes.FeedID = [32]byte{1} - ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedId, feedId, feedId + var feedID mercurytypes.FeedID = [32]byte{1} + ds.feedID, ds.linkFeedID, ds.nativeFeedID = feedID, feedID, feedID obs, err := ds.Observe(ctx, repts, false) assert.NoError(t, err)