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

Remove repeated code from ERC1967Upgrade (#2720)

Browse Source
This commit is contained in:
Hadrien Croubois
2021-06-14 23:50:51 +02:00
committed by GitHub
parent fd111df16d
commit 6f50f6e1ef
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,8 +65,7 @@ abstract contract ERC1967Upgrade {
bytes memory data, bytes memory data,
bool forceCall bool forceCall
) internal { ) internal {
_setImplementation(newImplementation); _upgradeTo(newImplementation);
emit Upgraded(newImplementation);
if (data.length > 0 || forceCall) { if (data.length > 0 || forceCall) {
Address.functionDelegateCall(newImplementation, data); Address.functionDelegateCall(newImplementation, data);
} }
@ -103,8 +102,7 @@ abstract contract ERC1967Upgrade {
// Check rollback was effective // Check rollback was effective
require(oldImplementation == _getImplementation(), "ERC1967Upgrade: upgrade breaks further upgrades"); require(oldImplementation == _getImplementation(), "ERC1967Upgrade: upgrade breaks further upgrades");
// Finally reset to the new implementation and log the upgrade // Finally reset to the new implementation and log the upgrade
_setImplementation(newImplementation); _upgradeTo(newImplementation);
emit Upgraded(newImplementation);
} }
} }