[CCIP-2942] OCR2 plugins merge fixes [CCIP-2942] #14026

asoliman92 · 2024-08-05T11:05:22Z

Fix ccip ocr2 plugins fixes. Including missing files, tests and editing shared files. This needs a good review before merging. Should be merged into ccip/ocr2-merge-clean with Squashing commits.

github-actions · 2024-08-05T11:06:17Z

I see you updated files related to core. Please run pnpm changeset 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.

makramkd · 2024-08-05T13:52:55Z

core/scripts/go.mod

-	github.com/avast/retry-go/v4 v4.5.1 // indirect
+	github.com/avast/retry-go/v4 v4.6.0 // indirect


Whats the reasoning behind this bump

It's bumped in CCIP, Otherwise it will fail the build

makramkd · 2024-08-05T13:53:41Z

core/services/feeds/service.go

+	// UnsafeSetConnectionsManager Only for testing
+	UnsafeSetConnectionsManager(ConnectionsManager)


Isn't this Unsafe_SetConnectionsManager? (note the underscore)

Chainlink code didn't have it. I re-added it manually. Didn't use the _ because was getting some linting messages locally AFAIR. Does the underscore mean something in this context?

It doesn't change the meaning of the func but just wondering if this'll botch up any future merges from ccip -> chainlink

makramkd · 2024-08-05T13:55:18Z

core/services/ocr2/plugins/ccip/testhelpers/integration/chainlink.go

@@ -378,7 +379,6 @@ func setupNodeCCIP(
 			fmt.Sprintf("127.0.0.1:%d", port),
 		}
 		c.Log.Level = &loglevel
-		c.Feature.CCIP = &trueRef


hmmmm... I think this happened during merging. @mateusz-sekara you changed something with the flag. We still expect it to be set though. right?

This flag is not used anywhere, but we need to deprecate it first and then remove it in the following release. To align it with how it's done in other places, changing the default value to true. This is what we've agreed on with @jmank88

