Refactor chain-selector to use chain specific chainID #65
Conversation
huangzhen1997
changed the title
| if exist { | ||
| chainIDToSelectorMapForFamily[v.Family][v.ChainID] = k | ||
| } else { | ||
| chainIDToSelectorMapForFamily[v.Family] = make(map[string]uint64) |
There was a problem hiding this comment.
You need to also call the below for this case right:
chainIDToSelectorMapForFamily[v.Family][v.ChainID] = k
There was a problem hiding this comment.
Oh yes, thanks
selectors.go
Outdated
| func NameFromChainId(chainId uint64) (string, error) { | ||
| details, exist := evmChainIdToChainSelector[chainId] | ||
| func NameFromChainIdAndFamily(chainId string, family string) (string, error) { | ||
| // if family is missing use EVM as default |
There was a problem hiding this comment.
Instead of duplicating all this code from above function, just call that?
SelectorFromChainIdAndFamily()
Then from selector, just fetch details.
|
|
||
| for _, v := range selectorToChainDetails { | ||
| if v.Name == name && family == v.Family { | ||
| return v.ChainID, nil |
There was a problem hiding this comment.
Has our schema enforced anywhere that name, family paid must be unique?
I know practically we use unique names, but nothing currently prevents from someone naming say 2 different EVM chains as same?
Just wondering, if we leave that logic as it-is, or add some validation?
There was a problem hiding this comment.
I guess we could add a unit-test to ensure that name+family combination should not have duplicates, if others agree with this.
There was a problem hiding this comment.
Added TestNoSameChainIDAndFamilyAreGenerated
selectors.go
Outdated
| if exist { | ||
| testChainIDToSelectorMapForFamily[v.Family][v.ChainID] = k | ||
| } else { | ||
| testChainIDToSelectorMapForFamily[v.Family] = make(map[string]uint64) |
There was a problem hiding this comment.
thanks, I am actually going to combine regular and test chains, noticed var evmChainIdToChainSelector = loadAllSelectors() has the two combined
Be careful, this project is public, and many internal and external dependents require exact format, and even hardcode the selectors.yml URL from this repo. Any such change should be a major version bump, and we'd be better doing as much as we can to keep backwards compatibility on this. |
I kept function like |
|
Replaced with #70 |
https://smartcontract-it.atlassian.net/browse/NONEVM-827
To generalize plugin component to support Solana, we need to help CCIP team to refactor chain-selector. The existing chainID is uint64, this PR converts it to string since for solana we will use genesis hash as chainID.
Instead of use previous selector.yml (
chainID->{selector+name}) and selector_families(selector->family), provides a reconstructed config usingselector->{chainID + name + family}, and making chainID a string instead of uint64.update rest of the code/test to use the
selector_restructured.ymlconfig that key by selector. The originalselectors.ymlandselector_families.ymlare left for reference and can be removed in a following PR.preserve the existing functions that use uint64 chainID for backward compatibility, but mark as deprecated