Move curse logic to a shared location and add new helper. #323
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
winder
commented
Nov 22, 2024
pkg/reader/curses.go
Outdated
Comment on lines
45
to
49
| func FilterCursed( | ||
| ctx context.Context, | ||
| ccipReader CCIPReader, | ||
| destChain ccipocr3.ChainSelector, | ||
| inputChains []ccipocr3.ChainSelector, | ||
| ) ([]ccipocr3.ChainSelector, *CurseInfo, error) { |
There was a problem hiding this comment.
Common code across all the places using GetRmnCurseInfo, I'll use this in the execute plugin as well.
winder
commented
Nov 22, 2024
| @@ -29,22 +32,22 @@ type ChainSupport interface { | |||
| KnownSourceChainsSlice() ([]cciptypes.ChainSelector, error) | |||
| } | |||
|
|
|||
| type CCIPChainSupport struct { | |||
| type ccipChainSupport struct { | |||
winder
commented
Nov 22, 2024
| lggr logger.Logger, | ||
| homeChain reader.HomeChain, | ||
| oracleIDToP2PID map[commontypes.OracleID]libocrtypes.PeerID, | ||
| nodeID commontypes.OracleID, | ||
| destChain cciptypes.ChainSelector, | ||
| ) CCIPChainSupport { | ||
| return CCIPChainSupport{ | ||
| ) ChainSupport { |
winder
commented
Nov 22, 2024
Comment on lines
-61
to
-88
| type CurseInfo struct { | ||
| // CursedSourceChains contains the cursed source chains. | ||
| CursedSourceChains map[cciptypes.ChainSelector]bool | ||
| // CursedDestination indicates that the destination chain is cursed. | ||
| CursedDestination bool | ||
| // GlobalCurse indicates that all chains are cursed. | ||
| GlobalCurse bool | ||
| } | ||
|
|
||
| // LegacyCurseSubject Defined as a const in RMNRemote.sol | ||
| // Docs of RMNRemote: | ||
| // An active curse on this subject will cause isCursed() to return true. Use this subject if there is an issue | ||
| // with a remote chain, for which there exists a legacy lane contract deployed on the same chain as this RMN contract | ||
| // is deployed, relying on isCursed(). | ||
| var LegacyCurseSubject = [16]byte{ | ||
| 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | ||
| 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | ||
| } | ||
|
|
||
| // GlobalCurseSubject Defined as a const in RMNRemote.sol | ||
| // Docs of RMNRemote: | ||
| // An active curse on this subject will cause isCursed() and isCursed(bytes16) to return true. Use this subject | ||
| // for issues affecting all of CCIP chains, or pertaining to the chain that this contract is deployed on, instead of | ||
| // using the local chain selector as a subject. | ||
| var GlobalCurseSubject = [16]byte{ | ||
| 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | ||
| 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, | ||
| } |
winder
force-pushed
the
will/sharable-rmn-curse-code
branch
from
010d73b
to
19586ef
Compare
dimkouv
reviewed
Nov 25, 2024
winder
force-pushed
the
will/sharable-rmn-curse-code
branch
2 times, most recently
from
e47e3b5
to
acd94ca
Compare
winder
force-pushed
the
will/sharable-rmn-curse-code
branch
3 times, most recently
from
83409e5
to
90d4476
Compare
winder
requested review from
rstout,
asoliman92,
makramkd,
dimkouv,
mateusz-sekara,
0xAustinWang and
0xnogo
winder
force-pushed
the
will/sharable-rmn-curse-code
branch
from
90d4476
to
22ed136
Compare
|
dimkouv
approved these changes
Nov 26, 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.
Minor refactoring based on my PR feedback to your PR and to make the code easier to share across exec and commit plugins.