FUN-1527 Add updateFromPrevious method to Functions ToS #13795
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
contracts/src/v0.8/functions/dev/v1_X/accessControl/TermsOfServiceAllowList.sol
Outdated
Show resolved
Hide resolved
contracts/src/v0.8/functions/dev/v1_X/accessControl/TermsOfServiceAllowList.sol
Outdated
Show resolved
Hide resolved
contracts/src/v0.8/functions/dev/v1_X/accessControl/TermsOfServiceAllowList.sol
Outdated
Show resolved
Hide resolved
contracts/src/v0.8/functions/dev/v1_X/accessControl/TermsOfServiceAllowList.sol
Outdated
Show resolved
Hide resolved
contracts/src/v0.8/functions/dev/v1_X/accessControl/TermsOfServiceAllowList.sol
Outdated
Show resolved
Hide resolved
contracts/src/v0.8/functions/dev/v1_X/accessControl/interfaces/ITermsOfServiceAllowList.sol
Outdated
Show resolved
Hide resolved
contracts/src/v0.8/functions/dev/v1_X/accessControl/interfaces/ITermsOfServiceAllowList.sol
Outdated
Show resolved
Hide resolved
contracts/src/v0.8/functions/dev/v1_X/accessControl/TermsOfServiceAllowList.sol
Outdated
Show resolved
Hide resolved
KuphJr
changed the title
KuphJr
changed the title
agparadiso
previously approved these changes
Jul 15, 2024
| @@ -197,4 +201,17 @@ contract TermsOfServiceAllowList is ITermsOfServiceAllowList, IAccessController, | |||
|
|
|||
| return blockedSenders; | |||
| } | |||
|
|
|||
| function migratePreviouslyAllowedSenders(address[] memory previousSendersToAdd) external override onlyOwner { | |||
There was a problem hiding this comment.
💭 do we want to restrict this to be run only once?
There was a problem hiding this comment.
I was thinking about something like that as well, but if the diff list gets too large it may need to be run more than once.
justinkaseman
requested changes
Jul 27, 2024
| @@ -197,4 +201,17 @@ contract TermsOfServiceAllowList is ITermsOfServiceAllowList, IAccessController, | |||
|
|
|||
| return blockedSenders; | |||
| } | |||
|
|
|||
| function migratePreviouslyAllowedSenders(address[] memory previousSendersToAdd) external override onlyOwner { | |||
| require(s_previousToSContract != address(0), "No previous ToS contract"); | |||
There was a problem hiding this comment.
This should use a custom error, rather than a require statement.
| @@ -197,4 +201,17 @@ contract TermsOfServiceAllowList is ITermsOfServiceAllowList, IAccessController, | |||
|
|
|||
| return blockedSenders; | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
Missing natspec inherit
Suggested change
| /// @inheritdoc ITermsOfServiceAllowList |
| require(s_previousToSContract != address(0), "No previous ToS contract"); | ||
| IAccessController previousToSContract = IAccessController(s_previousToSContract); | ||
| for (uint256 i = 0; i < previousSendersToAdd.length; ++i) { | ||
| if ( |
There was a problem hiding this comment.
Gas golf: If you split this into a nested if statement it saves 36 gas. This is because having them together spends the gas to evaluate each of them before doing the boolean logic.
justinkaseman
approved these changes
Jul 28, 2024
|
agparadiso
approved these changes
Jul 28, 2024
This was referenced Jul 31, 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.
See detailed description in Jira ticket: https://smartcontract-it.atlassian.net/browse/FUN-1527