Skip to content

[CRE-491] Use moved llo EVM-specific files to chainlink-evm#22586

Merged
pavel-raykov merged 4 commits into
developfrom
move-llo3
May 21, 2026
Merged

[CRE-491] Use moved llo EVM-specific files to chainlink-evm#22586
pavel-raykov merged 4 commits into
developfrom
move-llo3

Conversation

@pavel-raykov
Copy link
Copy Markdown
Collaborator

@github-actions
Copy link
Copy Markdown
Contributor

I see you updated files related to core. Please run make gocs in the root directory to add a changeset as well as in the text include at least one of the following tags:

  • #added For any new functionality added.
  • #breaking_change For any functionality that requires manual action for the node to boot.
  • #bugfix For bug fixes.
  • #changed For any change to the existing functionality.
  • #db_update For any feature that introduces updates to database schema.
  • #deprecation_notice For any upcoming deprecation functionality.
  • #internal For changesets that need to be excluded from the final changelog.
  • #nops For any feature that is NOP facing and needs to be in the official Release Notes for the release.
  • #removed For any functionality/config that is removed.
  • #updated For any functionality that is updated.
  • #wip For any change that is not ready yet and external communication about it should be held off till it is feature complete.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 21, 2026

✅ No conflicts with other open PRs targeting develop

@trunk-io
Copy link
Copy Markdown

trunk-io Bot commented May 21, 2026

Static BadgeStatic BadgeStatic BadgeStatic Badge

View Full Report ↗︎Docs

@cl-sonarqube-production
Copy link
Copy Markdown

@pavel-raykov pavel-raykov marked this pull request as ready for review May 21, 2026 15:29
Copilot AI review requested due to automatic review settings May 21, 2026 15:29
@pavel-raykov pavel-raykov requested review from a team as code owners May 21, 2026 15:29
@pavel-raykov pavel-raykov requested a review from jmank88 May 21, 2026 15:29
@pavel-raykov pavel-raykov enabled auto-merge May 21, 2026 15:30
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Risk Rating: HIGH

This PR updates Chainlink’s LLO/EVM integration to consume LLO EVM-specific implementations (channel definition cache + ORM utilities) from chainlink-evm, removing the in-repo copies under core/services/llo/... and bumping chainlink-evm to a newer pseudo-version across all affected Go modules.

Changes:

  • Bump github.com/smartcontractkit/chainlink-evm version across root/deployment/scripts/integration/system-test modules.
  • Switch imports from chainlink/v2/core/services/llo/... to chainlink-evm/pkg/llo/... in relayers, cleanup logic, and LLO integration tests.
  • Remove the local core/services/llo/channeldefinitions and core/services/llo/orm implementations (and their unit tests), relying on the moved equivalents in chainlink-evm.

Areas needing scrupulous human review:

  • Verify the referenced chainlink-evm version (v0.3.4-0.20260521145337-fdf89453516c) actually contains the moved packages/APIs (pkg/llo, pkg/llo/channeldefinitions) with compatible behavior and signatures.
  • Confirm operational behavior is unchanged (DB persistence semantics, logpoller filter naming, cache merge rules), since core logic is now provided by an external module.
  • Ensure docs (go.md) accurately reflect the resulting module graph (it currently appears out of sync with go.mod).

Reviewed changes

