NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve Initializable readability using intermediate variables (#4576)

Browse Source 
Co-authored-by: Francisco <fg@frang.io>
This commit is contained in:
Hadrien Croubois
2023-09-05 23:46:14 +02:00
committed by GitHub
parent ff9d089dad
commit 5abbd04933
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/lazy-rice-joke.md Normal file
View File

@ -0,0 +1,5 @@
---
'openzeppelin-solidity': minor
---
`Initializable`: Use intermediate variables to improve readability.

12
contracts/proxy/utils/Initializable.sol
View File

@ -104,9 +104,19 @@ abstract contract Initializable {
// solhint-disable-next-line var-name-mixedcase // solhint-disable-next-line var-name-mixedcase
InitializableStorage storage $ = _getInitializableStorage(); InitializableStorage storage $ = _getInitializableStorage();
// Cache values to avoid duplicated sloads
bool isTopLevelCall = !$._initializing; bool isTopLevelCall = !$._initializing;
uint64 initialized = $._initialized; uint64 initialized = $._initialized;
if (!(isTopLevelCall && initialized < 1) && !(address(this).code.length == 0 && initialized == 1)) {
// Allowed calls:
// - initialSetup: the contract is not in the initializing state and no previous version was
// initialized
// - construction: the contract is initialized at version 1 (no reininitialization) and the
// current contract is just being deployed
bool initialSetup = initialized == 0 && isTopLevelCall;
bool construction = initialized == 1 && address(this).code.length == 0;
if (!initialSetup && !construction) {
revert AlreadyInitialized(); revert AlreadyInitialized();
} }
$._initialized = 1; $._initialized = 1;