CS5.3 - Prevent nested operations originating from outside contracts #231
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
kevincheng96
commented
Oct 16, 2024
| @@ -455,6 +456,15 @@ contract QuarkWallet is IERC1271 { | |||
| oldActiveSubmissionToken := tload(activeSubmissionTokenSlot) | |||
| oldCallback := tload(callbackSlot) | |||
|
|
|||
| // Prevent nested operations coming from an outside caller (i.e. not the Quark wallet itself) | |||
| if and(iszero(eq(oldActiveScript, 0)), iszero(eq(caller(), address()))) { | |||
There was a problem hiding this comment.
We check against the activeScript here, but we really could also check against submissionToken since that is guaranteed to be non-zero during a nested operation. activeScript should also be non-zero during a nested operation since the zero address has empty code and will revert from the check above (L437).
There was a problem hiding this comment.
Embrace the YUL.
and(iszero(eq(oldActiveScript, 0)), iszero(eq(caller(), address())))
if ( ( oldActiveScript == 0 ) == FALSE ) AND ( ( msg.sender == address[this] ) == FALSE )
if oldActiveScript != 0 and msg.sender != address[this]
DeMorgan's Law:
unless (oldActiveScript == 0 or msg.sender == address[this]) {
revert()
}
My work through of the logic there.
There was a problem hiding this comment.
Correct, that logic checks out
kevincheng96
changed the title
hayesgm
approved these changes
Oct 16, 2024
| @@ -455,6 +456,15 @@ contract QuarkWallet is IERC1271 { | |||
| oldActiveSubmissionToken := tload(activeSubmissionTokenSlot) | |||
| oldCallback := tload(callbackSlot) | |||
|
|
|||
| // Prevent nested operations coming from an outside caller (i.e. not the Quark wallet itself) | |||
| if and(iszero(eq(oldActiveScript, 0)), iszero(eq(caller(), address()))) { | |||
There was a problem hiding this comment.
Embrace the YUL.
and(iszero(eq(oldActiveScript, 0)), iszero(eq(caller(), address())))
if ( ( oldActiveScript == 0 ) == FALSE ) AND ( ( msg.sender == address[this] ) == FALSE )
if oldActiveScript != 0 and msg.sender != address[this]
DeMorgan's Law:
unless (oldActiveScript == 0 or msg.sender == address[this]) {
revert()
}
My work through of the logic there.
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.
This disallows contracts that are not the wallet itself from executing a nested Quark operation within the context of a parent Quark operation. This offers some protection for scripts that are making external calls. We still allow for nesting of Quark operations, with the caveat that the nested call must come from the Quark wallet itself.