Simplify new chain config #15478
Merged
Simplify new chain config #15478
+132
−251
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
connorwstein
commented
Dec 2, 2024
| HomeChainSel uint64 | ||
| FeedChainSel uint64 | ||
| ChainsToDeploy []uint64 | ||
| TokenConfig TokenConfig |
There was a problem hiding this comment.
the TokenConfig is also already part of the commit plugin config
connorwstein
commented
Dec 2, 2024
| ) | ||
|
|
||
| func Test_NewAcceptOwnershipChangeset(t *testing.T) { | ||
| e := NewMemoryEnvironmentWithJobs(t, logger.TestLogger(t), 2, 4) | ||
| e := NewMemoryEnvironmentWithJobsAndContracts(t, logger.TestLogger(t), 2, 4, &TestConfigs{}) |
There was a problem hiding this comment.
drive by test simplification
connorwstein
commented
Dec 2, 2024
| if enabled, ok := c.USDCConfig.EnabledChainMap()[chainSel]; ok && enabled { | ||
| ocrParams.ExecuteOffChainConfig.TokenDataObservers = c.USDCConfig.ToTokenDataObserverConfig() | ||
| } | ||
| ocrParams.CommitOffChainConfig.PriceFeedChainSelector = cciptypes.ChainSelector(c.FeedChainSel) |
There was a problem hiding this comment.
I think much better to just have the full configuration as input and not mutate the config inside here
connorwstein
requested review from
winder,
rstout,
asoliman92,
makramkd,
dimkouv,
mateusz-sekara and
0xAustinWang
AER Report: CI Core ran successfully ✅AER Report: Operator UI CI ran successfully ✅ |
connorwstein
commented
Dec 2, 2024
| // For setting OCR configuration | ||
| OCRSecrets deployment.OCRSecrets | ||
| OCRParams map[uint64]CCIPOCRParams | ||
| // Common to all chains |
There was a problem hiding this comment.
this is the main change. We separate into global and per chain, and use the Exec/Commit plugin config directly to reduce some duplication
mateusz-sekara
previously approved these changes
Dec 3, 2024
| @@ -119,6 +120,8 @@ func AddDonAndSetCandidateChangeset( | |||
| ccipOCRParams := DefaultOCRParams( | |||
| feedChainSel, | |||
| tokenConfig.GetTokenInfo(e.Logger, state.Chains[newChainSel].LinkToken, state.Chains[newChainSel].Weth9), | |||
| // TODO: Need USDC support. | |||
| nil, | |||
There was a problem hiding this comment.
Do we need a ticket for that?
connorwstein
dismissed stale reviews from mateusz-sekara and b-gopalswami
via
69bc98b
b-gopalswami
previously approved these changes
Dec 3, 2024
mateusz-sekara
previously approved these changes
Dec 3, 2024
connorwstein
dismissed stale reviews from mateusz-sekara and b-gopalswami
via
3e1ef01
AnieeG
approved these changes
Dec 3, 2024
b-gopalswami
approved these changes
Dec 3, 2024
jmank88
approved these changes
Dec 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The USDC config is part of the execution plugin OCR configuration so here we just use that as the source of truth. Also combine into a single map of per chain configuration to avoid all the parallel map validation.