Add Zero Value Enforcers #31
Open
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
hanzel98
reviewed
Oct 31, 2024
| /** | ||
| * @title NoValueEnforcer | ||
| * @dev This contract enforces that the execution has no value. | ||
| * @dev This caveat enforcer only works when the execution is in single mode. |
There was a problem hiding this comment.
Suggested change
| * @dev This caveat enforcer only works when the execution is in single mode. | |
| * @dev This caveat enforcer only works in single and batch modes |
hanzel98
reviewed
Oct 31, 2024
| /** | ||
| * @title NoCalldataEnforcer | ||
| * @dev This contract enforces that the execution has no calldata. | ||
| * @dev This caveat enforcer only works when the execution is in single mode. |
There was a problem hiding this comment.
Suggested change
| * @dev This caveat enforcer only works when the execution is in single mode. | |
| * @dev This caveat enforcer only works in single and batch modes. |
hanzel98
reviewed
Nov 1, 2024
| require(callData_.length == 0, "NoCalldataEnforcer:calldata-not-allowed"); | ||
| } else if (ModeLib.getCallType(_mode) == CALLTYPE_BATCH) { | ||
| (Execution[] calldata executions_) = _executionCallData.decodeBatch(); | ||
| for (uint256 i = 0; i < executions_.length; i++) { |
There was a problem hiding this comment.
Suggested change
| for (uint256 i = 0; i < executions_.length; i++) { | |
| for (uint256 i = 0; i < executions_.length; ++i) { |
hanzel98
reviewed
Nov 1, 2024
| { | ||
| if (ModeLib.getCallType(_mode) == CALLTYPE_SINGLE) { | ||
| (,, bytes calldata callData_) = _executionCallData.decodeSingle(); | ||
| require(callData_.length == 0, "NoCalldataEnforcer:calldata-not-allowed"); |
There was a problem hiding this comment.
I'm a bit concerned about the errors being exactly the same, it might help to differentiate them
|
please add the new enforcers to the deployment script |
hanzel98
reviewed
Nov 4, 2024
| import { CALLTYPE_SINGLE, CALLTYPE_BATCH } from "../utils/Constants.sol"; | ||
|
|
||
| /** | ||
| * @title NoCalldataEnforcer |
There was a problem hiding this comment.
I see some places inside our contracts where calldata is lowercase but in others it is callData
hanzel98
reviewed
Nov 4, 2024
|
|
||
| ////////////////////////////// State ////////////////////////////// | ||
| NoCalldataEnforcer public noCalldataEnforcer; | ||
| DummyContract public c; |
There was a problem hiding this comment.
Maybe DummyContract public dummy; instead
hanzel98
reviewed
Nov 4, 2024
| require(value_ == 0, "NoValueEnforcer:value-not-allowed"); | ||
| } else if (ModeLib.getCallType(_mode) == CALLTYPE_BATCH) { | ||
| (Execution[] calldata executions_) = _executionCallData.decodeBatch(); | ||
| for (uint256 i = 0; i < executions_.length; i++) { |
There was a problem hiding this comment.
Suggested change
| for (uint256 i = 0; i < executions_.length; i++) { | |
| for (uint256 i = 0; i < executions_.length; ++i) { |
hanzel98
reviewed
Nov 4, 2024
Comment on lines
+46
to
+47
| // should allow an execution in single mode with no calldata | ||
| function test_singleMethodNoCalldataIsAllowed() public { |
There was a problem hiding this comment.
Rename tests, these are value tests not calldata
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.
What?
NoValueEnforcerrestricts thevaluefield of theExecutionto0for both single and batch execution modes. Notermsare required.NoCalldataEnforcerrestricts thecalldatafield of theExecutionto `` (ie empty bytes array, no data) for both single and batch execution modes. Notermsare required.