Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify ReentrancyGuard to reduce contract size #3515

Merged
merged 6 commits into from
Jul 11, 2022
Merged

Modify ReentrancyGuard to reduce contract size #3515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5e8b9d
Due to this change, inheritance would reduce the contract size by 0.3…
abhi3700 Jun 29, 2022
6e294cf
applied changes as per PR# 3515 in Oz contracts repo
abhi3700 Jul 6, 2022
568e03f
Move private function to bottom
Amxx Jul 6, 2022
404559c
lint
frangio Jul 8, 2022
b29c91f
Update CHANGELOG.md
frangio Jul 11, 2022
5da42cb
Merge branch 'master' into master
frangio Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* `ERC20`: optimize `_transfer`, `_mint` and `_burn` by using `unchecked` arithmetic when possible. ([#3513](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3513))
* `ERC721`: optimize transfers by making approval clearing implicit instead of emitting an event. ([#3481](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3481))
* `ERC721`: optimize burn by making approval clearing implicit instead of emitting an event. ([#3538](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3538))
* `ReentrancyGuard`: Reduce code size impact of the modifier by using internal functions. ([#3515](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3515))

### Compatibility Note

Expand Down
10 changes: 8 additions & 2 deletions contracts/security/ReentrancyGuard.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,20 @@ abstract contract ReentrancyGuard {
* `private` function that does the actual work.
*/
modifier nonReentrant() {
_nonReentrantBefore();
_;
_nonReentrantAfter();
}

function _nonReentrantBefore() private {
// On the first call to nonReentrant, _notEntered will be true
require(_status != _ENTERED, "ReentrancyGuard: reentrant call");

// Any calls to nonReentrant after this point will fail
_status = _ENTERED;
}

_;

function _nonReentrantAfter() private {
// By storing the original value once again, a refund is triggered (see
// https://eips.ethereum.org/EIPS/eip-2200)
_status = _NOT_ENTERED;
Expand Down