CIP-8334 Minor cleanup in verifier code #428
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
File renamed without changes.
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| package commit | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/smartcontractkit/chainlink-ccv/protocol" | ||
| "github.com/smartcontractkit/chainlink-ccv/verifier" | ||
| ) | ||
|
|
||
| type ConfigWithBlockchainInfos struct { | ||
| Config | ||
| BlockchainInfos map[string]*protocol.BlockchainInfo `toml:"blockchain_infos"` | ||
| } | ||
|
|
||
| type Config struct { | ||
| VerifierID string `toml:"verifier_id"` | ||
| AggregatorAddress string `toml:"aggregator_address"` | ||
|
|
||
| SignerAddress string `toml:"signer_address"` | ||
|
|
||
| PyroscopeURL string `toml:"pyroscope_url"` | ||
| // CommitteeVerifierAddresses is a map the addresses of the committee verifiers for each chain selector. | ||
| CommitteeVerifierAddresses map[string]string `toml:"committee_verifier_addresses"` | ||
| // OnRampAddresses is a map the addresses of the on ramps for each chain selector. | ||
| OnRampAddresses map[string]string `toml:"on_ramp_addresses"` | ||
| // DefaultExecutorOnRampAddresses is a map the addresses of the default executor on ramps for each chain selector. | ||
| // The committee verifier will verify messages that specify the default executor even if they don't | ||
| // specify the committee verifier. | ||
| DefaultExecutorOnRampAddresses map[string]string `toml:"default_executor_on_ramp_addresses"` | ||
| // RMNRemoteAddresses is a map of RMN Remote contract addresses for each chain selector. | ||
| // Required for curse detection. | ||
| RMNRemoteAddresses map[string]string `toml:"rmn_remote_addresses"` | ||
| Monitoring verifier.MonitoringConfig `toml:"monitoring"` | ||
| } | ||
|
|
||
| func (c *Config) Validate() error { | ||
| // Collect chain selectors as sets (map[string]struct{}) | ||
| onRampSet := make(map[string]struct{}) | ||
| for k := range c.OnRampAddresses { | ||
| onRampSet[k] = struct{}{} | ||
| } | ||
| committeeVerifierSet := make(map[string]struct{}) | ||
| for k := range c.CommitteeVerifierAddresses { | ||
| committeeVerifierSet[k] = struct{}{} | ||
| } | ||
| rmnRemoteSet := make(map[string]struct{}) | ||
| for k := range c.RMNRemoteAddresses { | ||
| rmnRemoteSet[k] = struct{}{} | ||
| } | ||
|
|
||
| // Compare set lengths first | ||
| if len(onRampSet) != len(committeeVerifierSet) || | ||
| len(onRampSet) != len(rmnRemoteSet) { | ||
| return fmt.Errorf("invalid verifier configuration, mismatched chain selectors for onramp, committee verifier, and RMN Remote addresses") | ||
| } | ||
|
|
||
| // Compare set values (they should all be equal) | ||
| for k := range onRampSet { | ||
| if _, ok := committeeVerifierSet[k]; !ok { | ||
| return fmt.Errorf("invalid verifier configuration, chain selector in onramp (%s) not in committee verifier addresses", k) | ||
| } | ||
| if _, ok := rmnRemoteSet[k]; !ok { | ||
| return fmt.Errorf("invalid verifier configuration, chain selector in onramp (%s) not in RMN Remote addresses", k) | ||
| } | ||
| } | ||
| for k := range committeeVerifierSet { | ||
| if _, ok := onRampSet[k]; !ok { | ||
| return fmt.Errorf("invalid verifier configuration, chain selector in committee verifier (%s) not in onramp addresses", k) | ||
| } | ||
| if _, ok := rmnRemoteSet[k]; !ok { | ||
| return fmt.Errorf("invalid verifier configuration, chain selector in committee verifier (%s) not in RMN Remote addresses", k) | ||
| } | ||
| } | ||
| for k := range rmnRemoteSet { | ||
| if _, ok := onRampSet[k]; !ok { | ||
| return fmt.Errorf("invalid verifier configuration, chain selector in RMN Remote (%s) not in onramp addresses", k) | ||
| } | ||
| if _, ok := committeeVerifierSet[k]; !ok { | ||
| return fmt.Errorf("invalid verifier configuration, chain selector in RMN Remote (%s) not in committee verifier addresses", k) | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a reason for bumping or just staying up to date w/ latest develop on chainlink?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually this looks like a non-develop branch, if you can't merge the chainlink PR in time make sure to re-bump after a merge (and keep that branch un-deleted on remote)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I need a fix in a chainlink repo, so I need