Transpile 5fcb6c7

Author: github-actions[bot]

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 4.4.1 (2021-12-14)
+
+ * `Initializable`: change the existing `initializer` modifier and add a new `onlyInitializing` modifier to prevent reentrancy risk. ([#3006](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3006))
+
+### Breaking change
+
+It is no longer possible to call an `initializer`-protected function from within another `initializer` function outside the context of a constructor. Projects using OpenZeppelin upgradeable proxies should continue to work as is, since in the common case the initializer is invoked in the constructor directly. If this is not the case for you, the suggested change is to use the new `onlyInitializing` modifier in the following way:
+
+```diff
+ contract A {
+-    function initialize() public   initializer { ... }
++    function initialize() internal onlyInitializing { ... }
+ }
+ contract B is A {
+     function initialize() public initializer {
+         A.initialize();
+     }
+ }
+```
+
 ## 4.4.0 (2021-11-25)
 
  * `Ownable`: add an internal `_transferOwnership(address)`. ([#2568](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2568))

contracts/access/AccessControlEnumerableUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (access/AccessControlEnumerable.sol)
+// OpenZeppelin Contracts v4.4.1 (access/AccessControlEnumerable.sol)
 
 pragma solidity ^0.8.0;
 
@@ -12,14 +12,14 @@ import "../proxy/utils/Initializable.sol";
  * @dev Extension of {AccessControl} that allows enumerating the members of each role.
  */
 abstract contract AccessControlEnumerableUpgradeable is Initializable, IAccessControlEnumerableUpgradeable, AccessControlUpgradeable {
-    function __AccessControlEnumerable_init() internal initializer {
+    function __AccessControlEnumerable_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __AccessControl_init_unchained();
         __AccessControlEnumerable_init_unchained();
     }
 
-    function __AccessControlEnumerable_init_unchained() internal initializer {
+    function __AccessControlEnumerable_init_unchained() internal onlyInitializing {
     }
     using EnumerableSetUpgradeable for EnumerableSetUpgradeable.AddressSet;
 

contracts/access/AccessControlUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (access/AccessControl.sol)
+// OpenZeppelin Contracts v4.4.1 (access/AccessControl.sol)
 
 pragma solidity ^0.8.0;
 
@@ -48,13 +48,13 @@ import "../proxy/utils/Initializable.sol";
  * accounts that have been granted it.
  */
 abstract contract AccessControlUpgradeable is Initializable, ContextUpgradeable, IAccessControlUpgradeable, ERC165Upgradeable {
-    function __AccessControl_init() internal initializer {
+    function __AccessControl_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __AccessControl_init_unchained();
     }
 
-    function __AccessControl_init_unchained() internal initializer {
+    function __AccessControl_init_unchained() internal onlyInitializing {
     }
     struct RoleData {
         mapping(address => bool) members;

contracts/access/IAccessControlEnumerableUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (access/IAccessControlEnumerable.sol)
+// OpenZeppelin Contracts v4.4.1 (access/IAccessControlEnumerable.sol)
 
 pragma solidity ^0.8.0;
 

contracts/access/IAccessControlUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (access/IAccessControl.sol)
+// OpenZeppelin Contracts v4.4.1 (access/IAccessControl.sol)
 
 pragma solidity ^0.8.0;
 

contracts/access/OwnableUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (access/Ownable.sol)
+// OpenZeppelin Contracts v4.4.1 (access/Ownable.sol)
 
 pragma solidity ^0.8.0;
 
@@ -26,12 +26,12 @@ abstract contract OwnableUpgradeable is Initializable, ContextUpgradeable {
     /**
      * @dev Initializes the contract setting the deployer as the initial owner.
      */
-    function __Ownable_init() internal initializer {
+    function __Ownable_init() internal onlyInitializing {
         __Context_init_unchained();
         __Ownable_init_unchained();
     }
 
-    function __Ownable_init_unchained() internal initializer {
+    function __Ownable_init_unchained() internal onlyInitializing {
         _transferOwnership(_msgSender());
     }
 

contracts/finance/PaymentSplitterUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (finance/PaymentSplitter.sol)
+// OpenZeppelin Contracts v4.4.1 (finance/PaymentSplitter.sol)
 
 pragma solidity ^0.8.0;
 
@@ -48,12 +48,12 @@ contract PaymentSplitterUpgradeable is Initializable, ContextUpgradeable {
      * All addresses in `payees` must be non-zero. Both arrays must have the same non-zero length, and there must be no
      * duplicates in `payees`.
      */
-    function __PaymentSplitter_init(address[] memory payees, uint256[] memory shares_) internal initializer {
+    function __PaymentSplitter_init(address[] memory payees, uint256[] memory shares_) internal onlyInitializing {
         __Context_init_unchained();
         __PaymentSplitter_init_unchained(payees, shares_);
     }
 
-    function __PaymentSplitter_init_unchained(address[] memory payees, uint256[] memory shares_) internal initializer {
+    function __PaymentSplitter_init_unchained(address[] memory payees, uint256[] memory shares_) internal onlyInitializing {
         require(payees.length == shares_.length, "PaymentSplitter: payees and shares length mismatch");
         require(payees.length > 0, "PaymentSplitter: no payees");
 

contracts/finance/VestingWalletUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (finance/VestingWallet.sol)
+// OpenZeppelin Contracts v4.4.1 (finance/VestingWallet.sol)
 pragma solidity ^0.8.0;
 
 import "../token/ERC20/utils/SafeERC20Upgradeable.sol";
@@ -35,7 +35,7 @@ contract VestingWalletUpgradeable is Initializable, ContextUpgradeable {
         address beneficiaryAddress,
         uint64 startTimestamp,
         uint64 durationSeconds
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __VestingWallet_init_unchained(beneficiaryAddress, startTimestamp, durationSeconds);
     }
@@ -44,7 +44,7 @@ contract VestingWalletUpgradeable is Initializable, ContextUpgradeable {
         address beneficiaryAddress,
         uint64 startTimestamp,
         uint64 durationSeconds
-    ) internal initializer {
+    ) internal onlyInitializing {
         require(beneficiaryAddress != address(0), "VestingWallet: beneficiary is zero address");
         _beneficiary = beneficiaryAddress;
         _start = startTimestamp;

contracts/governance/GovernorUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (governance/Governor.sol)
+// OpenZeppelin Contracts v4.4.1 (governance/Governor.sol)
 
 pragma solidity ^0.8.0;
 
@@ -53,15 +53,15 @@ abstract contract GovernorUpgradeable is Initializable, ContextUpgradeable, ERC1
     /**
      * @dev Sets the value for {name} and {version}
      */
-    function __Governor_init(string memory name_) internal initializer {
+    function __Governor_init(string memory name_) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __EIP712_init_unchained(name_, version());
         __IGovernor_init_unchained();
         __Governor_init_unchained(name_);
     }
 
-    function __Governor_init_unchained(string memory name_) internal initializer {
+    function __Governor_init_unchained(string memory name_) internal onlyInitializing {
         _name = name_;
     }
 

contracts/governance/IGovernorUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (governance/IGovernor.sol)
+// OpenZeppelin Contracts v4.4.1 (governance/IGovernor.sol)
 
 pragma solidity ^0.8.0;
 
@@ -12,11 +12,11 @@ import "../proxy/utils/Initializable.sol";
  * _Available since v4.3._
  */
 abstract contract IGovernorUpgradeable is Initializable, IERC165Upgradeable {
-    function __IGovernor_init() internal initializer {
+    function __IGovernor_init() internal onlyInitializing {
         __IGovernor_init_unchained();
     }
 
-    function __IGovernor_init_unchained() internal initializer {
+    function __IGovernor_init_unchained() internal onlyInitializing {
     }
     enum ProposalState {
         Pending,

contracts/governance/TimelockControllerUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (governance/TimelockController.sol)
+// OpenZeppelin Contracts v4.4.1 (governance/TimelockController.sol)
 
 pragma solidity ^0.8.0;
 
@@ -65,7 +65,7 @@ contract TimelockControllerUpgradeable is Initializable, AccessControlUpgradeabl
         uint256 minDelay,
         address[] memory proposers,
         address[] memory executors
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __AccessControl_init_unchained();
@@ -76,7 +76,7 @@ contract TimelockControllerUpgradeable is Initializable, AccessControlUpgradeabl
         uint256 minDelay,
         address[] memory proposers,
         address[] memory executors
-    ) internal initializer {
+    ) internal onlyInitializing {
         _setRoleAdmin(TIMELOCK_ADMIN_ROLE, TIMELOCK_ADMIN_ROLE);
         _setRoleAdmin(PROPOSER_ROLE, TIMELOCK_ADMIN_ROLE);
         _setRoleAdmin(EXECUTOR_ROLE, TIMELOCK_ADMIN_ROLE);

contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (governance/compatibility/GovernorCompatibilityBravo.sol)
+// OpenZeppelin Contracts v4.4.1 (governance/compatibility/GovernorCompatibilityBravo.sol)
 
 pragma solidity ^0.8.0;
 
@@ -21,7 +21,7 @@ import "../../proxy/utils/Initializable.sol";
  * _Available since v4.3._
  */
 abstract contract GovernorCompatibilityBravoUpgradeable is Initializable, IGovernorTimelockUpgradeable, IGovernorCompatibilityBravoUpgradeable, GovernorUpgradeable {
-    function __GovernorCompatibilityBravo_init() internal initializer {
+    function __GovernorCompatibilityBravo_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __IGovernor_init_unchained();
@@ -30,7 +30,7 @@ abstract contract GovernorCompatibilityBravoUpgradeable is Initializable, IGover
         __GovernorCompatibilityBravo_init_unchained();
     }
 
-    function __GovernorCompatibilityBravo_init_unchained() internal initializer {
+    function __GovernorCompatibilityBravo_init_unchained() internal onlyInitializing {
     }
     using CountersUpgradeable for CountersUpgradeable.Counter;
     using TimersUpgradeable for TimersUpgradeable.BlockNumber;

contracts/governance/compatibility/IGovernorCompatibilityBravoUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (governance/compatibility/IGovernorCompatibilityBravo.sol)
+// OpenZeppelin Contracts v4.4.1 (governance/compatibility/IGovernorCompatibilityBravo.sol)
 
 pragma solidity ^0.8.0;
 
@@ -12,12 +12,12 @@ import "../../proxy/utils/Initializable.sol";
  * _Available since v4.3._
  */
 abstract contract IGovernorCompatibilityBravoUpgradeable is Initializable, IGovernorUpgradeable {
-    function __IGovernorCompatibilityBravo_init() internal initializer {
+    function __IGovernorCompatibilityBravo_init() internal onlyInitializing {
         __IGovernor_init_unchained();
         __IGovernorCompatibilityBravo_init_unchained();
     }
 
-    function __IGovernorCompatibilityBravo_init_unchained() internal initializer {
+    function __IGovernorCompatibilityBravo_init_unchained() internal onlyInitializing {
     }
     /**
      * @dev Proposal structure from Compound Governor Bravo. Not actually used by the compatibility layer, as

contracts/governance/extensions/GovernorCountingSimpleUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (governance/extensions/GovernorCountingSimple.sol)
+// OpenZeppelin Contracts v4.4.1 (governance/extensions/GovernorCountingSimple.sol)
 
 pragma solidity ^0.8.0;
 
@@ -12,14 +12,14 @@ import "../../proxy/utils/Initializable.sol";
  * _Available since v4.3._
  */
 abstract contract GovernorCountingSimpleUpgradeable is Initializable, GovernorUpgradeable {
-    function __GovernorCountingSimple_init() internal initializer {
+    function __GovernorCountingSimple_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __IGovernor_init_unchained();
         __GovernorCountingSimple_init_unchained();
     }
 
-    function __GovernorCountingSimple_init_unchained() internal initializer {
+    function __GovernorCountingSimple_init_unchained() internal onlyInitializing {
     }
     /**
      * @dev Supported vote types. Matches Governor Bravo ordering.

contracts/governance/extensions/GovernorProposalThresholdUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (governance/extensions/GovernorProposalThreshold.sol)
+// OpenZeppelin Contracts v4.4.1 (governance/extensions/GovernorProposalThreshold.sol)
 
 pragma solidity ^0.8.0;
 
@@ -13,14 +13,14 @@ import "../../proxy/utils/Initializable.sol";
  * _Deprecated since v4.4._
  */
 abstract contract GovernorProposalThresholdUpgradeable is Initializable, GovernorUpgradeable {
-    function __GovernorProposalThreshold_init() internal initializer {
+    function __GovernorProposalThreshold_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __IGovernor_init_unchained();
         __GovernorProposalThreshold_init_unchained();
     }
 
-    function __GovernorProposalThreshold_init_unchained() internal initializer {
+    function __GovernorProposalThreshold_init_unchained() internal onlyInitializing {
     }
     function propose(
         address[] memory targets,

contracts/governance/extensions/GovernorSettingsUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (governance/extensions/GovernorSettings.sol)
+// OpenZeppelin Contracts v4.4.1 (governance/extensions/GovernorSettings.sol)
 
 pragma solidity ^0.8.0;
 
@@ -27,7 +27,7 @@ abstract contract GovernorSettingsUpgradeable is Initializable, GovernorUpgradea
         uint256 initialVotingDelay,
         uint256 initialVotingPeriod,
         uint256 initialProposalThreshold
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __IGovernor_init_unchained();
@@ -38,7 +38,7 @@ abstract contract GovernorSettingsUpgradeable is Initializable, GovernorUpgradea
         uint256 initialVotingDelay,
         uint256 initialVotingPeriod,
         uint256 initialProposalThreshold
-    ) internal initializer {
+    ) internal onlyInitializing {
         _setVotingDelay(initialVotingDelay);
         _setVotingPeriod(initialVotingPeriod);
         _setProposalThreshold(initialProposalThreshold);

contracts/governance/extensions/GovernorTimelockCompoundUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (governance/extensions/GovernorTimelockCompound.sol)
+// OpenZeppelin Contracts v4.4.1 (governance/extensions/GovernorTimelockCompound.sol)
 
 pragma solidity ^0.8.0;
 
@@ -94,15 +94,15 @@ abstract contract GovernorTimelockCompoundUpgradeable is Initializable, IGoverno
     /**
      * @dev Set the timelock.
      */
-    function __GovernorTimelockCompound_init(ICompoundTimelockUpgradeable timelockAddress) internal initializer {
+    function __GovernorTimelockCompound_init(ICompoundTimelockUpgradeable timelockAddress) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __IGovernor_init_unchained();
         __IGovernorTimelock_init_unchained();
         __GovernorTimelockCompound_init_unchained(timelockAddress);
     }
 
-    function __GovernorTimelockCompound_init_unchained(ICompoundTimelockUpgradeable timelockAddress) internal initializer {
+    function __GovernorTimelockCompound_init_unchained(ICompoundTimelockUpgradeable timelockAddress) internal onlyInitializing {
         _updateTimelock(timelockAddress);
     }
 

contracts/governance/extensions/GovernorTimelockControlUpgradeable.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.0 (governance/extensions/GovernorTimelockControl.sol)
+// OpenZeppelin Contracts v4.4.1 (governance/extensions/GovernorTimelockControl.sol)
 
 pragma solidity ^0.8.0;
 
@@ -31,15 +31,15 @@ abstract contract GovernorTimelockControlUpgradeable is Initializable, IGovernor
     /**
      * @dev Set the timelock.
      */
-    function __GovernorTimelockControl_init(TimelockControllerUpgradeable timelockAddress) internal initializer {
+    function __GovernorTimelockControl_init(TimelockControllerUpgradeable timelockAddress) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __IGovernor_init_unchained();
         __IGovernorTimelock_init_unchained();
         __GovernorTimelockControl_init_unchained(timelockAddress);
     }
 
-    function __GovernorTimelockControl_init_unchained(TimelockControllerUpgradeable timelockAddress) internal initializer {
+    function __GovernorTimelockControl_init_unchained(TimelockControllerUpgradeable timelockAddress) internal onlyInitializing {
         _updateTimelock(timelockAddress);
     }