Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CCIP Merge] Capabilities [CCIP-2943] #14068

Merged
merged 6 commits into from
Aug 7, 2024

Conversation

asoliman92
Copy link
Contributor

Merge core/capabilities/ccip from https://github.com/smartcontractkit/ccip into chainlink repo.

asoliman92 and others added 3 commits August 6, 2024 16:34
* Fix compilation for launcher, diff

Make application.go ready for adding more fixes


* Fix launcher tests

* ks-409 fix the mock trigger to ensure events are sent (#14047)

* Add ccip to job orm

* Add capabilities directory under BUSL license

* Prep to instantiate separate registrysyncer for CCIP

* Move registrySyncer creation into ccip delegate

* [chore] Change registrysyncer config to bytes

* Fix launcher diff tests after changing structs in syncer

* Fix linting

* MAke simulated backend client work with chains other than 1337

* core/capabilities/ccip: use OCR offchain config (#1264)

We want to define and use the appropriate OCR offchain config for each
plugin.

Requires smartcontractkit/chainlink-ccip#36

* Cleaning up

* Add capabilities types to mockery

---------

Co-authored-by: Cedric Cordenier <[email protected]>
Co-authored-by: Matthew Pendrey <[email protected]>
Co-authored-by: Makram <[email protected]>
@asoliman92 asoliman92 enabled auto-merge August 7, 2024 18:30
Copy link
Contributor

@winder winder left a comment

Choose a reason for hiding this comment

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

LGTM. I just see minor changes ontop of the previous two PRs:

@asoliman92 asoliman92 added this pull request to the merge queue Aug 7, 2024
Merged via the queue into develop with commit 6ab3eb5 Aug 7, 2024
119 checks passed
@asoliman92 asoliman92 deleted the ccip/capabilities-merge-clean branch August 7, 2024 18:51
momentmaker added a commit that referenced this pull request Aug 7, 2024
* develop:
  [CCIP Merge] Capabilities [CCIP-2943] (#14068)
  add OZ 5.0.2 contracts (#14065)
  enable gomods (#14042)
  auto-10161: replicate v2_3 to v2_3_zksync (#14035)
  chore: update dependabot config gomod (#14063)
  Update log trigger default values (#14051)
  bump solana commit (#14062)
  Update e2e tests definition for CI and automation workflow (#13908)
  use services.Config.NewService/Engine (#13851)
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.

3 participants