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

Improve code comments in ERC1967._upgradeToAndCallSecure

Browse Source 
(cherry picked from commit 2e6ef74593)
This commit is contained in:
Francisco Giordano
2021-04-19 19:35:18 -03:00
parent df7996b671
commit a664fb1e45
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contracts/proxy/ERC1967/ERC1967Upgrade.sol
View File

@ -61,16 +61,17 @@ abstract contract ERC1967Upgrade is ERC1967Storage {
*/ */
function _upgradeToAndCallSecure(address newImplementation, bytes memory data, bool forceCall) internal { function _upgradeToAndCallSecure(address newImplementation, bytes memory data, bool forceCall) internal {
address oldImplementation = _getImplementation(); address oldImplementation = _getImplementation();
// do inital upgrade
// Initial upgrade and setup call
_setImplementation(newImplementation); _setImplementation(newImplementation);
// do setup call
if (data.length > 0 || forceCall) { if (data.length > 0 || forceCall) {
Address.functionDelegateCall(newImplementation, data); Address.functionDelegateCall(newImplementation, data);
} }
// check if nested in an upgrade check
// Perform rollback test if not already in progress
StorageSlot.BooleanSlot storage rollbackTesting = StorageSlot.getBooleanSlot(_ROLLBACK_SLOT); StorageSlot.BooleanSlot storage rollbackTesting = StorageSlot.getBooleanSlot(_ROLLBACK_SLOT);
if (!rollbackTesting.value) { if (!rollbackTesting.value) {
// trigger upgrade check with flag set to true // Trigger rollback using upgradeTo from the new implementation
rollbackTesting.value = true; rollbackTesting.value = true;
Address.functionDelegateCall( Address.functionDelegateCall(
newImplementation, newImplementation,
@ -80,11 +81,10 @@ abstract contract ERC1967Upgrade is ERC1967Storage {
) )
); );
rollbackTesting.value = false; rollbackTesting.value = false;
// check upgrade was effective // Check rollback was effective
require(oldImplementation == _getImplementation(), "ERC1967Upgrade: upgrade breaks further upgrades"); require(oldImplementation == _getImplementation(), "ERC1967Upgrade: upgrade breaks further upgrades");
// reset upgrade // Finally reset to the new implementation and log the upgrade
_setImplementation(newImplementation); _setImplementation(newImplementation);
// emit event
emit Upgraded(newImplementation); emit Upgraded(newImplementation);
} }
} }