Copilot reviewed 21 out of 28 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
go.mod Bumps chainlink-evm dependency version.
go.sum Updates checksums for the new chainlink-evm version.
deployment/go.mod Bumps chainlink-evm dependency version for deployment module.
deployment/go.sum Updates checksums for deployment module dependency change.
core/scripts/go.mod Bumps chainlink-evm dependency version for scripts module.
core/scripts/go.sum Updates checksums for scripts module dependency change.
integration-tests/go.mod Bumps chainlink-evm dependency version for integration tests module.
integration-tests/go.sum Updates checksums for integration tests module dependency change.
integration-tests/load/go.mod Bumps chainlink-evm dependency version for load tests module.
integration-tests/load/go.sum Updates checksums for load tests module dependency change.
system-tests/lib/go.mod Bumps chainlink-evm dependency version for system-tests lib module.
system-tests/lib/go.sum Updates checksums for system-tests lib module dependency change.
system-tests/tests/go.mod Bumps chainlink-evm dependency version for system-tests tests module.
system-tests/tests/go.sum Updates checksums for system-tests tests module dependency change.
go.md Updates the module dependency diagram (currently appears inconsistent with go.mod).
core/services/relay/evm/evm.go Switches LLO imports to chainlink-evm/pkg/llo/... and uses moved cache factory/ORM.
core/services/relay/evm/llo_provider.go Switches channel definition imports to chainlink-evm/pkg/llo/channeldefinitions.
core/services/relay/dummy/relayer.go Uses chainlink-evm/pkg/llo/channeldefinitions for the static cache in dummy relayer.
core/services/ocr2/plugins/llo/onchain_channel_definition_cache_integration_test.go Updates imports to use moved LLO/channeldefinitions packages in chainlink-evm.
core/services/llo/cleanup.go Uses moved llo.NewChainScopedORM and moved channeldefinitions filter naming.
core/services/llo/cleanup_test.go Updates test to use moved llo.NewChainScopedORM.
core/services/llo/orm.go Removed (implementation moved to chainlink-evm).
core/services/llo/orm_test.go Removed (tests presumably moved to chainlink-evm).
core/services/llo/channeldefinitions/static_channel_definitions_cache.go Removed (implementation moved to chainlink-evm).
core/services/llo/channeldefinitions/onchain_channel_definition_cache.go Removed (implementation moved to chainlink-evm).
core/services/llo/channeldefinitions/onchain_channel_definition_cache_test.go Removed (tests presumably moved to chainlink-evm).
core/services/llo/channeldefinitions/channel_definition_cache_factory.go Removed (factory moved to chainlink-evm).
core/services/llo/channeldefinitions/channel_definition_cache_factory_test.go Removed (tests presumably moved to chainlink-evm).
Comments suppressed due to low confidence (2)

go.md:176

  • In this module dependency graph, the direct edge chainlink/v2 --> chainlink-data-streams was removed, but go.mod still lists github.com/smartcontractkit/chainlink-data-streams as a direct requirement (and core code imports it). Either restore the edge in go.md or adjust go.mod/imports so the graph and module requirements stay consistent.

This issue also appears on line 579 of the same file.

	chainlink/v2 --> chainlink-automation
	chainlink/v2 --> chainlink-ccip/chains/evm
	chainlink/v2 --> chainlink-evm/contracts/cre/gobindings
	chainlink/v2 --> chainlink-feeds
	chainlink/v2 --> chainlink-protos/data-feeds
	chainlink/v2 --> chainlink-protos/ring/go
	chainlink/v2 --> cre-sdk-go/capabilities/networking/http
	chainlink/v2 --> cre-sdk-go/capabilities/scheduler/cron

go.md:586

  • Same as above: this section’s chainlink/v2 dependency list omits chainlink-data-streams, but the repository’s go.mod still requires github.com/smartcontractkit/chainlink-data-streams. Please keep go.md aligned with the actual module graph (or update go.mod if the dependency truly became indirect).
	chainlink/v2 --> chainlink-automation
	chainlink/v2 --> chainlink-ccip/chains/evm
	chainlink/v2 --> chainlink-ccv
	chainlink/v2 --> chainlink-evm/contracts/cre/gobindings
	chainlink/v2 --> chainlink-feeds
	chainlink/v2 --> chainlink-protos/data-feeds
	chainlink/v2 --> chainlink-protos/ring/go
	chainlink/v2 --> chainlink-sui

Comment thread core/services/llo/cleanup.go
Comment thread core/services/llo/cleanup_test.go
@pavel-raykov pavel-raykov added this pull request to the merge queue May 21, 2026
Merged via the queue into develop with commit a0608d1 May 21, 2026
226 checks passed
@pavel-raykov pavel-raykov deleted the move-llo3 branch May 21, 2026 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants