feat: add ReentrancyGuard #503
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
izqui
approved these changes
Apr 3, 2019
| @@ -49,6 +49,7 @@ contract KeccakConstants { | |||
| // Unstructured storage | |||
| bytes32 public constant initializationBlockPosition = keccak256(abi.encodePacked("aragonOS.initializable.initializationBlock")); | |||
| bytes32 public constant depositablePosition = keccak256(abi.encodePacked("aragonOS.depositableStorage.depositable")); | |||
| bytes32 public constant reentrancyGuardPosition = keccak256(abi.encodePacked("aragonOS.reentrancyGuard.mutex")); | |||
There was a problem hiding this comment.
This is not being used for testing. Maybe we could use it in ReentrancyGuardMock so we implicitly test that it is correct.
There was a problem hiding this comment.
Oops, forgot to add this to the keccak constants test. Add now in cf07f35.
bingen
approved these changes
Apr 3, 2019
facuspagnuolo
approved these changes
Apr 5, 2019
|
|
||
| it('allows entering non-entrant call from re-entrant call', async () => { | ||
| await reentrancyMock.reentrantCall(reentrantActor.address) | ||
| assert.equal((await reentrancyMock.callCounter()).toString(), 2, 'should have called twice') |
There was a problem hiding this comment.
Just to ensure consistency I'd check that the mutex variable stays in false on successful calls when using the guard.
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.
Adds a reusable
ReentrancyGuardworking off of its own unstructured storage slot, and makes it available toAragonApps.See aragon/aragon-apps#744 (comment) for context.
Bytecode comparison:
But the actual bytecode increase of adding the
nonReentrantmodifier is ~60k gas per use.