(we can't remove it immediately because the parser is strict and it needs to be removed first from all the deployments)

original commit: smartcontractkit/ccip@451984a

rename UnsafeSetConnectionsManager to Unsafe_SetConnectionsManager to follow same convention in ccip repo

cl-sonarqube-production · 2024-08-05T18:29:24Z

Quality Gate passed

Issues
20 New issues
0 Accepted issues

Measures
0 Security Hotspots
77.9% Coverage on New Code
2.2% Duplication on New Code

See analysis details on SonarQube

winder

Changes seem fine to me. I didn't diff every file against the ccip repo, but the ones I did look pretty much identical.

* Add status checker original commit: smartcontractkit/ccip@451984a * Add CCIP to types.go * Add Unsafe_SetConnectionsManager to feeds service for testing * Add CCIP feature to core.toml * Rebuilding config * Wiring up relayer and ocr2 delegates - this commit touches shared code ! * Adding mockery configuration for ccip specific code * Setting CCIP feature flag to true - it's no longer used anywhere --------- Co-authored-by: Mateusz Sekara <[email protected]>

* Copy over core/services/ocr2/plugins/ccip from ccip repo (#14024) This is first part in merging offchain code from ccip repo (https://github.com/smartcontractkit/ccip) into chainlink Maintaining history across repos for specific direcotires was complicated so we chose to copy the directory right away. ----------------- Co-authored-by: Abdelrahman Soliman (Boda) <[email protected]> Co-authored-by: Agustina Aldasoro <[email protected]> Co-authored-by: Amir Y <[email protected]> Co-authored-by: André Vitor de Lima Matos <[email protected]> Co-authored-by: AnieeG <[email protected]> Co-authored-by: Anindita Ghosh <[email protected]> Co-authored-by: Chunkai Yang <[email protected]> Co-authored-by: Connor Stein <[email protected]> Co-authored-by: Evaldas Latoškinas <[email protected]> Co-authored-by: Jean Arnaud <[email protected]> Co-authored-by: Justin Kaseman <[email protected]> Co-authored-by: Makram <[email protected]> Co-authored-by: Makram Kamaleddine <[email protected]> Co-authored-by: Mateusz Sekara <[email protected]> Co-authored-by: Matt Yang <[email protected]> Co-authored-by: Patrick <[email protected]> Co-authored-by: Rens Rooimans <[email protected]> Co-authored-by: Roman Kashitsyn <[email protected]> Co-authored-by: Roman Kashitsyn <[email protected]> Co-authored-by: Ryan Stout <[email protected]> Co-authored-by: Will Winder <[email protected]> Co-authored-by: connorwstein <[email protected]> Co-authored-by: dimitris <[email protected]> Co-authored-by: dimkouv <[email protected]> Co-authored-by: nogo <[email protected]> Co-authored-by: nogo <[email protected]> Co-authored-by: valerii-kabisov-cll <[email protected]> * [CCIP-2942] OCR2 plugins merge fixes [CCIP-2942] (#14026) * Add status checker original commit: smartcontractkit/ccip@451984a * Add CCIP to types.go * Add Unsafe_SetConnectionsManager to feeds service for testing * Add CCIP feature to core.toml * Rebuilding config * Wiring up relayer and ocr2 delegates - this commit touches shared code ! * Adding mockery configuration for ccip specific code * Setting CCIP feature flag to true - it's no longer used anywhere --------- Co-authored-by: Mateusz Sekara <[email protected]> * VRF-1138: Make CTF tests to reuse existing VRF Wrapper (#13854) * VRF-1138: Make CTF tests to reuse existing VRF Wrapper * VRF-1138: remove old code * VRF-1138: remove comments * VRF-1138: refactoring * VRF-1138: pr comments * VRF-1138: pr comments * VRF-1138: fixing lint issues * VRF-1138: PR comments * changes to support deterministic message hash in the remote target (#13935) * common version update to head of develop (#14030) * Add changeset --------- Co-authored-by: Agustina Aldasoro <[email protected]> Co-authored-by: Amir Y <[email protected]> Co-authored-by: André Vitor de Lima Matos <[email protected]> Co-authored-by: AnieeG <[email protected]> Co-authored-by: Anindita Ghosh <[email protected]> Co-authored-by: Chunkai Yang <[email protected]> Co-authored-by: Connor Stein <[email protected]> Co-authored-by: Evaldas Latoškinas <[email protected]> Co-authored-by: Jean Arnaud <[email protected]> Co-authored-by: Justin Kaseman <[email protected]> Co-authored-by: Makram <[email protected]> Co-authored-by: Mateusz Sekara <[email protected]> Co-authored-by: Matt Yang <[email protected]> Co-authored-by: Patrick <[email protected]> Co-authored-by: Rens Rooimans <[email protected]> Co-authored-by: Roman Kashitsyn <[email protected]> Co-authored-by: Roman Kashitsyn <[email protected]> Co-authored-by: Ryan Stout <[email protected]> Co-authored-by: Will Winder <[email protected]> Co-authored-by: dimitris <[email protected]> Co-authored-by: nogo <[email protected]> Co-authored-by: nogo <[email protected]> Co-authored-by: valerii-kabisov-cll <[email protected]> Co-authored-by: Ilja Pavlovs <[email protected]> Co-authored-by: Matthew Pendrey <[email protected]>

asoliman92 temporarily deployed to sdlc August 5, 2024 11:05 — with GitHub Actions Inactive

asoliman92 changed the title ~~[CCIP-Merge] OCR2 plugins merge fixes~~ [CCIP-Merge] OCR2 plugins merge fixes [CCIP-2936] Aug 5, 2024

asoliman92 changed the title ~~[CCIP-Merge] OCR2 plugins merge fixes [CCIP-2936]~~ [CCIP-Merge] OCR2 plugins merge fixes [CCIP-2942] Aug 5, 2024

mateusz-sekara approved these changes Aug 5, 2024

View reviewed changes

makramkd reviewed Aug 5, 2024

View reviewed changes

asoliman92 force-pushed the ocr2-directory-only branch from 1ad9854 to 2715c9b Compare August 5, 2024 15:58

asoliman92 changed the base branch from ocr2-directory-only to ccip/ocr2-merge-clean August 5, 2024 16:25

asoliman92 force-pushed the ccip/ocr2-merge-clean branch from f0bef2a to 05ef7fd Compare August 5, 2024 16:52

asoliman92 changed the title ~~[CCIP-Merge] OCR2 plugins merge fixes [CCIP-2942]~~ OCR2 plugins merge fixes Aug 5, 2024

asoliman92 force-pushed the ccip/ocr2-merge-fixes branch from c932433 to eea837d Compare August 5, 2024 17:04

asoliman92 had a problem deploying to sdlc August 5, 2024 17:04 — with GitHub Actions Failure

asoliman92 changed the base branch from ccip/ocr2-merge-clean to ocr2-directory-only August 5, 2024 17:05

asoliman92 temporarily deployed to sdlc August 5, 2024 17:13 — with GitHub Actions Inactive

asoliman92 had a problem deploying to sdlc August 5, 2024 17:20 — with GitHub Actions Failure

asoliman92 changed the title ~~OCR2 plugins merge fixes~~ [CCIP-2942] OCR2 plugins merge fixes [CCIP-2942] Aug 5, 2024

Base automatically changed from ocr2-directory-only to ccip/ocr2-merge-clean August 5, 2024 17:40

asoliman92 had a problem deploying to sdlc August 5, 2024 17:43 — with GitHub Actions Failure

asoliman92 had a problem deploying to sdlc August 5, 2024 17:50 — with GitHub Actions Failure

asoliman92 force-pushed the ccip/ocr2-merge-fixes branch 2 times, most recently from 1cb1836 to 89af212 Compare August 5, 2024 17:58

asoliman92 had a problem deploying to sdlc August 5, 2024 17:58 — with GitHub Actions Failure

asoliman92 force-pushed the ccip/ocr2-merge-clean branch 2 times, most recently from ec3de47 to 0465829 Compare August 5, 2024 18:04

asoliman92 force-pushed the ccip/ocr2-merge-fixes branch from 89af212 to 9c61db3 Compare August 5, 2024 18:05

asoliman92 and others added 5 commits August 5, 2024 20:12

Add status checker

e7565c3

original commit: smartcontractkit/ccip@451984a

Add CCIP to types.go

f61cc4c

Add UnsafeSetConnectionsManager to feeds service for testing

5c4c7d8

Add CCIP feature to core.toml

e20f108

Rebuilding config

79d5e70

mateusz-sekara and others added 4 commits August 5, 2024 20:12

Wiring up relayer and ocr2 delegates - this commit touches shared code !

315b0a8

Adding mockery configuration for ccip specific code

d8fbefe

Setting CCIP feature flag to true - it's no longer used anywhere

7fc5c6a

Rename function

0fbb95c

rename UnsafeSetConnectionsManager to Unsafe_SetConnectionsManager to follow same convention in ccip repo

asoliman92 force-pushed the ccip/ocr2-merge-fixes branch from 9c61db3 to 0fbb95c Compare August 5, 2024 18:12

asoliman92 temporarily deployed to sdlc August 5, 2024 18:12 — with GitHub Actions Inactive

asoliman92 marked this pull request as ready for review August 5, 2024 18:25

asoliman92 requested review from a team as code owners August 5, 2024 18:25

winder approved these changes Aug 5, 2024

View reviewed changes

makramkd approved these changes Aug 5, 2024

View reviewed changes

asoliman92 merged this pull request into ccip/ocr2-merge-clean Aug 6, 2024
127 of 129 checks passed

asoliman92 deleted the ccip/ocr2-merge-fixes branch August 6, 2024 05:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CCIP-2942] OCR2 plugins merge fixes [CCIP-2942] #14026

[CCIP-2942] OCR2 plugins merge fixes [CCIP-2942] #14026

asoliman92 commented Aug 5, 2024 •

edited

Loading

github-actions bot commented Aug 5, 2024 •

edited

Loading

makramkd Aug 5, 2024

asoliman92 Aug 5, 2024

makramkd Aug 5, 2024

asoliman92 Aug 5, 2024

makramkd Aug 5, 2024

makramkd Aug 5, 2024

asoliman92 Aug 5, 2024

mateusz-sekara Aug 5, 2024

mateusz-sekara Aug 5, 2024

cl-sonarqube-production bot commented Aug 5, 2024

winder left a comment

		github.com/avast/retry-go/v4 v4.5.1 // indirect
		github.com/avast/retry-go/v4 v4.6.0 // indirect

		// UnsafeSetConnectionsManager Only for testing
		UnsafeSetConnectionsManager(ConnectionsManager)

[CCIP-2942] OCR2 plugins merge fixes [CCIP-2942] #14026

[CCIP-2942] OCR2 plugins merge fixes [CCIP-2942] #14026

Conversation

asoliman92 commented Aug 5, 2024 • edited Loading

github-actions bot commented Aug 5, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cl-sonarqube-production bot commented Aug 5, 2024

Quality Gate passed

winder left a comment

Choose a reason for hiding this comment

asoliman92 commented Aug 5, 2024 •

edited

Loading

github-actions bot commented Aug 5, 2024 •

edited

Loading