This repository has been archived by the owner on Jul 9, 2021. It is now read-only.
Revert to old ReentrancyGuard implementation + random cleanup #2101
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
abandeali1
force-pushed
the
feat/3.0/cleanup
branch
from
83a3eb1
to
793e338
Compare
moodlezoup
approved these changes
Aug 26, 2019
| /// @dev Calls a public function to check if it is reentrant. | ||
| /// Because this function uses the `nonReentrant` modifier, if | ||
| /// the function being called is also guarded by the `nonReentrant` modifier, | ||
| /// it will revert when it returns. |
There was a problem hiding this comment.
Let's move this comment up to isReentrant now that it has the nonReentrant modifier
dorothy-zbornak
approved these changes
Aug 26, 2019
| external | ||
| nonReentrant | ||
| /// @dev Overridden to revert on unsuccessful fillOrder call. | ||
| function fillOrderNoThrow( |
There was a problem hiding this comment.
This almost feels not worth testing since it's bascially rewriting fillOrderNoThrow. I guess it's fine for now until we can come up with some clever way of getting around it.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
We originally switched to a new
ReentrancyGuardimplementation in 3.0 that currently is ~5000 gas cheaper because EIP-1283 was nixed (which would have saved close to 10K gas in the current implementation). It looks like EIP-2200, which is based off of 1283, is actually going to end up in Istanbul, which gives us the same 10K optimization if we revert to the old implementation.Note that this new implementation makes testing the
noThrowfunctions for reentrancy much harder. I had to overwritefillOrderNoThrowwith something that is almost identical tofillOrderin terms of functionality in order to get all tests to pass.This PR also cleans up some variable names and revert reasons that I encountered while working on the 3.0 spec.
Testing instructions
Types of changes
Checklist:
[WIP]if necessary.