KS-204: Add config count to DON struct #13193
Merged
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
cds95
requested review from
archseer,
bolekk,
patrick-dowell and
a team
as code owners
cds95
force-pushed
the
KS-204/track-config-count-DON-struct
branch
from
847cea4
to
fe863be
Compare
cds95
commented
May 14, 2024
| /// @notice Mapping from hashed capability IDs to configs | ||
| mapping(bytes32 capabilityId => bytes config) capabilityConfigs; | ||
| /// @notice Mapping of config counts to configurations | ||
| mapping(uint32 configCount => DONNodeCapabilityConfig donConfig) nodeCapabilityConfigs; |
There was a problem hiding this comment.
Thinking that it may also make sense to have separate configCounts for the different configs so that we don't have to repopulate everything when updating.
DeividasK
reviewed
May 15, 2024
DeividasK
reviewed
May 15, 2024
DeividasK
reviewed
May 15, 2024
DeividasK
reviewed
May 15, 2024
DeividasK
reviewed
May 15, 2024
Comment on lines
531
to
532
| if (s_dons[id].nodeCapabilityConfigs[configCount].nodes.contains(nodeP2PId)) | ||
| revert DuplicateDONNode(id, nodeP2PId); |
There was a problem hiding this comment.
We could probably do this validation in memory?
There was a problem hiding this comment.
I don't think we can load this into memory as we have a nested mapping
cds95
force-pushed
the
KS-204/track-config-count-DON-struct
branch
from
bd56ef1
to
1e2ca8d
Compare
DeividasK
reviewed
May 15, 2024
| /// @notice Mapping from hashed capability IDs to configs | ||
| mapping(bytes32 capabilityId => bytes config) capabilityConfigs; | ||
| /// @notice Mapping of config counts to configurations | ||
| mapping(uint32 configCount => DONCapabilityConfig donConfig) capabilityConfigs; |
There was a problem hiding this comment.
Suggested change
| mapping(uint32 configCount => DONCapabilityConfig donConfig) capabilityConfigs; | |
| mapping(uint32 configCount => DONCapabilityConfig donConfig) config; |
WDYT, given that it's not just capability config now but also includes nodes?
DeividasK
reviewed
May 15, 2024
| /// @notice DON (Decentralized Oracle Network) is a grouping of nodes that support | ||
| // the same capabilities. | ||
| struct DON { | ||
| /// @notice Computed. Auto-increment. | ||
| uint32 id; | ||
| /// @notice The number of times the DON's capability was configured |
There was a problem hiding this comment.
Suggested change
| /// @notice The number of times the DON's capability was configured | |
| /// @notice The number of times the DON was configured |
DeividasK
reviewed
May 15, 2024
| @@ -516,11 +523,15 @@ contract CapabilityRegistry is OwnerIsCreator, TypeAndVersionInterface { | |||
| s_dons[id].id = id; | |||
| s_dons[id].isPublic = isPublic; | |||
|
|
|||
| uint32 configCount = 1; | |||
|
|
|||
| DONCapabilityConfig storage donCapabilityConfig = s_dons[id].config[configCount]; | |||
There was a problem hiding this comment.
Suggested change
| DONCapabilityConfig storage donCapabilityConfig = s_dons[id].config[configCount]; | |
| DONCapabilityConfig storage donConfig = s_dons[id].config[configCount]; |
DeividasK
approved these changes
May 15, 2024
|
cds95
merged commit 97b84d0
into
use-encode-instead-of-encode-packed-capability-id
117 checks passed
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.
PR to add a
configCountin theDONstruct. This does not change anything functionally but is only used so that we can easily replace an existing config by incrementing theconfigCountand populating a newEnumerableSet.