Keystone: add router and other refactors #13426
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "chainlink": patch | ||
| --- | ||
|
|
||
| #internal |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@chainlink/contracts': patch | ||
| --- | ||
|
|
||
| #internal | ||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,17 +2,15 @@ | |
| pragma solidity ^0.8.19; | ||
|
|
||
| import {IReceiver} from "./interfaces/IReceiver.sol"; | ||
| import {OwnerIsCreator} from "../shared/access/OwnerIsCreator.sol"; | ||
|
There was a problem hiding this comment. We should drop this contract or merge it with the mock one we have for tests. I'll skip the review of the rest of the parts (the checks aren't reflective of what would happen in practice as they don't optimize storage reads). There was a problem hiding this comment. It's not just an example contract and will be used by CCIP, maybe we can drop the mock instead There was a problem hiding this comment. @archseer it actually won't be used as-is by CCIP in prod, I was wrong about that. |
||
|
|
||
| contract KeystoneFeedsConsumer is IReceiver, OwnerIsCreator { | ||
| event FeedReceived(bytes32 indexed feedId, int192 price, uint32 timestamp); | ||
|
|
||
| error UnauthorizedSender(address sender); | ||
| error UnauthorizedWorkflowOwner(address workflowOwner); | ||
| error UnauthorizedWorkflowName(bytes10 workflowName); | ||
|
|
||
| struct ReceivedFeedReport { | ||
| bytes32 FeedId; | ||
| int192 Price; | ||
|
|
@@ -26,55 +24,55 @@ contract KeystoneFeedsConsumer is IReceiver, ConfirmedOwner { | |
|
|
||
| mapping(bytes32 feedId => StoredFeedReport feedReport) internal s_feedReports; | ||
| address[] internal s_allowedSendersList; | ||
|
There was a problem hiding this comment. Perfect place for enumerableSet |
||
| mapping(address sender => bool) internal s_allowedSenders; | ||
| address[] internal s_allowedWorkflowOwnersList; | ||
| mapping(address owner => bool) internal s_allowedWorkflowOwners; | ||
| bytes10[] internal s_allowedWorkflowNamesList; | ||
| mapping(bytes10 workflowName => bool) internal s_allowedWorkflowNames; | ||
|
|
||
| function setConfig( | ||
| address[] calldata _allowedSendersList, | ||
| address[] calldata _allowedWorkflowOwnersList, | ||
| bytes10[] calldata _allowedWorkflowNamesList | ||
| ) external onlyOwner { | ||
| for (uint32 i = 0; i < s_allowedSendersList.length; ++i) { | ||
| s_allowedSenders[s_allowedSendersList[i]] = false; | ||
| } | ||
| for (uint32 i = 0; i < _allowedSendersList.length; ++i) { | ||
| s_allowedSenders[_allowedSendersList[i]] = true; | ||
| } | ||
| s_allowedSendersList = _allowedSendersList; | ||
| for (uint32 i = 0; i < s_allowedWorkflowOwnersList.length; ++i) { | ||
| s_allowedWorkflowOwners[s_allowedWorkflowOwnersList[i]] = false; | ||
| } | ||
| for (uint32 i = 0; i < _allowedWorkflowOwnersList.length; ++i) { | ||
| s_allowedWorkflowOwners[_allowedWorkflowOwnersList[i]] = true; | ||
| } | ||
| s_allowedWorkflowOwnersList = _allowedWorkflowOwnersList; | ||
| for (uint32 i = 0; i < s_allowedWorkflowNamesList.length; ++i) { | ||
| s_allowedWorkflowNames[s_allowedWorkflowNamesList[i]] = false; | ||
| } | ||
| for (uint32 i = 0; i < _allowedWorkflowNamesList.length; ++i) { | ||
| s_allowedWorkflowNames[_allowedWorkflowNamesList[i]] = true; | ||
| } | ||
| s_allowedWorkflowNamesList = _allowedWorkflowNamesList; | ||
| } | ||
|
|
||
| function onReport(bytes calldata metadata, bytes calldata rawReport) external { | ||
| if (!s_allowedSenders[msg.sender]) { | ||
| revert UnauthorizedSender(msg.sender); | ||
| } | ||
|
|
||
| (bytes10 workflowName, address workflowOwner) = _getInfo(metadata); | ||
| if (!s_allowedWorkflowNames[workflowName]) { | ||
| revert UnauthorizedWorkflowName(workflowName); | ||
| } | ||
| if (!s_allowedWorkflowOwners[workflowOwner]) { | ||
| revert UnauthorizedWorkflowOwner(workflowOwner); | ||
| } | ||
|
|
||
| ReceivedFeedReport[] memory feeds = abi.decode(rawReport, (ReceivedFeedReport[])); | ||
| for (uint256 i = 0; i < feeds.length; ++i) { | ||
| s_feedReports[feeds[i].FeedId] = StoredFeedReport(feeds[i].Price, feeds[i].Timestamp); | ||
| emit FeedReceived(feeds[i].FeedId, feeds[i].Price, feeds[i].Timestamp); | ||
| } | ||
|
|
||
Oops, something went wrong.
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.
@archseer You only need one of these changesets I think :)