add ocr offchainConfig and chain config structs #36

makramkd · 2024-07-19T06:24:20Z

We need to define the offchainConfig and chain config structs. The configuration has been organized so as to make maximal use of blue-green deployments. Things in ChainConfig should not be changed very often if at all, and will affect all DONs.

Things in OCR offchainConfig will be scoped to a particular plugin instance.

Related PR in ccip: smartcontractkit/ccip#1264

pluginconfig/execute.go

chainconfig/chainconfig.go

winder · 2024-08-01T18:36:30Z

pluginconfig/execute.go

-	// Writer indicates that the node can contribute by sending reports to the destination chain.
-	// Being a Writer guarantees that the node can also read from the destination chain.
-	Writer bool `json:"writer"`
+type ExecuteOffchainConfig struct {


Whats the difference between this and ExecutePluginConfig? There is some overlap in values.

This will get posted on-chain and will inform what ends up in ExecutePluginConfig

Could you add some comments to the struct to this effect?

I've ended up embedding this struct in the ExecutePluginConfig struct, which holds configuration not just from the offchain config but from the general OCR config.

winder · 2024-08-06T12:52:31Z

pluginconfig/commit.go

+// ArbitrumPriceSource is the source of the TOKEN/USD price data of a particular token
+// on Arbitrum.
+type ArbitrumPriceSource struct {


Why do we need this?

This is so that the commit plugin can fetch token prices from the feeds that are deployed on arbitrum

Can add some more detailed comments.

winder

Changes seem fine. A lot of them aren't used yet, how big of an issue would it be to add them in as needed? I'd be tempted to throw in lots of TODO comments on the things which still need to be implemented.

makramkd · 2024-08-06T13:27:54Z

Agreed @winder I've created a few tickets for what needs to be used.

github-actions · 2024-08-06T13:32:43Z

Test Coverage

Branch	Coverage
CCIP-2836	76.0%
ccip-develop	76.5%

winder · 2024-08-06T13:32:57Z

pluginconfig/execute.go

+	// OffchainConfig is the offchain config set for the exec DON.
+	OffchainConfig ExecuteOffchainConfig `json:"offchainConfig"`


nice, I was wondering if they overlapped completely like this.

You could fully embed it as well, most off the shelf decoders will append changes rather than overwrite them. Not sure if our custom decoders work that way.

Suggested change

// OffchainConfig is the offchain config set for the exec DON.

OffchainConfig ExecuteOffchainConfig `json:"offchainConfig"`

// ExecuteOffchainConfig is the offchain config set for the exec DON.

ExecuteOffchainConfig`

You could do this direct embed but I think it makes it harder to determine from the usage sites where that field actually comes from; since we have like 3+ kinds of configs I think the more explicit we can be the better

## Motivation We want to define and use the appropriate OCR offchain config for each plugin. ## Solution Requires smartcontractkit/chainlink-ccip#36

We want to define and use the appropriate OCR offchain config for each plugin. Requires smartcontractkit/chainlink-ccip#36

* 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 <cedric.cordenier@smartcontract.com> Co-authored-by: Matthew Pendrey <matthew.pendrey@gmail.com> Co-authored-by: Makram <makramkd@users.noreply.github.com>

* [CCIP Merge] Add ccip capabilities directory [CCIP-2943] (#14044) * Add ccip capabilities directory * [CCIP Merge] Capabilities fix [CCIP-2943] (#14048) * 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 <cedric.cordenier@smartcontract.com> Co-authored-by: Matthew Pendrey <matthew.pendrey@gmail.com> Co-authored-by: Makram <makramkd@users.noreply.github.com> * make modgraph * Add changeset * Fix test with new TxMgr constructor --------- Co-authored-by: Cedric Cordenier <cedric.cordenier@smartcontract.com> Co-authored-by: Matthew Pendrey <matthew.pendrey@gmail.com> Co-authored-by: Makram <makramkd@users.noreply.github.com>

We want to define and use the appropriate OCR offchain config for each plugin. Requires smartcontractkit/chainlink-ccip#36

## Motivation We want to define and use the appropriate OCR offchain config for each plugin. ## Solution Requires smartcontractkit/chainlink-ccip#36

We want to define and use the appropriate OCR offchain config for each plugin. Requires smartcontractkit/chainlink-ccip#36

add ocr offchainConfig and chain config structs

5701785

makramkd commented Jul 19, 2024

View reviewed changes

pluginconfig/execute.go Show resolved Hide resolved

makramkd commented Jul 19, 2024

View reviewed changes

pluginconfig/execute.go Outdated Show resolved Hide resolved

makramkd commented Jul 19, 2024

View reviewed changes

chainconfig/chainconfig.go Outdated Show resolved Hide resolved

makramkd added 4 commits August 1, 2024 14:07

Merge branch 'ccip-develop' into CCIP-2836

f3f637c

add tests

8a1edbd

Merge branch 'ccip-develop' into CCIP-2836

ca3ff00

add execute tests

853f0de

makramkd requested review from winder, connorwstein, dimkouv and 0xnogo August 1, 2024 14:18

winder reviewed Aug 1, 2024

View reviewed changes

makramkd added 5 commits August 5, 2024 14:30

decode offchain configs in NewReportingPlugin

5b76389

parse chain config in home chain reader

6d3e40c

correctly validate

b8095cc

Merge branch 'ccip-develop' into CCIP-2836

d01cc46

fix token data length

8d7b841

makramkd mentioned this pull request Aug 6, 2024

core/capabilities/ccip: use OCR offchain config smartcontractkit/ccip#1264

Merged

winder reviewed Aug 6, 2024

View reviewed changes

winder approved these changes Aug 6, 2024

View reviewed changes

fix linter, address feedback

61de817

winder reviewed Aug 6, 2024

View reviewed changes

asoliman92 approved these changes Aug 6, 2024

View reviewed changes

0xnogo approved these changes Aug 6, 2024

View reviewed changes

makramkd merged commit 6ae4005 into ccip-develop Aug 6, 2024
2 checks passed

makramkd deleted the CCIP-2836 branch August 6, 2024 14:24

asoliman92 pushed a commit to smartcontractkit/chainlink that referenced this pull request Aug 7, 2024

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

3fcaec9

We want to define and use the appropriate OCR offchain config for each plugin. Requires smartcontractkit/chainlink-ccip#36

asoliman92 pushed a commit to smartcontractkit/chainlink that referenced this pull request Aug 27, 2024

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

006e0ed

We want to define and use the appropriate OCR offchain config for each plugin. Requires smartcontractkit/chainlink-ccip#36

asoliman92 pushed a commit to smartcontractkit/chainlink that referenced this pull request Aug 28, 2024

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

cefcf1a

We want to define and use the appropriate OCR offchain config for each plugin. Requires smartcontractkit/chainlink-ccip#36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add ocr offchainConfig and chain config structs #36

add ocr offchainConfig and chain config structs #36

makramkd commented Jul 19, 2024 •

edited

Loading

winder Aug 1, 2024

makramkd Aug 5, 2024

winder Aug 6, 2024

makramkd Aug 6, 2024

winder Aug 6, 2024

makramkd Aug 6, 2024

makramkd Aug 6, 2024

winder left a comment

makramkd commented Aug 6, 2024

github-actions bot commented Aug 6, 2024

winder Aug 6, 2024

makramkd Aug 6, 2024

		// OffchainConfig is the offchain config set for the exec DON.
		OffchainConfig ExecuteOffchainConfig `json:"offchainConfig"`

add ocr offchainConfig and chain config structs #36

add ocr offchainConfig and chain config structs #36

Conversation

makramkd commented Jul 19, 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

winder left a comment

Choose a reason for hiding this comment

makramkd commented Aug 6, 2024

github-actions bot commented Aug 6, 2024

Test Coverage

Choose a reason for hiding this comment

Choose a reason for hiding this comment

makramkd commented Jul 19, 2024 •

edited

Loading