Transpile 1bfa22b3

contracts/access/AccessControlEnumerableUpgradeable.sol

@@ -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

@@ -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/OwnableUpgradeable.sol

@@ -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

@@ -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

@@ -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

@@ -53,7 +53,7 @@ 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());
@@ -61,7 +61,7 @@ abstract contract GovernorUpgradeable is Initializable, ContextUpgradeable, ERC1
         __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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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/GovernorPreventLateQuorumUpgradeable.sol

@@ -35,14 +35,14 @@ abstract contract GovernorPreventLateQuorumUpgradeable is Initializable, Governo
      * reaches quorum until its voting period ends. If necessary the voting period will be extended beyond the one set
      * at proposal creation.
      */
-    function __GovernorPreventLateQuorum_init(uint64 initialVoteExtension) internal initializer {
+    function __GovernorPreventLateQuorum_init(uint64 initialVoteExtension) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __IGovernor_init_unchained();
         __GovernorPreventLateQuorum_init_unchained(initialVoteExtension);
     }
 
-    function __GovernorPreventLateQuorum_init_unchained(uint64 initialVoteExtension) internal initializer {
+    function __GovernorPreventLateQuorum_init_unchained(uint64 initialVoteExtension) internal onlyInitializing {
         _setLateQuorumVoteExtension(initialVoteExtension);
     }
 

contracts/governance/extensions/GovernorProposalThresholdUpgradeable.sol

@@ -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

@@ -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

@@ -94,7 +94,7 @@ 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();
@@ -102,7 +102,7 @@ abstract contract GovernorTimelockCompoundUpgradeable is Initializable, IGoverno
         __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

@@ -31,7 +31,7 @@ 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();
@@ -39,7 +39,7 @@ abstract contract GovernorTimelockControlUpgradeable is Initializable, IGovernor
         __GovernorTimelockControl_init_unchained(timelockAddress);
     }
 
-    function __GovernorTimelockControl_init_unchained(TimelockControllerUpgradeable timelockAddress) internal initializer {
+    function __GovernorTimelockControl_init_unchained(TimelockControllerUpgradeable timelockAddress) internal onlyInitializing {
         _updateTimelock(timelockAddress);
     }
 

contracts/governance/extensions/GovernorVotesCompUpgradeable.sol

@@ -15,14 +15,14 @@ import "../../proxy/utils/Initializable.sol";
 abstract contract GovernorVotesCompUpgradeable is Initializable, GovernorUpgradeable {
     ERC20VotesCompUpgradeable public token;
 
-    function __GovernorVotesComp_init(ERC20VotesCompUpgradeable token_) internal initializer {
+    function __GovernorVotesComp_init(ERC20VotesCompUpgradeable token_) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __IGovernor_init_unchained();
         __GovernorVotesComp_init_unchained(token_);
     }
 
-    function __GovernorVotesComp_init_unchained(ERC20VotesCompUpgradeable token_) internal initializer {
+    function __GovernorVotesComp_init_unchained(ERC20VotesCompUpgradeable token_) internal onlyInitializing {
         token = token_;
     }
 

contracts/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol

@@ -17,14 +17,14 @@ abstract contract GovernorVotesQuorumFractionUpgradeable is Initializable, Gover
 
     event QuorumNumeratorUpdated(uint256 oldQuorumNumerator, uint256 newQuorumNumerator);
 
-    function __GovernorVotesQuorumFraction_init(uint256 quorumNumeratorValue) internal initializer {
+    function __GovernorVotesQuorumFraction_init(uint256 quorumNumeratorValue) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __IGovernor_init_unchained();
         __GovernorVotesQuorumFraction_init_unchained(quorumNumeratorValue);
     }
 
-    function __GovernorVotesQuorumFraction_init_unchained(uint256 quorumNumeratorValue) internal initializer {
+    function __GovernorVotesQuorumFraction_init_unchained(uint256 quorumNumeratorValue) internal onlyInitializing {
         _updateQuorumNumerator(quorumNumeratorValue);
     }
 

contracts/governance/extensions/GovernorVotesUpgradeable.sol

@@ -16,14 +16,14 @@ import "../../proxy/utils/Initializable.sol";
 abstract contract GovernorVotesUpgradeable is Initializable, GovernorUpgradeable {
     ERC20VotesUpgradeable public token;
 
-    function __GovernorVotes_init(ERC20VotesUpgradeable tokenAddress) internal initializer {
+    function __GovernorVotes_init(ERC20VotesUpgradeable tokenAddress) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __IGovernor_init_unchained();
         __GovernorVotes_init_unchained(tokenAddress);
     }
 
-    function __GovernorVotes_init_unchained(ERC20VotesUpgradeable tokenAddress) internal initializer {
+    function __GovernorVotes_init_unchained(ERC20VotesUpgradeable tokenAddress) internal onlyInitializing {
         token = tokenAddress;
     }
 

contracts/governance/extensions/IGovernorTimelockUpgradeable.sol

@@ -12,12 +12,12 @@ import "../../proxy/utils/Initializable.sol";
  * _Available since v4.3._
  */
 abstract contract IGovernorTimelockUpgradeable is Initializable, IGovernorUpgradeable {
-    function __IGovernorTimelock_init() internal initializer {
+    function __IGovernorTimelock_init() internal onlyInitializing {
         __IGovernor_init_unchained();
         __IGovernorTimelock_init_unchained();
     }
 
-    function __IGovernorTimelock_init_unchained() internal initializer {
+    function __IGovernorTimelock_init_unchained() internal onlyInitializing {
     }
     event ProposalQueued(uint256 proposalId, uint256 eta);
 

contracts/metatx/ERC2771ContextUpgradeable.sol

@@ -12,12 +12,12 @@ import "../proxy/utils/Initializable.sol";
 abstract contract ERC2771ContextUpgradeable is Initializable, ContextUpgradeable {
     address private _trustedForwarder;
 
-    function __ERC2771Context_init(address trustedForwarder) internal initializer {
+    function __ERC2771Context_init(address trustedForwarder) internal onlyInitializing {
         __Context_init_unchained();
         __ERC2771Context_init_unchained(trustedForwarder);
     }
 
-    function __ERC2771Context_init_unchained(address trustedForwarder) internal initializer {
+    function __ERC2771Context_init_unchained(address trustedForwarder) internal onlyInitializing {
         _trustedForwarder = trustedForwarder;
     }
 

contracts/metatx/MinimalForwarderUpgradeable.sol

@@ -27,12 +27,12 @@ contract MinimalForwarderUpgradeable is Initializable, EIP712Upgradeable {
 
     mapping(address => uint256) private _nonces;
 
-    function __MinimalForwarder_init() internal initializer {
+    function __MinimalForwarder_init() internal onlyInitializing {
         __EIP712_init_unchained("MinimalForwarder", "0.0.1");
         __MinimalForwarder_init_unchained();
     }
 
-    function __MinimalForwarder_init_unchained() internal initializer {}
+    function __MinimalForwarder_init_unchained() internal onlyInitializing {}
 
     function getNonce(address from) public view returns (uint256) {
         return _nonces[from];

contracts/mocks/AccessControlEnumerableMockUpgradeable.sol

@@ -6,7 +6,7 @@ import "../access/AccessControlEnumerableUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract AccessControlEnumerableMockUpgradeable is Initializable, AccessControlEnumerableUpgradeable {
-    function __AccessControlEnumerableMock_init() internal initializer {
+    function __AccessControlEnumerableMock_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __AccessControl_init_unchained();
@@ -14,7 +14,7 @@ contract AccessControlEnumerableMockUpgradeable is Initializable, AccessControlE
         __AccessControlEnumerableMock_init_unchained();
     }
 
-    function __AccessControlEnumerableMock_init_unchained() internal initializer {
+    function __AccessControlEnumerableMock_init_unchained() internal onlyInitializing {
         _setupRole(DEFAULT_ADMIN_ROLE, _msgSender());
     }
 

contracts/mocks/AccessControlMockUpgradeable.sol

@@ -6,14 +6,14 @@ import "../access/AccessControlUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract AccessControlMockUpgradeable is Initializable, AccessControlUpgradeable {
-    function __AccessControlMock_init() internal initializer {
+    function __AccessControlMock_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __AccessControl_init_unchained();
         __AccessControlMock_init_unchained();
     }
 
-    function __AccessControlMock_init_unchained() internal initializer {
+    function __AccessControlMock_init_unchained() internal onlyInitializing {
         _setupRole(DEFAULT_ADMIN_ROLE, _msgSender());
     }
 

contracts/mocks/AddressImplUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/AddressUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract AddressImplUpgradeable is Initializable {
-    function __AddressImpl_init() internal initializer {
+    function __AddressImpl_init() internal onlyInitializing {
         __AddressImpl_init_unchained();
     }
 
-    function __AddressImpl_init_unchained() internal initializer {
+    function __AddressImpl_init_unchained() internal onlyInitializing {
     }
     string public sharedAnswer;
 

contracts/mocks/ArraysImplUpgradeable.sol

@@ -10,11 +10,11 @@ contract ArraysImplUpgradeable is Initializable {
 
     uint256[] private _array;
 
-    function __ArraysImpl_init(uint256[] memory array) internal initializer {
+    function __ArraysImpl_init(uint256[] memory array) internal onlyInitializing {
         __ArraysImpl_init_unchained(array);
     }
 
-    function __ArraysImpl_init_unchained(uint256[] memory array) internal initializer {
+    function __ArraysImpl_init_unchained(uint256[] memory array) internal onlyInitializing {
         _array = array;
     }
 

contracts/mocks/BadBeaconUpgradeable.sol

@@ -3,21 +3,21 @@
 pragma solidity ^0.8.0;
 import "../proxy/utils/Initializable.sol";
 
-contract BadBeaconNoImplUpgradeable is Initializable {    function __BadBeaconNoImpl_init() internal initializer {
+contract BadBeaconNoImplUpgradeable is Initializable {    function __BadBeaconNoImpl_init() internal onlyInitializing {
         __BadBeaconNoImpl_init_unchained();
     }
 
-    function __BadBeaconNoImpl_init_unchained() internal initializer {
+    function __BadBeaconNoImpl_init_unchained() internal onlyInitializing {
     }
     uint256[50] private __gap;
 }
 
 contract BadBeaconNotContractUpgradeable is Initializable {
-    function __BadBeaconNotContract_init() internal initializer {
+    function __BadBeaconNotContract_init() internal onlyInitializing {
         __BadBeaconNotContract_init_unchained();
     }
 
-    function __BadBeaconNotContract_init_unchained() internal initializer {
+    function __BadBeaconNotContract_init_unchained() internal onlyInitializing {
     }
     function implementation() external pure returns (address) {
         return address(0x1);

contracts/mocks/BitmapMockUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/structs/BitMapsUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract BitMapMockUpgradeable is Initializable {
-    function __BitMapMock_init() internal initializer {
+    function __BitMapMock_init() internal onlyInitializing {
         __BitMapMock_init_unchained();
     }
 
-    function __BitMapMock_init_unchained() internal initializer {
+    function __BitMapMock_init_unchained() internal onlyInitializing {
     }
     using BitMapsUpgradeable for BitMapsUpgradeable.BitMap;
 

contracts/mocks/CallReceiverMockUpgradeable.sol

@@ -4,11 +4,11 @@ pragma solidity ^0.8.0;
 import "../proxy/utils/Initializable.sol";
 
 contract CallReceiverMockUpgradeable is Initializable {
-    function __CallReceiverMock_init() internal initializer {
+    function __CallReceiverMock_init() internal onlyInitializing {
         __CallReceiverMock_init_unchained();
     }
 
-    function __CallReceiverMock_init_unchained() internal initializer {
+    function __CallReceiverMock_init_unchained() internal onlyInitializing {
     }
     string public sharedAnswer;
 

contracts/mocks/ClashingImplementationUpgradeable.sol

@@ -9,11 +9,11 @@ import "../proxy/utils/Initializable.sol";
  * @dev Transparent Proxy feature.
  */
 contract ClashingImplementationUpgradeable is Initializable {
-    function __ClashingImplementation_init() internal initializer {
+    function __ClashingImplementation_init() internal onlyInitializing {
         __ClashingImplementation_init_unchained();
     }
 
-    function __ClashingImplementation_init_unchained() internal initializer {
+    function __ClashingImplementation_init_unchained() internal onlyInitializing {
     }
     function admin() external pure returns (address) {
         return 0x0000000000000000000000000000000011111142;

contracts/mocks/ClonesMockUpgradeable.sol

@@ -7,11 +7,11 @@ import "../utils/AddressUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ClonesMockUpgradeable is Initializable {
-    function __ClonesMock_init() internal initializer {
+    function __ClonesMock_init() internal onlyInitializing {
         __ClonesMock_init_unchained();
     }
 
-    function __ClonesMock_init_unchained() internal initializer {
+    function __ClonesMock_init_unchained() internal onlyInitializing {
     }
     using AddressUpgradeable for address;
     using ClonesUpgradeable for address;

contracts/mocks/ConditionalEscrowMockUpgradeable.sol

@@ -7,7 +7,7 @@ import "../proxy/utils/Initializable.sol";
 
 // mock class using ConditionalEscrow
 contract ConditionalEscrowMockUpgradeable is Initializable, ConditionalEscrowUpgradeable {
-    function __ConditionalEscrowMock_init() internal initializer {
+    function __ConditionalEscrowMock_init() internal onlyInitializing {
         __Context_init_unchained();
         __Ownable_init_unchained();
         __Escrow_init_unchained();
@@ -15,7 +15,7 @@ contract ConditionalEscrowMockUpgradeable is Initializable, ConditionalEscrowUpg
         __ConditionalEscrowMock_init_unchained();
     }
 
-    function __ConditionalEscrowMock_init_unchained() internal initializer {
+    function __ConditionalEscrowMock_init_unchained() internal onlyInitializing {
     }
     mapping(address => bool) private _allowed;
 

contracts/mocks/ContextMockUpgradeable.sol

@@ -6,12 +6,12 @@ import "../utils/ContextUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ContextMockUpgradeable is Initializable, ContextUpgradeable {
-    function __ContextMock_init() internal initializer {
+    function __ContextMock_init() internal onlyInitializing {
         __Context_init_unchained();
         __ContextMock_init_unchained();
     }
 
-    function __ContextMock_init_unchained() internal initializer {
+    function __ContextMock_init_unchained() internal onlyInitializing {
     }
     event Sender(address sender);
 
@@ -28,11 +28,11 @@ contract ContextMockUpgradeable is Initializable, ContextUpgradeable {
 }
 
 contract ContextMockCallerUpgradeable is Initializable {
-    function __ContextMockCaller_init() internal initializer {
+    function __ContextMockCaller_init() internal onlyInitializing {
         __ContextMockCaller_init_unchained();
     }
 
-    function __ContextMockCaller_init_unchained() internal initializer {
+    function __ContextMockCaller_init_unchained() internal onlyInitializing {
     }
     function callSender(ContextMockUpgradeable context) public {
         context.msgSender();

contracts/mocks/CountersImplUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/CountersUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract CountersImplUpgradeable is Initializable {
-    function __CountersImpl_init() internal initializer {
+    function __CountersImpl_init() internal onlyInitializing {
         __CountersImpl_init_unchained();
     }
 
-    function __CountersImpl_init_unchained() internal initializer {
+    function __CountersImpl_init_unchained() internal onlyInitializing {
     }
     using CountersUpgradeable for CountersUpgradeable.Counter;
 

contracts/mocks/Create2ImplUpgradeable.sol

@@ -7,11 +7,11 @@ import "../utils/introspection/ERC1820ImplementerUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract Create2ImplUpgradeable is Initializable {
-    function __Create2Impl_init() internal initializer {
+    function __Create2Impl_init() internal onlyInitializing {
         __Create2Impl_init_unchained();
     }
 
-    function __Create2Impl_init_unchained() internal initializer {
+    function __Create2Impl_init_unchained() internal onlyInitializing {
     }
     function deploy(
         uint256 value,

contracts/mocks/DummyImplementationUpgradeable.sol

@@ -4,22 +4,22 @@ pragma solidity ^0.8.0;
 import "../proxy/utils/Initializable.sol";
 
 abstract contract ImplUpgradeable is Initializable {
-    function __Impl_init() internal initializer {
+    function __Impl_init() internal onlyInitializing {
         __Impl_init_unchained();
     }
 
-    function __Impl_init_unchained() internal initializer {
+    function __Impl_init_unchained() internal onlyInitializing {
     }
     function version() public pure virtual returns (string memory);
     uint256[50] private __gap;
 }
 
 contract DummyImplementationUpgradeable is Initializable {
-    function __DummyImplementation_init() internal initializer {
+    function __DummyImplementation_init() internal onlyInitializing {
         __DummyImplementation_init_unchained();
     }
 
-    function __DummyImplementation_init_unchained() internal initializer {
+    function __DummyImplementation_init_unchained() internal onlyInitializing {
     }
     uint256 public value;
     string public text;
@@ -66,12 +66,12 @@ contract DummyImplementationUpgradeable is Initializable {
 }
 
 contract DummyImplementationV2Upgradeable is Initializable, DummyImplementationUpgradeable {
-    function __DummyImplementationV2_init() internal initializer {
+    function __DummyImplementationV2_init() internal onlyInitializing {
         __DummyImplementation_init_unchained();
         __DummyImplementationV2_init_unchained();
     }
 
-    function __DummyImplementationV2_init_unchained() internal initializer {
+    function __DummyImplementationV2_init_unchained() internal onlyInitializing {
     }
     function migrate(uint256 newVal) public payable {
         value = newVal;

contracts/mocks/ECDSAMockUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/cryptography/ECDSAUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ECDSAMockUpgradeable is Initializable {
-    function __ECDSAMock_init() internal initializer {
+    function __ECDSAMock_init() internal onlyInitializing {
         __ECDSAMock_init_unchained();
     }
 
-    function __ECDSAMock_init_unchained() internal initializer {
+    function __ECDSAMock_init_unchained() internal onlyInitializing {
     }
     using ECDSAUpgradeable for bytes32;
     using ECDSAUpgradeable for bytes;

contracts/mocks/EIP712ExternalUpgradeable.sol

@@ -7,12 +7,12 @@ import "../utils/cryptography/ECDSAUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract EIP712ExternalUpgradeable is Initializable, EIP712Upgradeable {
-    function __EIP712External_init(string memory name, string memory version) internal initializer {
+    function __EIP712External_init(string memory name, string memory version) internal onlyInitializing {
         __EIP712_init_unchained(name, version);
         __EIP712External_init_unchained(name, version);
     }
 
-    function __EIP712External_init_unchained(string memory name, string memory version) internal initializer {}
+    function __EIP712External_init_unchained(string memory name, string memory version) internal onlyInitializing {}
 
     function domainSeparator() external view returns (bytes32) {
         return _domainSeparatorV4();

contracts/mocks/ERC1155BurnableMockUpgradeable.sol

@@ -6,7 +6,7 @@ import "../token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ERC1155BurnableMockUpgradeable is Initializable, ERC1155BurnableUpgradeable {
-    function __ERC1155BurnableMock_init(string memory uri) internal initializer {
+    function __ERC1155BurnableMock_init(string memory uri) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC1155_init_unchained(uri);
@@ -14,7 +14,7 @@ contract ERC1155BurnableMockUpgradeable is Initializable, ERC1155BurnableUpgrade
         __ERC1155BurnableMock_init_unchained(uri);
     }
 
-    function __ERC1155BurnableMock_init_unchained(string memory uri) internal initializer {}
+    function __ERC1155BurnableMock_init_unchained(string memory uri) internal onlyInitializing {}
 
     function mint(
         address to,

contracts/mocks/ERC1155MockUpgradeable.sol

@@ -10,14 +10,14 @@ import "../proxy/utils/Initializable.sol";
  * This mock just publicizes internal functions for testing purposes
  */
 contract ERC1155MockUpgradeable is Initializable, ERC1155Upgradeable {
-    function __ERC1155Mock_init(string memory uri) internal initializer {
+    function __ERC1155Mock_init(string memory uri) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC1155_init_unchained(uri);
         __ERC1155Mock_init_unchained(uri);
     }
 
-    function __ERC1155Mock_init_unchained(string memory uri) internal initializer {}
+    function __ERC1155Mock_init_unchained(string memory uri) internal onlyInitializing {}
 
     function setURI(string memory newuri) public {
         _setURI(newuri);

contracts/mocks/ERC1155PausableMockUpgradeable.sol

@@ -7,7 +7,7 @@ import "../token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ERC1155PausableMockUpgradeable is Initializable, ERC1155MockUpgradeable, ERC1155PausableUpgradeable {
-    function __ERC1155PausableMock_init(string memory uri) internal initializer {
+    function __ERC1155PausableMock_init(string memory uri) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC1155_init_unchained(uri);
@@ -17,7 +17,7 @@ contract ERC1155PausableMockUpgradeable is Initializable, ERC1155MockUpgradeable
         __ERC1155PausableMock_init_unchained(uri);
     }
 
-    function __ERC1155PausableMock_init_unchained(string memory uri) internal initializer {}
+    function __ERC1155PausableMock_init_unchained(string memory uri) internal onlyInitializing {}
 
     function pause() external {
         _pause();

contracts/mocks/ERC1155ReceiverMockUpgradeable.sol

@@ -20,7 +20,7 @@ contract ERC1155ReceiverMockUpgradeable is Initializable, ERC165Upgradeable, IER
         bool recReverts,
         bytes4 batRetval,
         bool batReverts
-    ) internal initializer {
+    ) internal onlyInitializing {
         __ERC165_init_unchained();
         __ERC1155ReceiverMock_init_unchained(recRetval, recReverts, batRetval, batReverts);
     }
@@ -30,7 +30,7 @@ contract ERC1155ReceiverMockUpgradeable is Initializable, ERC165Upgradeable, IER
         bool recReverts,
         bytes4 batRetval,
         bool batReverts
-    ) internal initializer {
+    ) internal onlyInitializing {
         _recRetval = recRetval;
         _recReverts = recReverts;
         _batRetval = batRetval;

contracts/mocks/ERC1155SupplyMockUpgradeable.sol

@@ -7,7 +7,7 @@ import "../token/ERC1155/extensions/ERC1155SupplyUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ERC1155SupplyMockUpgradeable is Initializable, ERC1155MockUpgradeable, ERC1155SupplyUpgradeable {
-    function __ERC1155SupplyMock_init(string memory uri) internal initializer {
+    function __ERC1155SupplyMock_init(string memory uri) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC1155_init_unchained(uri);
@@ -16,7 +16,7 @@ contract ERC1155SupplyMockUpgradeable is Initializable, ERC1155MockUpgradeable,
         __ERC1155SupplyMock_init_unchained(uri);
     }
 
-    function __ERC1155SupplyMock_init_unchained(string memory uri) internal initializer {}
+    function __ERC1155SupplyMock_init_unchained(string memory uri) internal onlyInitializing {}
 
     function _beforeTokenTransfer(
         address operator,

contracts/mocks/ERC1271WalletMockUpgradeable.sol

@@ -8,13 +8,13 @@ import "../utils/cryptography/ECDSAUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ERC1271WalletMockUpgradeable is Initializable, OwnableUpgradeable, IERC1271Upgradeable {
-    function __ERC1271WalletMock_init(address originalOwner) internal initializer {
+    function __ERC1271WalletMock_init(address originalOwner) internal onlyInitializing {
         __Context_init_unchained();
         __Ownable_init_unchained();
         __ERC1271WalletMock_init_unchained(originalOwner);
     }
 
-    function __ERC1271WalletMock_init_unchained(address originalOwner) internal initializer {
+    function __ERC1271WalletMock_init_unchained(address originalOwner) internal onlyInitializing {
         transferOwnership(originalOwner);
     }
 

contracts/mocks/ERC165/ERC165InterfacesSupportedUpgradeable.sol

@@ -30,11 +30,11 @@ contract SupportsInterfaceWithLookupMockUpgradeable is Initializable, IERC165Upg
      * @dev A contract implementing SupportsInterfaceWithLookup
      * implement ERC165 itself.
      */
-    function __SupportsInterfaceWithLookupMock_init() internal initializer {
+    function __SupportsInterfaceWithLookupMock_init() internal onlyInitializing {
         __SupportsInterfaceWithLookupMock_init_unchained();
     }
 
-    function __SupportsInterfaceWithLookupMock_init_unchained() internal initializer {
+    function __SupportsInterfaceWithLookupMock_init_unchained() internal onlyInitializing {
         _registerInterface(INTERFACE_ID_ERC165);
     }
 
@@ -56,12 +56,12 @@ contract SupportsInterfaceWithLookupMockUpgradeable is Initializable, IERC165Upg
 }
 
 contract ERC165InterfacesSupportedUpgradeable is Initializable, SupportsInterfaceWithLookupMockUpgradeable {
-    function __ERC165InterfacesSupported_init(bytes4[] memory interfaceIds) internal initializer {
+    function __ERC165InterfacesSupported_init(bytes4[] memory interfaceIds) internal onlyInitializing {
         __SupportsInterfaceWithLookupMock_init_unchained();
         __ERC165InterfacesSupported_init_unchained(interfaceIds);
     }
 
-    function __ERC165InterfacesSupported_init_unchained(bytes4[] memory interfaceIds) internal initializer {
+    function __ERC165InterfacesSupported_init_unchained(bytes4[] memory interfaceIds) internal onlyInitializing {
         for (uint256 i = 0; i < interfaceIds.length; i++) {
             _registerInterface(interfaceIds[i]);
         }

contracts/mocks/ERC165/ERC165MissingDataUpgradeable.sol

@@ -4,11 +4,11 @@ pragma solidity ^0.8.0;
 import "../../proxy/utils/Initializable.sol";
 
 contract ERC165MissingDataUpgradeable is Initializable {
-    function __ERC165MissingData_init() internal initializer {
+    function __ERC165MissingData_init() internal onlyInitializing {
         __ERC165MissingData_init_unchained();
     }
 
-    function __ERC165MissingData_init_unchained() internal initializer {
+    function __ERC165MissingData_init_unchained() internal onlyInitializing {
     }
     function supportsInterface(bytes4 interfaceId) public view {} // missing return
     uint256[50] private __gap;

contracts/mocks/ERC165/ERC165NotSupportedUpgradeable.sol

@@ -3,11 +3,11 @@
 pragma solidity ^0.8.0;
 import "../../proxy/utils/Initializable.sol";
 
-contract ERC165NotSupportedUpgradeable is Initializable {    function __ERC165NotSupported_init() internal initializer {
+contract ERC165NotSupportedUpgradeable is Initializable {    function __ERC165NotSupported_init() internal onlyInitializing {
         __ERC165NotSupported_init_unchained();
     }
 
-    function __ERC165NotSupported_init_unchained() internal initializer {
+    function __ERC165NotSupported_init_unchained() internal onlyInitializing {
     }
     uint256[50] private __gap;
 }

contracts/mocks/ERC165CheckerMockUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/introspection/ERC165CheckerUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ERC165CheckerMockUpgradeable is Initializable {
-    function __ERC165CheckerMock_init() internal initializer {
+    function __ERC165CheckerMock_init() internal onlyInitializing {
         __ERC165CheckerMock_init_unchained();
     }
 
-    function __ERC165CheckerMock_init_unchained() internal initializer {
+    function __ERC165CheckerMock_init_unchained() internal onlyInitializing {
     }
     using ERC165CheckerUpgradeable for address;
 

contracts/mocks/ERC165MockUpgradeable.sol

@@ -5,12 +5,12 @@ pragma solidity ^0.8.0;
 import "../utils/introspection/ERC165Upgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
-contract ERC165MockUpgradeable is Initializable, ERC165Upgradeable {    function __ERC165Mock_init() internal initializer {
+contract ERC165MockUpgradeable is Initializable, ERC165Upgradeable {    function __ERC165Mock_init() internal onlyInitializing {
         __ERC165_init_unchained();
         __ERC165Mock_init_unchained();
     }
 
-    function __ERC165Mock_init_unchained() internal initializer {
+    function __ERC165Mock_init_unchained() internal onlyInitializing {
     }
     uint256[50] private __gap;
 }

contracts/mocks/ERC165StorageMockUpgradeable.sol

@@ -6,13 +6,13 @@ import "../utils/introspection/ERC165StorageUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ERC165StorageMockUpgradeable is Initializable, ERC165StorageUpgradeable {
-    function __ERC165StorageMock_init() internal initializer {
+    function __ERC165StorageMock_init() internal onlyInitializing {
         __ERC165_init_unchained();
         __ERC165Storage_init_unchained();
         __ERC165StorageMock_init_unchained();
     }
 
-    function __ERC165StorageMock_init_unchained() internal initializer {
+    function __ERC165StorageMock_init_unchained() internal onlyInitializing {
     }
     function registerInterface(bytes4 interfaceId) public {
         _registerInterface(interfaceId);

contracts/mocks/ERC1820ImplementerMockUpgradeable.sol

@@ -6,12 +6,12 @@ import "../utils/introspection/ERC1820ImplementerUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ERC1820ImplementerMockUpgradeable is Initializable, ERC1820ImplementerUpgradeable {
-    function __ERC1820ImplementerMock_init() internal initializer {
+    function __ERC1820ImplementerMock_init() internal onlyInitializing {
         __ERC1820Implementer_init_unchained();
         __ERC1820ImplementerMock_init_unchained();
     }
 
-    function __ERC1820ImplementerMock_init_unchained() internal initializer {
+    function __ERC1820ImplementerMock_init_unchained() internal onlyInitializing {
     }
     function registerInterfaceForAddress(bytes32 interfaceHash, address account) public {
         _registerInterfaceForAddress(interfaceHash, account);

contracts/mocks/ERC20BurnableMockUpgradeable.sol

@@ -11,7 +11,7 @@ contract ERC20BurnableMockUpgradeable is Initializable, ERC20BurnableUpgradeable
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20_init_unchained(name, symbol);
         __ERC20Burnable_init_unchained();
@@ -23,7 +23,7 @@ contract ERC20BurnableMockUpgradeable is Initializable, ERC20BurnableUpgradeable
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) internal initializer {
+    ) internal onlyInitializing {
         _mint(initialAccount, initialBalance);
     }
     uint256[50] private __gap;

contracts/mocks/ERC20CappedMockUpgradeable.sol

@@ -10,7 +10,7 @@ contract ERC20CappedMockUpgradeable is Initializable, ERC20CappedUpgradeable {
         string memory name,
         string memory symbol,
         uint256 cap
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20_init_unchained(name, symbol);
         __ERC20Capped_init_unchained(cap);
@@ -21,7 +21,7 @@ contract ERC20CappedMockUpgradeable is Initializable, ERC20CappedUpgradeable {
         string memory name,
         string memory symbol,
         uint256 cap
-    ) internal initializer {}
+    ) internal onlyInitializing {}
 
     function mint(address to, uint256 tokenId) public {
         _mint(to, tokenId);

contracts/mocks/ERC20DecimalsMockUpgradeable.sol

@@ -12,7 +12,7 @@ contract ERC20DecimalsMockUpgradeable is Initializable, ERC20Upgradeable {
         string memory name_,
         string memory symbol_,
         uint8 decimals_
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20_init_unchained(name_, symbol_);
         __ERC20DecimalsMock_init_unchained(name_, symbol_, decimals_);
@@ -22,7 +22,7 @@ contract ERC20DecimalsMockUpgradeable is Initializable, ERC20Upgradeable {
         string memory name_,
         string memory symbol_,
         uint8 decimals_
-    ) internal initializer {
+    ) internal onlyInitializing {
         _decimals = decimals_;
     }
 

contracts/mocks/ERC20FlashMintMockUpgradeable.sol

@@ -11,7 +11,7 @@ contract ERC20FlashMintMockUpgradeable is Initializable, ERC20FlashMintUpgradeab
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20_init_unchained(name, symbol);
         __ERC20FlashMint_init_unchained();
@@ -23,7 +23,7 @@ contract ERC20FlashMintMockUpgradeable is Initializable, ERC20FlashMintUpgradeab
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) internal initializer {
+    ) internal onlyInitializing {
         _mint(initialAccount, initialBalance);
     }
     uint256[50] private __gap;

contracts/mocks/ERC20MockUpgradeable.sol

@@ -12,7 +12,7 @@ contract ERC20MockUpgradeable is Initializable, ERC20Upgradeable {
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20_init_unchained(name, symbol);
         __ERC20Mock_init_unchained(name, symbol, initialAccount, initialBalance);
@@ -23,7 +23,7 @@ contract ERC20MockUpgradeable is Initializable, ERC20Upgradeable {
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) internal initializer {
+    ) internal onlyInitializing {
         _mint(initialAccount, initialBalance);
     }
 

contracts/mocks/ERC20PausableMockUpgradeable.sol

@@ -12,7 +12,7 @@ contract ERC20PausableMockUpgradeable is Initializable, ERC20PausableUpgradeable
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20_init_unchained(name, symbol);
         __Pausable_init_unchained();
@@ -25,7 +25,7 @@ contract ERC20PausableMockUpgradeable is Initializable, ERC20PausableUpgradeable
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) internal initializer {
+    ) internal onlyInitializing {
         _mint(initialAccount, initialBalance);
     }
 

contracts/mocks/ERC20PermitMockUpgradeable.sol

@@ -11,7 +11,7 @@ contract ERC20PermitMockUpgradeable is Initializable, ERC20PermitUpgradeable {
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20_init_unchained(name, symbol);
         __EIP712_init_unchained(name, "1");
@@ -24,7 +24,7 @@ contract ERC20PermitMockUpgradeable is Initializable, ERC20PermitUpgradeable {
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) internal initializer {
+    ) internal onlyInitializing {
         _mint(initialAccount, initialBalance);
     }
 

contracts/mocks/ERC20SnapshotMockUpgradeable.sol

@@ -11,7 +11,7 @@ contract ERC20SnapshotMockUpgradeable is Initializable, ERC20SnapshotUpgradeable
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20_init_unchained(name, symbol);
         __ERC20Snapshot_init_unchained();
@@ -23,7 +23,7 @@ contract ERC20SnapshotMockUpgradeable is Initializable, ERC20SnapshotUpgradeable
         string memory symbol,
         address initialAccount,
         uint256 initialBalance
-    ) internal initializer {
+    ) internal onlyInitializing {
         _mint(initialAccount, initialBalance);
     }
 

contracts/mocks/ERC20VotesCompMockUpgradeable.sol

@@ -6,7 +6,7 @@ import "../token/ERC20/extensions/ERC20VotesCompUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ERC20VotesCompMockUpgradeable is Initializable, ERC20VotesCompUpgradeable {
-    function __ERC20VotesCompMock_init(string memory name, string memory symbol) internal initializer {
+    function __ERC20VotesCompMock_init(string memory name, string memory symbol) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20_init_unchained(name, symbol);
         __EIP712_init_unchained(name, "1");
@@ -16,7 +16,7 @@ contract ERC20VotesCompMockUpgradeable is Initializable, ERC20VotesCompUpgradeab
         __ERC20VotesCompMock_init_unchained(name, symbol);
     }
 
-    function __ERC20VotesCompMock_init_unchained(string memory name, string memory symbol) internal initializer {}
+    function __ERC20VotesCompMock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
 
     function mint(address account, uint256 amount) public {
         _mint(account, amount);

contracts/mocks/ERC20VotesMockUpgradeable.sol

@@ -6,7 +6,7 @@ import "../token/ERC20/extensions/ERC20VotesUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ERC20VotesMockUpgradeable is Initializable, ERC20VotesUpgradeable {
-    function __ERC20VotesMock_init(string memory name, string memory symbol) internal initializer {
+    function __ERC20VotesMock_init(string memory name, string memory symbol) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20_init_unchained(name, symbol);
         __EIP712_init_unchained(name, "1");
@@ -15,7 +15,7 @@ contract ERC20VotesMockUpgradeable is Initializable, ERC20VotesUpgradeable {
         __ERC20VotesMock_init_unchained(name, symbol);
     }
 
-    function __ERC20VotesMock_init_unchained(string memory name, string memory symbol) internal initializer {}
+    function __ERC20VotesMock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
 
     function mint(address account, uint256 amount) public {
         _mint(account, amount);

contracts/mocks/ERC20WrapperMockUpgradeable.sol

@@ -10,7 +10,7 @@ contract ERC20WrapperMockUpgradeable is Initializable, ERC20WrapperUpgradeable {
         IERC20Upgradeable _underlyingToken,
         string memory name,
         string memory symbol
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20_init_unchained(name, symbol);
         __ERC20Wrapper_init_unchained(_underlyingToken);
@@ -21,7 +21,7 @@ contract ERC20WrapperMockUpgradeable is Initializable, ERC20WrapperUpgradeable {
         IERC20Upgradeable _underlyingToken,
         string memory name,
         string memory symbol
-    ) internal initializer {}
+    ) internal onlyInitializing {}
 
     function recover(address account) public returns (uint256) {
         return _recover(account);

contracts/mocks/ERC2771ContextMockUpgradeable.sol

@@ -8,14 +8,14 @@ import "../proxy/utils/Initializable.sol";
 
 // By inheriting from ERC2771Context, Context's internal functions are overridden automatically
 contract ERC2771ContextMockUpgradeable is Initializable, ContextMockUpgradeable, ERC2771ContextUpgradeable {
-    function __ERC2771ContextMock_init(address trustedForwarder) internal initializer {
+    function __ERC2771ContextMock_init(address trustedForwarder) internal onlyInitializing {
         __Context_init_unchained();
         __ContextMock_init_unchained();
         __ERC2771Context_init_unchained(trustedForwarder);
         __ERC2771ContextMock_init_unchained(trustedForwarder);
     }
 
-    function __ERC2771ContextMock_init_unchained(address trustedForwarder) internal initializer {}
+    function __ERC2771ContextMock_init_unchained(address trustedForwarder) internal onlyInitializing {}
 
     function _msgSender() internal view virtual override(ContextUpgradeable, ERC2771ContextUpgradeable) returns (address) {
         return ERC2771ContextUpgradeable._msgSender();

contracts/mocks/ERC3156FlashBorrowerMockUpgradeable.sol

@@ -23,11 +23,11 @@ contract ERC3156FlashBorrowerMockUpgradeable is Initializable, IERC3156FlashBorr
     event BalanceOf(address token, address account, uint256 value);
     event TotalSupply(address token, uint256 value);
 
-    function __ERC3156FlashBorrowerMock_init(bool enableReturn, bool enableApprove) internal initializer {
+    function __ERC3156FlashBorrowerMock_init(bool enableReturn, bool enableApprove) internal onlyInitializing {
         __ERC3156FlashBorrowerMock_init_unchained(enableReturn, enableApprove);
     }
 
-    function __ERC3156FlashBorrowerMock_init_unchained(bool enableReturn, bool enableApprove) internal initializer {
+    function __ERC3156FlashBorrowerMock_init_unchained(bool enableReturn, bool enableApprove) internal onlyInitializing {
         _enableApprove = enableApprove;
         _enableReturn = enableReturn;
     }

contracts/mocks/ERC721BurnableMockUpgradeable.sol

@@ -6,7 +6,7 @@ import "../token/ERC721/extensions/ERC721BurnableUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ERC721BurnableMockUpgradeable is Initializable, ERC721BurnableUpgradeable {
-    function __ERC721BurnableMock_init(string memory name, string memory symbol) internal initializer {
+    function __ERC721BurnableMock_init(string memory name, string memory symbol) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC721_init_unchained(name, symbol);
@@ -14,7 +14,7 @@ contract ERC721BurnableMockUpgradeable is Initializable, ERC721BurnableUpgradeab
         __ERC721BurnableMock_init_unchained(name, symbol);
     }
 
-    function __ERC721BurnableMock_init_unchained(string memory name, string memory symbol) internal initializer {}
+    function __ERC721BurnableMock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
 
     function exists(uint256 tokenId) public view returns (bool) {
         return _exists(tokenId);

contracts/mocks/ERC721EnumerableMockUpgradeable.sol

@@ -12,7 +12,7 @@ import "../proxy/utils/Initializable.sol";
 contract ERC721EnumerableMockUpgradeable is Initializable, ERC721EnumerableUpgradeable {
     string private _baseTokenURI;
 
-    function __ERC721EnumerableMock_init(string memory name, string memory symbol) internal initializer {
+    function __ERC721EnumerableMock_init(string memory name, string memory symbol) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC721_init_unchained(name, symbol);
@@ -20,7 +20,7 @@ contract ERC721EnumerableMockUpgradeable is Initializable, ERC721EnumerableUpgra
         __ERC721EnumerableMock_init_unchained(name, symbol);
     }
 
-    function __ERC721EnumerableMock_init_unchained(string memory name, string memory symbol) internal initializer {}
+    function __ERC721EnumerableMock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
 
     function _baseURI() internal view virtual override returns (string memory) {
         return _baseTokenURI;

contracts/mocks/ERC721MockUpgradeable.sol

@@ -10,14 +10,14 @@ import "../proxy/utils/Initializable.sol";
  * This mock just provides a public safeMint, mint, and burn functions for testing purposes
  */
 contract ERC721MockUpgradeable is Initializable, ERC721Upgradeable {
-    function __ERC721Mock_init(string memory name, string memory symbol) internal initializer {
+    function __ERC721Mock_init(string memory name, string memory symbol) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC721_init_unchained(name, symbol);
         __ERC721Mock_init_unchained(name, symbol);
     }
 
-    function __ERC721Mock_init_unchained(string memory name, string memory symbol) internal initializer {}
+    function __ERC721Mock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
 
     function baseURI() public view returns (string memory) {
         return _baseURI();

contracts/mocks/ERC721PausableMockUpgradeable.sol

@@ -10,7 +10,7 @@ import "../proxy/utils/Initializable.sol";
  * This mock just provides a public mint, burn and exists functions for testing purposes
  */
 contract ERC721PausableMockUpgradeable is Initializable, ERC721PausableUpgradeable {
-    function __ERC721PausableMock_init(string memory name, string memory symbol) internal initializer {
+    function __ERC721PausableMock_init(string memory name, string memory symbol) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC721_init_unchained(name, symbol);
@@ -19,7 +19,7 @@ contract ERC721PausableMockUpgradeable is Initializable, ERC721PausableUpgradeab
         __ERC721PausableMock_init_unchained(name, symbol);
     }
 
-    function __ERC721PausableMock_init_unchained(string memory name, string memory symbol) internal initializer {}
+    function __ERC721PausableMock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
 
     function pause() external {
         _pause();

contracts/mocks/ERC721ReceiverMockUpgradeable.sol

@@ -18,11 +18,11 @@ contract ERC721ReceiverMockUpgradeable is Initializable, IERC721ReceiverUpgradea
 
     event Received(address operator, address from, uint256 tokenId, bytes data, uint256 gas);
 
-    function __ERC721ReceiverMock_init(bytes4 retval, Error error) internal initializer {
+    function __ERC721ReceiverMock_init(bytes4 retval, Error error) internal onlyInitializing {
         __ERC721ReceiverMock_init_unchained(retval, error);
     }
 
-    function __ERC721ReceiverMock_init_unchained(bytes4 retval, Error error) internal initializer {
+    function __ERC721ReceiverMock_init_unchained(bytes4 retval, Error error) internal onlyInitializing {
         _retval = retval;
         _error = error;
     }

contracts/mocks/ERC721URIStorageMockUpgradeable.sol

@@ -12,7 +12,7 @@ import "../proxy/utils/Initializable.sol";
 contract ERC721URIStorageMockUpgradeable is Initializable, ERC721URIStorageUpgradeable {
     string private _baseTokenURI;
 
-    function __ERC721URIStorageMock_init(string memory name, string memory symbol) internal initializer {
+    function __ERC721URIStorageMock_init(string memory name, string memory symbol) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC721_init_unchained(name, symbol);
@@ -20,7 +20,7 @@ contract ERC721URIStorageMockUpgradeable is Initializable, ERC721URIStorageUpgra
         __ERC721URIStorageMock_init_unchained(name, symbol);
     }
 
-    function __ERC721URIStorageMock_init_unchained(string memory name, string memory symbol) internal initializer {}
+    function __ERC721URIStorageMock_init_unchained(string memory name, string memory symbol) internal onlyInitializing {}
 
     function _baseURI() internal view virtual override returns (string memory) {
         return _baseTokenURI;

contracts/mocks/ERC777MockUpgradeable.sol

@@ -15,7 +15,7 @@ contract ERC777MockUpgradeable is Initializable, ContextUpgradeable, ERC777Upgra
         string memory name,
         string memory symbol,
         address[] memory defaultOperators
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC777_init_unchained(name, symbol, defaultOperators);
         __ERC777Mock_init_unchained(initialHolder, initialBalance, name, symbol, defaultOperators);
@@ -27,7 +27,7 @@ contract ERC777MockUpgradeable is Initializable, ContextUpgradeable, ERC777Upgra
         string memory name,
         string memory symbol,
         address[] memory defaultOperators
-    ) internal initializer {
+    ) internal onlyInitializing {
         _mint(initialHolder, initialBalance, "", "");
     }
 

contracts/mocks/ERC777SenderRecipientMockUpgradeable.sol

@@ -11,13 +11,13 @@ import "../utils/introspection/ERC1820ImplementerUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ERC777SenderRecipientMockUpgradeable is Initializable, ContextUpgradeable, IERC777SenderUpgradeable, IERC777RecipientUpgradeable, ERC1820ImplementerUpgradeable {
-    function __ERC777SenderRecipientMock_init() internal initializer {
+    function __ERC777SenderRecipientMock_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC1820Implementer_init_unchained();
         __ERC777SenderRecipientMock_init_unchained();
     }
 
-    function __ERC777SenderRecipientMock_init_unchained() internal initializer {
+    function __ERC777SenderRecipientMock_init_unchained() internal onlyInitializing {
         _erc1820 = IERC1820RegistryUpgradeable(0x1820a4B7618BdE71Dce8cdc73aAB6C95905faD24);
     }
     event TokensToSendCalled(

contracts/mocks/EnumerableMapMockUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/structs/EnumerableMapUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract EnumerableMapMockUpgradeable is Initializable {
-    function __EnumerableMapMock_init() internal initializer {
+    function __EnumerableMapMock_init() internal onlyInitializing {
         __EnumerableMapMock_init_unchained();
     }
 
-    function __EnumerableMapMock_init_unchained() internal initializer {
+    function __EnumerableMapMock_init_unchained() internal onlyInitializing {
     }
     using EnumerableMapUpgradeable for EnumerableMapUpgradeable.UintToAddressMap;
 

contracts/mocks/EnumerableSetMockUpgradeable.sol

@@ -7,11 +7,11 @@ import "../proxy/utils/Initializable.sol";
 
 // Bytes32Set
 contract EnumerableBytes32SetMockUpgradeable is Initializable {
-    function __EnumerableBytes32SetMock_init() internal initializer {
+    function __EnumerableBytes32SetMock_init() internal onlyInitializing {
         __EnumerableBytes32SetMock_init_unchained();
     }
 
-    function __EnumerableBytes32SetMock_init_unchained() internal initializer {
+    function __EnumerableBytes32SetMock_init_unchained() internal onlyInitializing {
     }
     using EnumerableSetUpgradeable for EnumerableSetUpgradeable.Bytes32Set;
 
@@ -49,11 +49,11 @@ contract EnumerableBytes32SetMockUpgradeable is Initializable {
 
 // AddressSet
 contract EnumerableAddressSetMockUpgradeable is Initializable {
-    function __EnumerableAddressSetMock_init() internal initializer {
+    function __EnumerableAddressSetMock_init() internal onlyInitializing {
         __EnumerableAddressSetMock_init_unchained();
     }
 
-    function __EnumerableAddressSetMock_init_unchained() internal initializer {
+    function __EnumerableAddressSetMock_init_unchained() internal onlyInitializing {
     }
     using EnumerableSetUpgradeable for EnumerableSetUpgradeable.AddressSet;
 
@@ -91,11 +91,11 @@ contract EnumerableAddressSetMockUpgradeable is Initializable {
 
 // UintSet
 contract EnumerableUintSetMockUpgradeable is Initializable {
-    function __EnumerableUintSetMock_init() internal initializer {
+    function __EnumerableUintSetMock_init() internal onlyInitializing {
         __EnumerableUintSetMock_init_unchained();
     }
 
-    function __EnumerableUintSetMock_init_unchained() internal initializer {
+    function __EnumerableUintSetMock_init_unchained() internal onlyInitializing {
     }
     using EnumerableSetUpgradeable for EnumerableSetUpgradeable.UintSet;
 

contracts/mocks/EtherReceiverMockUpgradeable.sol

@@ -4,11 +4,11 @@ pragma solidity ^0.8.0;
 import "../proxy/utils/Initializable.sol";
 
 contract EtherReceiverMockUpgradeable is Initializable {
-    function __EtherReceiverMock_init() internal initializer {
+    function __EtherReceiverMock_init() internal onlyInitializing {
         __EtherReceiverMock_init_unchained();
     }
 
-    function __EtherReceiverMock_init_unchained() internal initializer {
+    function __EtherReceiverMock_init_unchained() internal onlyInitializing {
     }
     bool private _acceptEther;
 

contracts/mocks/GovernorCompMockUpgradeable.sol

@@ -7,7 +7,7 @@ import "../governance/extensions/GovernorVotesCompUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract GovernorCompMockUpgradeable is Initializable, GovernorVotesCompUpgradeable, GovernorCountingSimpleUpgradeable {
-    function __GovernorCompMock_init(string memory name_, ERC20VotesCompUpgradeable token_) internal initializer {
+    function __GovernorCompMock_init(string memory name_, ERC20VotesCompUpgradeable token_) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __EIP712_init_unchained(name_, version());
@@ -18,7 +18,7 @@ contract GovernorCompMockUpgradeable is Initializable, GovernorVotesCompUpgradea
         __GovernorCompMock_init_unchained(name_, token_);
     }
 
-    function __GovernorCompMock_init_unchained(string memory name_, ERC20VotesCompUpgradeable token_) internal initializer {}
+    function __GovernorCompMock_init_unchained(string memory name_, ERC20VotesCompUpgradeable token_) internal onlyInitializing {}
 
     function quorum(uint256) public pure override returns (uint256) {
         return 0;

contracts/mocks/GovernorCompatibilityBravoMockUpgradeable.sol

@@ -21,7 +21,7 @@ contract GovernorCompatibilityBravoMockUpgradeable is
         uint256 votingPeriod_,
         uint256 proposalThreshold_,
         ICompoundTimelockUpgradeable timelock_
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __EIP712_init_unchained(name_, version());
@@ -43,7 +43,7 @@ contract GovernorCompatibilityBravoMockUpgradeable is
         uint256 votingPeriod_,
         uint256 proposalThreshold_,
         ICompoundTimelockUpgradeable timelock_
-    ) internal initializer {}
+    ) internal onlyInitializing {}
 
     function supportsInterface(bytes4 interfaceId)
         public

contracts/mocks/GovernorMockUpgradeable.sol

@@ -20,7 +20,7 @@ contract GovernorMockUpgradeable is
         uint256 votingDelay_,
         uint256 votingPeriod_,
         uint256 quorumNumerator_
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __EIP712_init_unchained(name_, version());
@@ -40,7 +40,7 @@ contract GovernorMockUpgradeable is
         uint256 votingDelay_,
         uint256 votingPeriod_,
         uint256 quorumNumerator_
-    ) internal initializer {}
+    ) internal onlyInitializing {}
 
     function cancel(
         address[] memory targets,

contracts/mocks/GovernorPreventLateQuorumMockUpgradeable.sol

@@ -23,7 +23,7 @@ contract GovernorPreventLateQuorumMockUpgradeable is
         uint256 votingPeriod_,
         uint256 quorum_,
         uint64 voteExtension_
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __EIP712_init_unchained(name_, version());
@@ -43,7 +43,7 @@ contract GovernorPreventLateQuorumMockUpgradeable is
         uint256 votingPeriod_,
         uint256 quorum_,
         uint64 voteExtension_
-    ) internal initializer {
+    ) internal onlyInitializing {
         _quorum = quorum_;
     }
 

contracts/mocks/GovernorTimelockCompoundMockUpgradeable.sol

@@ -21,7 +21,7 @@ contract GovernorTimelockCompoundMockUpgradeable is
         uint256 votingPeriod_,
         ICompoundTimelockUpgradeable timelock_,
         uint256 quorumNumerator_
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __EIP712_init_unchained(name_, version());
@@ -43,7 +43,7 @@ contract GovernorTimelockCompoundMockUpgradeable is
         uint256 votingPeriod_,
         ICompoundTimelockUpgradeable timelock_,
         uint256 quorumNumerator_
-    ) internal initializer {}
+    ) internal onlyInitializing {}
 
     function supportsInterface(bytes4 interfaceId)
         public

contracts/mocks/GovernorTimelockControlMockUpgradeable.sol

@@ -21,7 +21,7 @@ contract GovernorTimelockControlMockUpgradeable is
         uint256 votingPeriod_,
         TimelockControllerUpgradeable timelock_,
         uint256 quorumNumerator_
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __EIP712_init_unchained(name_, version());
@@ -43,7 +43,7 @@ contract GovernorTimelockControlMockUpgradeable is
         uint256 votingPeriod_,
         TimelockControllerUpgradeable timelock_,
         uint256 quorumNumerator_
-    ) internal initializer {}
+    ) internal onlyInitializing {}
 
     function supportsInterface(bytes4 interfaceId)
         public

contracts/mocks/MathMockUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/math/MathUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract MathMockUpgradeable is Initializable {
-    function __MathMock_init() internal initializer {
+    function __MathMock_init() internal onlyInitializing {
         __MathMock_init_unchained();
     }
 
-    function __MathMock_init_unchained() internal initializer {
+    function __MathMock_init_unchained() internal onlyInitializing {
     }
     function max(uint256 a, uint256 b) public pure returns (uint256) {
         return MathUpgradeable.max(a, b);

contracts/mocks/MerkleProofWrapperUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/cryptography/MerkleProofUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract MerkleProofWrapperUpgradeable is Initializable {
-    function __MerkleProofWrapper_init() internal initializer {
+    function __MerkleProofWrapper_init() internal onlyInitializing {
         __MerkleProofWrapper_init_unchained();
     }
 
-    function __MerkleProofWrapper_init_unchained() internal initializer {
+    function __MerkleProofWrapper_init_unchained() internal onlyInitializing {
     }
     function verify(
         bytes32[] memory proof,

contracts/mocks/MulticallTestUpgradeable.sol

@@ -6,11 +6,11 @@ import "./MulticallTokenMockUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract MulticallTestUpgradeable is Initializable {
-    function __MulticallTest_init() internal initializer {
+    function __MulticallTest_init() internal onlyInitializing {
         __MulticallTest_init_unchained();
     }
 
-    function __MulticallTest_init_unchained() internal initializer {
+    function __MulticallTest_init_unchained() internal onlyInitializing {
     }
     function testReturnValues(
         MulticallTokenMockUpgradeable multicallToken,

contracts/mocks/MulticallTokenMockUpgradeable.sol

@@ -7,7 +7,7 @@ import "./ERC20MockUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract MulticallTokenMockUpgradeable is Initializable, ERC20MockUpgradeable, MulticallUpgradeable {
-    function __MulticallTokenMock_init(uint256 initialBalance) internal initializer {
+    function __MulticallTokenMock_init(uint256 initialBalance) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20_init_unchained("MulticallToken", "BCT");
         __ERC20Mock_init_unchained("MulticallToken", "BCT", msg.sender, initialBalance);
@@ -15,6 +15,6 @@ contract MulticallTokenMockUpgradeable is Initializable, ERC20MockUpgradeable, M
         __MulticallTokenMock_init_unchained(initialBalance);
     }
 
-    function __MulticallTokenMock_init_unchained(uint256 initialBalance) internal initializer {}
+    function __MulticallTokenMock_init_unchained(uint256 initialBalance) internal onlyInitializing {}
     uint256[50] private __gap;
 }

contracts/mocks/OwnableMockUpgradeable.sol

@@ -5,13 +5,13 @@ pragma solidity ^0.8.0;
 import "../access/OwnableUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
-contract OwnableMockUpgradeable is Initializable, OwnableUpgradeable {    function __OwnableMock_init() internal initializer {
+contract OwnableMockUpgradeable is Initializable, OwnableUpgradeable {    function __OwnableMock_init() internal onlyInitializing {
         __Context_init_unchained();
         __Ownable_init_unchained();
         __OwnableMock_init_unchained();
     }
 
-    function __OwnableMock_init_unchained() internal initializer {
+    function __OwnableMock_init_unchained() internal onlyInitializing {
     }
     uint256[50] private __gap;
 }

contracts/mocks/PausableMockUpgradeable.sol

@@ -9,13 +9,13 @@ contract PausableMockUpgradeable is Initializable, PausableUpgradeable {
     bool public drasticMeasureTaken;
     uint256 public count;
 
-    function __PausableMock_init() internal initializer {
+    function __PausableMock_init() internal onlyInitializing {
         __Context_init_unchained();
         __Pausable_init_unchained();
         __PausableMock_init_unchained();
     }
 
-    function __PausableMock_init_unchained() internal initializer {
+    function __PausableMock_init_unchained() internal onlyInitializing {
         drasticMeasureTaken = false;
         count = 0;
     }

contracts/mocks/PullPaymentMockUpgradeable.sol

@@ -7,12 +7,12 @@ import "../proxy/utils/Initializable.sol";
 
 // mock class using PullPayment
 contract PullPaymentMockUpgradeable is Initializable, PullPaymentUpgradeable {
-    function __PullPaymentMock_init() internal initializer {
+    function __PullPaymentMock_init() internal onlyInitializing {
         __PullPayment_init_unchained();
         __PullPaymentMock_init_unchained();
     }
 
-    function __PullPaymentMock_init_unchained() internal initializer {}
+    function __PullPaymentMock_init_unchained() internal onlyInitializing {}
 
     // test helper function to call asyncTransfer
     function callTransfer(address dest, uint256 amount) public {

contracts/mocks/ReentrancyAttackUpgradeable.sol

@@ -6,12 +6,12 @@ import "../utils/ContextUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ReentrancyAttackUpgradeable is Initializable, ContextUpgradeable {
-    function __ReentrancyAttack_init() internal initializer {
+    function __ReentrancyAttack_init() internal onlyInitializing {
         __Context_init_unchained();
         __ReentrancyAttack_init_unchained();
     }
 
-    function __ReentrancyAttack_init_unchained() internal initializer {
+    function __ReentrancyAttack_init_unchained() internal onlyInitializing {
     }
     function callSender(bytes4 data) public {
         (bool success, ) = _msgSender().call(abi.encodeWithSelector(data));

contracts/mocks/ReentrancyMockUpgradeable.sol

@@ -9,12 +9,12 @@ import "../proxy/utils/Initializable.sol";
 contract ReentrancyMockUpgradeable is Initializable, ReentrancyGuardUpgradeable {
     uint256 public counter;
 
-    function __ReentrancyMock_init() internal initializer {
+    function __ReentrancyMock_init() internal onlyInitializing {
         __ReentrancyGuard_init_unchained();
         __ReentrancyMock_init_unchained();
     }
 
-    function __ReentrancyMock_init_unchained() internal initializer {
+    function __ReentrancyMock_init_unchained() internal onlyInitializing {
         counter = 0;
     }
 

contracts/mocks/SafeCastMockUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/math/SafeCastUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract SafeCastMockUpgradeable is Initializable {
-    function __SafeCastMock_init() internal initializer {
+    function __SafeCastMock_init() internal onlyInitializing {
         __SafeCastMock_init_unchained();
     }
 
-    function __SafeCastMock_init_unchained() internal initializer {
+    function __SafeCastMock_init_unchained() internal onlyInitializing {
     }
     using SafeCastUpgradeable for uint256;
     using SafeCastUpgradeable for int256;

contracts/mocks/SafeERC20HelperUpgradeable.sol

@@ -8,12 +8,12 @@ import "../token/ERC20/utils/SafeERC20Upgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ERC20ReturnFalseMockUpgradeable is Initializable, ContextUpgradeable {
-    function __ERC20ReturnFalseMock_init() internal initializer {
+    function __ERC20ReturnFalseMock_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC20ReturnFalseMock_init_unchained();
     }
 
-    function __ERC20ReturnFalseMock_init_unchained() internal initializer {
+    function __ERC20ReturnFalseMock_init_unchained() internal onlyInitializing {
     }
     uint256 private _allowance;
 
@@ -48,12 +48,12 @@ contract ERC20ReturnFalseMockUpgradeable is Initializable, ContextUpgradeable {
 }
 
 contract ERC20ReturnTrueMockUpgradeable is Initializable, ContextUpgradeable {
-    function __ERC20ReturnTrueMock_init() internal initializer {
+    function __ERC20ReturnTrueMock_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC20ReturnTrueMock_init_unchained();
     }
 
-    function __ERC20ReturnTrueMock_init_unchained() internal initializer {
+    function __ERC20ReturnTrueMock_init_unchained() internal onlyInitializing {
     }
     mapping(address => uint256) private _allowances;
 
@@ -91,12 +91,12 @@ contract ERC20ReturnTrueMockUpgradeable is Initializable, ContextUpgradeable {
 }
 
 contract ERC20NoReturnMockUpgradeable is Initializable, ContextUpgradeable {
-    function __ERC20NoReturnMock_init() internal initializer {
+    function __ERC20NoReturnMock_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC20NoReturnMock_init_unchained();
     }
 
-    function __ERC20NoReturnMock_init_unchained() internal initializer {
+    function __ERC20NoReturnMock_init_unchained() internal onlyInitializing {
     }
     mapping(address => uint256) private _allowances;
 
@@ -135,12 +135,12 @@ contract SafeERC20WrapperUpgradeable is Initializable, ContextUpgradeable {
 
     IERC20Upgradeable private _token;
 
-    function __SafeERC20Wrapper_init(IERC20Upgradeable token) internal initializer {
+    function __SafeERC20Wrapper_init(IERC20Upgradeable token) internal onlyInitializing {
         __Context_init_unchained();
         __SafeERC20Wrapper_init_unchained(token);
     }
 
-    function __SafeERC20Wrapper_init_unchained(IERC20Upgradeable token) internal initializer {
+    function __SafeERC20Wrapper_init_unchained(IERC20Upgradeable token) internal onlyInitializing {
         _token = token;
     }
 

contracts/mocks/SafeMathMockUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/math/SafeMathUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract SafeMathMockUpgradeable is Initializable {
-    function __SafeMathMock_init() internal initializer {
+    function __SafeMathMock_init() internal onlyInitializing {
         __SafeMathMock_init_unchained();
     }
 
-    function __SafeMathMock_init_unchained() internal initializer {
+    function __SafeMathMock_init_unchained() internal onlyInitializing {
     }
     function tryAdd(uint256 a, uint256 b) public pure returns (bool flag, uint256 value) {
         return SafeMathUpgradeable.tryAdd(a, b);

contracts/mocks/SignatureCheckerMockUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/cryptography/SignatureCheckerUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract SignatureCheckerMockUpgradeable is Initializable {
-    function __SignatureCheckerMock_init() internal initializer {
+    function __SignatureCheckerMock_init() internal onlyInitializing {
         __SignatureCheckerMock_init_unchained();
     }
 
-    function __SignatureCheckerMock_init_unchained() internal initializer {
+    function __SignatureCheckerMock_init_unchained() internal onlyInitializing {
     }
     using SignatureCheckerUpgradeable for address;
 

contracts/mocks/SignedSafeMathMockUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/math/SignedSafeMathUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract SignedSafeMathMockUpgradeable is Initializable {
-    function __SignedSafeMathMock_init() internal initializer {
+    function __SignedSafeMathMock_init() internal onlyInitializing {
         __SignedSafeMathMock_init_unchained();
     }
 
-    function __SignedSafeMathMock_init_unchained() internal initializer {
+    function __SignedSafeMathMock_init_unchained() internal onlyInitializing {
     }
     function mul(int256 a, int256 b) public pure returns (int256) {
         return SignedSafeMathUpgradeable.mul(a, b);

contracts/mocks/StorageSlotMockUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/StorageSlotUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract StorageSlotMockUpgradeable is Initializable {
-    function __StorageSlotMock_init() internal initializer {
+    function __StorageSlotMock_init() internal onlyInitializing {
         __StorageSlotMock_init_unchained();
     }
 
-    function __StorageSlotMock_init_unchained() internal initializer {
+    function __StorageSlotMock_init_unchained() internal onlyInitializing {
     }
     using StorageSlotUpgradeable for bytes32;
 

contracts/mocks/StringsMockUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/StringsUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract StringsMockUpgradeable is Initializable {
-    function __StringsMock_init() internal initializer {
+    function __StringsMock_init() internal onlyInitializing {
         __StringsMock_init_unchained();
     }
 
-    function __StringsMock_init_unchained() internal initializer {
+    function __StringsMock_init_unchained() internal onlyInitializing {
     }
     function fromUint256(uint256 value) public pure returns (string memory) {
         return StringsUpgradeable.toString(value);

contracts/mocks/TimersBlockNumberImplUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/TimersUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract TimersBlockNumberImplUpgradeable is Initializable {
-    function __TimersBlockNumberImpl_init() internal initializer {
+    function __TimersBlockNumberImpl_init() internal onlyInitializing {
         __TimersBlockNumberImpl_init_unchained();
     }
 
-    function __TimersBlockNumberImpl_init_unchained() internal initializer {
+    function __TimersBlockNumberImpl_init_unchained() internal onlyInitializing {
     }
     using TimersUpgradeable for TimersUpgradeable.BlockNumber;
 

contracts/mocks/TimersTimestampImplUpgradeable.sol

@@ -6,11 +6,11 @@ import "../utils/TimersUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract TimersTimestampImplUpgradeable is Initializable {
-    function __TimersTimestampImpl_init() internal initializer {
+    function __TimersTimestampImpl_init() internal onlyInitializing {
         __TimersTimestampImpl_init_unchained();
     }
 
-    function __TimersTimestampImpl_init_unchained() internal initializer {
+    function __TimersTimestampImpl_init_unchained() internal onlyInitializing {
     }
     using TimersUpgradeable for TimersUpgradeable.Timestamp;
 

contracts/mocks/UUPS/TestInProdUpgradeable.sol

@@ -7,14 +7,14 @@ import "../../proxy/utils/UUPSUpgradeable.sol";
 import "../../proxy/utils/Initializable.sol";
 
 contract UUPSUpgradeableMockUpgradeable is Initializable, CountersImplUpgradeable, UUPSUpgradeable {
-    function __UUPSUpgradeableMock_init() internal initializer {
+    function __UUPSUpgradeableMock_init() internal onlyInitializing {
         __CountersImpl_init_unchained();
         __ERC1967Upgrade_init_unchained();
         __UUPSUpgradeable_init_unchained();
         __UUPSUpgradeableMock_init_unchained();
     }
 
-    function __UUPSUpgradeableMock_init_unchained() internal initializer {
+    function __UUPSUpgradeableMock_init_unchained() internal onlyInitializing {
     }
     // Not having any checks in this function is dangerous! Do not do this outside tests!
     function _authorizeUpgrade(address) internal virtual override {}
@@ -22,7 +22,7 @@ contract UUPSUpgradeableMockUpgradeable is Initializable, CountersImplUpgradeabl
 }
 
 contract UUPSUpgradeableUnsafeMockUpgradeable is Initializable, UUPSUpgradeableMockUpgradeable {
-    function __UUPSUpgradeableUnsafeMock_init() internal initializer {
+    function __UUPSUpgradeableUnsafeMock_init() internal onlyInitializing {
         __CountersImpl_init_unchained();
         __ERC1967Upgrade_init_unchained();
         __UUPSUpgradeable_init_unchained();
@@ -30,7 +30,7 @@ contract UUPSUpgradeableUnsafeMockUpgradeable is Initializable, UUPSUpgradeableM
         __UUPSUpgradeableUnsafeMock_init_unchained();
     }
 
-    function __UUPSUpgradeableUnsafeMock_init_unchained() internal initializer {
+    function __UUPSUpgradeableUnsafeMock_init_unchained() internal onlyInitializing {
     }
     function upgradeTo(address newImplementation) external virtual override {
         ERC1967UpgradeUpgradeable._upgradeToAndCall(newImplementation, bytes(""), false);
@@ -43,7 +43,7 @@ contract UUPSUpgradeableUnsafeMockUpgradeable is Initializable, UUPSUpgradeableM
 }
 
 contract UUPSUpgradeableBrokenMockUpgradeable is Initializable, UUPSUpgradeableMockUpgradeable {
-    function __UUPSUpgradeableBrokenMock_init() internal initializer {
+    function __UUPSUpgradeableBrokenMock_init() internal onlyInitializing {
         __CountersImpl_init_unchained();
         __ERC1967Upgrade_init_unchained();
         __UUPSUpgradeable_init_unchained();
@@ -51,7 +51,7 @@ contract UUPSUpgradeableBrokenMockUpgradeable is Initializable, UUPSUpgradeableM
         __UUPSUpgradeableBrokenMock_init_unchained();
     }
 
-    function __UUPSUpgradeableBrokenMock_init_unchained() internal initializer {
+    function __UUPSUpgradeableBrokenMock_init_unchained() internal onlyInitializing {
     }
     function upgradeTo(address) external virtual override {
         // pass

contracts/mocks/compound/CompTimelockUpgradeable.sol

@@ -66,11 +66,11 @@ contract CompTimelockUpgradeable is Initializable {
 
     mapping(bytes32 => bool) public queuedTransactions;
 
-    function __CompTimelock_init(address admin_, uint256 delay_) internal initializer {
+    function __CompTimelock_init(address admin_, uint256 delay_) internal onlyInitializing {
         __CompTimelock_init_unchained(admin_, delay_);
     }
 
-    function __CompTimelock_init_unchained(address admin_, uint256 delay_) internal initializer {
+    function __CompTimelock_init_unchained(address admin_, uint256 delay_) internal onlyInitializing {
         require(delay_ >= MINIMUM_DELAY, "Timelock::constructor: Delay must exceed minimum delay.");
         require(delay_ <= MAXIMUM_DELAY, "Timelock::setDelay: Delay must not exceed maximum delay.");
 

contracts/mocks/wizard/MyGovernor1Upgradeable.sol

@@ -15,7 +15,7 @@ contract MyGovernor1Upgradeable is
     GovernorVotesQuorumFractionUpgradeable,
     GovernorCountingSimpleUpgradeable
 {
-    function __MyGovernor1_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
+    function __MyGovernor1_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __EIP712_init_unchained("MyGovernor", version());
@@ -29,7 +29,7 @@ contract MyGovernor1Upgradeable is
         __MyGovernor1_init_unchained(_token, _timelock);
     }
 
-    function __MyGovernor1_init_unchained(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {}
+    function __MyGovernor1_init_unchained(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {}
 
     function votingDelay() public pure override returns (uint256) {
         return 1; // 1 block

contracts/mocks/wizard/MyGovernor2Upgradeable.sol

@@ -17,7 +17,7 @@ contract MyGovernor2Upgradeable is
     GovernorVotesQuorumFractionUpgradeable,
     GovernorCountingSimpleUpgradeable
 {
-    function __MyGovernor2_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
+    function __MyGovernor2_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __EIP712_init_unchained("MyGovernor", version());
@@ -32,7 +32,7 @@ contract MyGovernor2Upgradeable is
         __MyGovernor2_init_unchained(_token, _timelock);
     }
 
-    function __MyGovernor2_init_unchained(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {}
+    function __MyGovernor2_init_unchained(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {}
 
     function votingDelay() public pure override returns (uint256) {
         return 1; // 1 block

contracts/mocks/wizard/MyGovernor3Upgradeable.sol

@@ -15,7 +15,7 @@ contract MyGovernorUpgradeable is
     GovernorVotesUpgradeable,
     GovernorVotesQuorumFractionUpgradeable
 {
-    function __MyGovernor_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
+    function __MyGovernor_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __EIP712_init_unchained("MyGovernor", version());
@@ -30,7 +30,7 @@ contract MyGovernorUpgradeable is
         __MyGovernor_init_unchained(_token, _timelock);
     }
 
-    function __MyGovernor_init_unchained(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {}
+    function __MyGovernor_init_unchained(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {}
 
     function votingDelay() public pure override returns (uint256) {
         return 1; // 1 block

contracts/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol

@@ -17,11 +17,11 @@ import "../utils/Initializable.sol";
  * @custom:oz-upgrades-unsafe-allow delegatecall
  */
 abstract contract ERC1967UpgradeUpgradeable is Initializable {
-    function __ERC1967Upgrade_init() internal initializer {
+    function __ERC1967Upgrade_init() internal onlyInitializing {
         __ERC1967Upgrade_init_unchained();
     }
 
-    function __ERC1967Upgrade_init_unchained() internal initializer {
+    function __ERC1967Upgrade_init_unchained() internal onlyInitializing {
     }
     // This is the keccak-256 hash of "eip1967.proxy.rollback" subtracted by 1
     bytes32 private constant _ROLLBACK_SLOT = 0x4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143;

contracts/proxy/utils/UUPSUpgradeable.sol

@@ -19,12 +19,12 @@ import "./Initializable.sol";
  * _Available since v4.1._
  */
 abstract contract UUPSUpgradeable is Initializable, ERC1967UpgradeUpgradeable {
-    function __UUPSUpgradeable_init() internal initializer {
+    function __UUPSUpgradeable_init() internal onlyInitializing {
         __ERC1967Upgrade_init_unchained();
         __UUPSUpgradeable_init_unchained();
     }
 
-    function __UUPSUpgradeable_init_unchained() internal initializer {
+    function __UUPSUpgradeable_init_unchained() internal onlyInitializing {
     }
     /// @custom:oz-upgrades-unsafe-allow state-variable-immutable state-variable-assignment
     address private immutable __self = address(this);

contracts/security/PausableUpgradeable.sol

@@ -31,12 +31,12 @@ abstract contract PausableUpgradeable is Initializable, ContextUpgradeable {
     /**
      * @dev Initializes the contract in unpaused state.
      */
-    function __Pausable_init() internal initializer {
+    function __Pausable_init() internal onlyInitializing {
         __Context_init_unchained();
         __Pausable_init_unchained();
     }
 
-    function __Pausable_init_unchained() internal initializer {
+    function __Pausable_init_unchained() internal onlyInitializing {
         _paused = false;
     }
 

contracts/security/PullPaymentUpgradeable.sol

@@ -27,11 +27,11 @@ import "../proxy/utils/Initializable.sol";
 abstract contract PullPaymentUpgradeable is Initializable {
     EscrowUpgradeable private _escrow;
 
-    function __PullPayment_init() internal initializer {
+    function __PullPayment_init() internal onlyInitializing {
         __PullPayment_init_unchained();
     }
 
-    function __PullPayment_init_unchained() internal initializer {
+    function __PullPayment_init_unchained() internal onlyInitializing {
         _escrow = new EscrowUpgradeable();
         _escrow.initialize();
     }

contracts/security/ReentrancyGuardUpgradeable.sol

@@ -37,11 +37,11 @@ abstract contract ReentrancyGuardUpgradeable is Initializable {
 
     uint256 private _status;
 
-    function __ReentrancyGuard_init() internal initializer {
+    function __ReentrancyGuard_init() internal onlyInitializing {
         __ReentrancyGuard_init_unchained();
     }
 
-    function __ReentrancyGuard_init_unchained() internal initializer {
+    function __ReentrancyGuard_init_unchained() internal onlyInitializing {
         _status = _NOT_ENTERED;
     }
 

contracts/token/ERC1155/ERC1155Upgradeable.sol

@@ -33,13 +33,13 @@ contract ERC1155Upgradeable is Initializable, ContextUpgradeable, ERC165Upgradea
     /**
      * @dev See {_setURI}.
      */
-    function __ERC1155_init(string memory uri_) internal initializer {
+    function __ERC1155_init(string memory uri_) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC1155_init_unchained(uri_);
     }
 
-    function __ERC1155_init_unchained(string memory uri_) internal initializer {
+    function __ERC1155_init_unchained(string memory uri_) internal onlyInitializing {
         _setURI(uri_);
     }
 

contracts/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol

@@ -13,13 +13,13 @@ import "../../../proxy/utils/Initializable.sol";
  * _Available since v3.1._
  */
 abstract contract ERC1155BurnableUpgradeable is Initializable, ERC1155Upgradeable {
-    function __ERC1155Burnable_init() internal initializer {
+    function __ERC1155Burnable_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC1155Burnable_init_unchained();
     }
 
-    function __ERC1155Burnable_init_unchained() internal initializer {
+    function __ERC1155Burnable_init_unchained() internal onlyInitializing {
     }
     function burn(
         address account,

contracts/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol

@@ -17,14 +17,14 @@ import "../../../proxy/utils/Initializable.sol";
  * _Available since v3.1._
  */
 abstract contract ERC1155PausableUpgradeable is Initializable, ERC1155Upgradeable, PausableUpgradeable {
-    function __ERC1155Pausable_init() internal initializer {
+    function __ERC1155Pausable_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __Pausable_init_unchained();
         __ERC1155Pausable_init_unchained();
     }
 
-    function __ERC1155Pausable_init_unchained() internal initializer {
+    function __ERC1155Pausable_init_unchained() internal onlyInitializing {
     }
     /**
      * @dev See {ERC1155-_beforeTokenTransfer}.

contracts/token/ERC1155/extensions/ERC1155SupplyUpgradeable.sol

@@ -15,13 +15,13 @@ import "../../../proxy/utils/Initializable.sol";
  * same id are not going to be minted.
  */
 abstract contract ERC1155SupplyUpgradeable is Initializable, ERC1155Upgradeable {
-    function __ERC1155Supply_init() internal initializer {
+    function __ERC1155Supply_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC1155Supply_init_unchained();
     }
 
-    function __ERC1155Supply_init_unchained() internal initializer {
+    function __ERC1155Supply_init_unchained() internal onlyInitializing {
     }
     mapping(uint256 => uint256) private _totalSupply;
 

contracts/token/ERC1155/presets/ERC1155PresetMinterPauserUpgradeable.sol

@@ -37,7 +37,7 @@ contract ERC1155PresetMinterPauserUpgradeable is Initializable, ContextUpgradeab
      * @dev Grants `DEFAULT_ADMIN_ROLE`, `MINTER_ROLE`, and `PAUSER_ROLE` to the account that
      * deploys the contract.
      */
-    function __ERC1155PresetMinterPauser_init(string memory uri) internal initializer {
+    function __ERC1155PresetMinterPauser_init(string memory uri) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __AccessControl_init_unchained();
@@ -49,7 +49,7 @@ contract ERC1155PresetMinterPauserUpgradeable is Initializable, ContextUpgradeab
         __ERC1155PresetMinterPauser_init_unchained(uri);
     }
 
-    function __ERC1155PresetMinterPauser_init_unchained(string memory uri) internal initializer {
+    function __ERC1155PresetMinterPauser_init_unchained(string memory uri) internal onlyInitializing {
         _setupRole(DEFAULT_ADMIN_ROLE, _msgSender());
 
         _setupRole(MINTER_ROLE, _msgSender());

contracts/token/ERC1155/utils/ERC1155HolderUpgradeable.sol

@@ -15,13 +15,13 @@ import "../../../proxy/utils/Initializable.sol";
  * @dev _Available since v3.1._
  */
 contract ERC1155HolderUpgradeable is Initializable, ERC1155ReceiverUpgradeable {
-    function __ERC1155Holder_init() internal initializer {
+    function __ERC1155Holder_init() internal onlyInitializing {
         __ERC165_init_unchained();
         __ERC1155Receiver_init_unchained();
         __ERC1155Holder_init_unchained();
     }
 
-    function __ERC1155Holder_init_unchained() internal initializer {
+    function __ERC1155Holder_init_unchained() internal onlyInitializing {
     }
     function onERC1155Received(
         address,

contracts/token/ERC1155/utils/ERC1155ReceiverUpgradeable.sol

@@ -11,12 +11,12 @@ import "../../../proxy/utils/Initializable.sol";
  * @dev _Available since v3.1._
  */
 abstract contract ERC1155ReceiverUpgradeable is Initializable, ERC165Upgradeable, IERC1155ReceiverUpgradeable {
-    function __ERC1155Receiver_init() internal initializer {
+    function __ERC1155Receiver_init() internal onlyInitializing {
         __ERC165_init_unchained();
         __ERC1155Receiver_init_unchained();
     }
 
-    function __ERC1155Receiver_init_unchained() internal initializer {
+    function __ERC1155Receiver_init_unchained() internal onlyInitializing {
     }
     /**
      * @dev See {IERC165-supportsInterface}.

contracts/token/ERC20/ERC20Upgradeable.sol

@@ -52,12 +52,12 @@ contract ERC20Upgradeable is Initializable, ContextUpgradeable, IERC20Upgradeabl
      * All two of these values are immutable: they can only be set once during
      * construction.
      */
-    function __ERC20_init(string memory name_, string memory symbol_) internal initializer {
+    function __ERC20_init(string memory name_, string memory symbol_) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20_init_unchained(name_, symbol_);
     }
 
-    function __ERC20_init_unchained(string memory name_, string memory symbol_) internal initializer {
+    function __ERC20_init_unchained(string memory name_, string memory symbol_) internal onlyInitializing {
         _name = name_;
         _symbol = symbol_;
     }

contracts/token/ERC20/extensions/ERC20BurnableUpgradeable.sol

@@ -13,12 +13,12 @@ import "../../../proxy/utils/Initializable.sol";
  * recognized off-chain (via event analysis).
  */
 abstract contract ERC20BurnableUpgradeable is Initializable, ContextUpgradeable, ERC20Upgradeable {
-    function __ERC20Burnable_init() internal initializer {
+    function __ERC20Burnable_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC20Burnable_init_unchained();
     }
 
-    function __ERC20Burnable_init_unchained() internal initializer {
+    function __ERC20Burnable_init_unchained() internal onlyInitializing {
     }
     /**
      * @dev Destroys `amount` tokens from the caller.

contracts/token/ERC20/extensions/ERC20CappedUpgradeable.sol

@@ -16,12 +16,12 @@ abstract contract ERC20CappedUpgradeable is Initializable, ERC20Upgradeable {
      * @dev Sets the value of the `cap`. This value is immutable, it can only be
      * set once during construction.
      */
-    function __ERC20Capped_init(uint256 cap_) internal initializer {
+    function __ERC20Capped_init(uint256 cap_) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20Capped_init_unchained(cap_);
     }
 
-    function __ERC20Capped_init_unchained(uint256 cap_) internal initializer {
+    function __ERC20Capped_init_unchained(uint256 cap_) internal onlyInitializing {
         require(cap_ > 0, "ERC20Capped: cap is 0");
         _cap = cap_;
     }

contracts/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol

@@ -17,12 +17,12 @@ import "../../../proxy/utils/Initializable.sol";
  * _Available since v4.1._
  */
 abstract contract ERC20FlashMintUpgradeable is Initializable, ERC20Upgradeable, IERC3156FlashLenderUpgradeable {
-    function __ERC20FlashMint_init() internal initializer {
+    function __ERC20FlashMint_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC20FlashMint_init_unchained();
     }
 
-    function __ERC20FlashMint_init_unchained() internal initializer {
+    function __ERC20FlashMint_init_unchained() internal onlyInitializing {
     }
     bytes32 private constant _RETURN_VALUE = keccak256("ERC3156FlashBorrower.onFlashLoan");
 

contracts/token/ERC20/extensions/ERC20PausableUpgradeable.sol

@@ -15,13 +15,13 @@ import "../../../proxy/utils/Initializable.sol";
  * event of a large bug.
  */
 abstract contract ERC20PausableUpgradeable is Initializable, ERC20Upgradeable, PausableUpgradeable {
-    function __ERC20Pausable_init() internal initializer {
+    function __ERC20Pausable_init() internal onlyInitializing {
         __Context_init_unchained();
         __Pausable_init_unchained();
         __ERC20Pausable_init_unchained();
     }
 
-    function __ERC20Pausable_init_unchained() internal initializer {
+    function __ERC20Pausable_init_unchained() internal onlyInitializing {
     }
     /**
      * @dev See {ERC20-_beforeTokenTransfer}.

contracts/token/ERC20/extensions/ERC20SnapshotUpgradeable.sol

@@ -41,12 +41,12 @@ import "../../../proxy/utils/Initializable.sol";
  */
 
 abstract contract ERC20SnapshotUpgradeable is Initializable, ERC20Upgradeable {
-    function __ERC20Snapshot_init() internal initializer {
+    function __ERC20Snapshot_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC20Snapshot_init_unchained();
     }
 
-    function __ERC20Snapshot_init_unchained() internal initializer {
+    function __ERC20Snapshot_init_unchained() internal onlyInitializing {
     }
     // Inspired by Jordi Baylina's MiniMeToken to record historical balances:
     // https://github.com/Giveth/minimd/blob/ea04d950eea153a04c51fa510b068b9dded390cb/contracts/MiniMeToken.sol

contracts/token/ERC20/extensions/ERC20VotesCompUpgradeable.sol

@@ -26,7 +26,7 @@ import "../../../proxy/utils/Initializable.sol";
  * _Available since v4.2._
  */
 abstract contract ERC20VotesCompUpgradeable is Initializable, ERC20VotesUpgradeable {
-    function __ERC20VotesComp_init_unchained() internal initializer {
+    function __ERC20VotesComp_init_unchained() internal onlyInitializing {
     }
     /**
      * @dev Comp version of the {getVotes} accessor, with `uint96` return type.

contracts/token/ERC20/extensions/ERC20VotesUpgradeable.sol

@@ -27,7 +27,7 @@ import "../../../proxy/utils/Initializable.sol";
  * _Available since v4.2._
  */
 abstract contract ERC20VotesUpgradeable is Initializable, ERC20PermitUpgradeable {
-    function __ERC20Votes_init_unchained() internal initializer {
+    function __ERC20Votes_init_unchained() internal onlyInitializing {
     }
     struct Checkpoint {
         uint32 fromBlock;

contracts/token/ERC20/extensions/ERC20WrapperUpgradeable.sol

@@ -19,12 +19,12 @@ import "../../../proxy/utils/Initializable.sol";
 abstract contract ERC20WrapperUpgradeable is Initializable, ERC20Upgradeable {
     IERC20Upgradeable public underlying;
 
-    function __ERC20Wrapper_init(IERC20Upgradeable underlyingToken) internal initializer {
+    function __ERC20Wrapper_init(IERC20Upgradeable underlyingToken) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20Wrapper_init_unchained(underlyingToken);
     }
 
-    function __ERC20Wrapper_init_unchained(IERC20Upgradeable underlyingToken) internal initializer {
+    function __ERC20Wrapper_init_unchained(IERC20Upgradeable underlyingToken) internal onlyInitializing {
         underlying = underlyingToken;
     }
 

contracts/token/ERC20/extensions/draft-ERC20PermitUpgradeable.sol

@@ -33,13 +33,13 @@ abstract contract ERC20PermitUpgradeable is Initializable, ERC20Upgradeable, IER
      *
      * It's a good idea to use the same `name` that is defined as the ERC20 token name.
      */
-    function __ERC20Permit_init(string memory name) internal initializer {
+    function __ERC20Permit_init(string memory name) internal onlyInitializing {
         __Context_init_unchained();
         __EIP712_init_unchained(name, "1");
         __ERC20Permit_init_unchained(name);
     }
 
-    function __ERC20Permit_init_unchained(string memory name) internal initializer {
+    function __ERC20Permit_init_unchained(string memory name) internal onlyInitializing {
         _PERMIT_TYPEHASH = keccak256("Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)");}
 
     /**

contracts/token/ERC20/presets/ERC20PresetFixedSupplyUpgradeable.sol

@@ -38,7 +38,7 @@ contract ERC20PresetFixedSupplyUpgradeable is Initializable, ERC20BurnableUpgrad
         string memory symbol,
         uint256 initialSupply,
         address owner
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC20_init_unchained(name, symbol);
         __ERC20Burnable_init_unchained();
@@ -50,7 +50,7 @@ contract ERC20PresetFixedSupplyUpgradeable is Initializable, ERC20BurnableUpgrad
         string memory symbol,
         uint256 initialSupply,
         address owner
-    ) internal initializer {
+    ) internal onlyInitializing {
         _mint(owner, initialSupply);
     }
     uint256[50] private __gap;

contracts/token/ERC20/presets/ERC20PresetMinterPauserUpgradeable.sol

@@ -39,7 +39,7 @@ contract ERC20PresetMinterPauserUpgradeable is Initializable, ContextUpgradeable
      *
      * See {ERC20-constructor}.
      */
-    function __ERC20PresetMinterPauser_init(string memory name, string memory symbol) internal initializer {
+    function __ERC20PresetMinterPauser_init(string memory name, string memory symbol) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __AccessControl_init_unchained();
@@ -51,7 +51,7 @@ contract ERC20PresetMinterPauserUpgradeable is Initializable, ContextUpgradeable
         __ERC20PresetMinterPauser_init_unchained(name, symbol);
     }
 
-    function __ERC20PresetMinterPauser_init_unchained(string memory name, string memory symbol) internal initializer {
+    function __ERC20PresetMinterPauser_init_unchained(string memory name, string memory symbol) internal onlyInitializing {
         _setupRole(DEFAULT_ADMIN_ROLE, _msgSender());
 
         _setupRole(MINTER_ROLE, _msgSender());

contracts/token/ERC20/utils/TokenTimelockUpgradeable.sol

@@ -29,7 +29,7 @@ contract TokenTimelockUpgradeable is Initializable {
         IERC20Upgradeable token_,
         address beneficiary_,
         uint256 releaseTime_
-    ) internal initializer {
+    ) internal onlyInitializing {
         __TokenTimelock_init_unchained(token_, beneficiary_, releaseTime_);
     }
 
@@ -37,7 +37,7 @@ contract TokenTimelockUpgradeable is Initializable {
         IERC20Upgradeable token_,
         address beneficiary_,
         uint256 releaseTime_
-    ) internal initializer {
+    ) internal onlyInitializing {
         require(releaseTime_ > block.timestamp, "TokenTimelock: release time is before current time");
         _token = token_;
         _beneficiary = beneficiary_;

contracts/token/ERC721/ERC721Upgradeable.sol

@@ -42,13 +42,13 @@ contract ERC721Upgradeable is Initializable, ContextUpgradeable, ERC165Upgradeab
     /**
      * @dev Initializes the contract by setting a `name` and a `symbol` to the token collection.
      */
-    function __ERC721_init(string memory name_, string memory symbol_) internal initializer {
+    function __ERC721_init(string memory name_, string memory symbol_) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC721_init_unchained(name_, symbol_);
     }
 
-    function __ERC721_init_unchained(string memory name_, string memory symbol_) internal initializer {
+    function __ERC721_init_unchained(string memory name_, string memory symbol_) internal onlyInitializing {
         _name = name_;
         _symbol = symbol_;
     }

contracts/token/ERC721/extensions/ERC721BurnableUpgradeable.sol

@@ -12,13 +12,13 @@ import "../../../proxy/utils/Initializable.sol";
  * @dev ERC721 Token that can be irreversibly burned (destroyed).
  */
 abstract contract ERC721BurnableUpgradeable is Initializable, ContextUpgradeable, ERC721Upgradeable {
-    function __ERC721Burnable_init() internal initializer {
+    function __ERC721Burnable_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC721Burnable_init_unchained();
     }
 
-    function __ERC721Burnable_init_unchained() internal initializer {
+    function __ERC721Burnable_init_unchained() internal onlyInitializing {
     }
     /**
      * @dev Burns `tokenId`. See {ERC721-_burn}.

contracts/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol

@@ -13,13 +13,13 @@ import "../../../proxy/utils/Initializable.sol";
  * account.
  */
 abstract contract ERC721EnumerableUpgradeable is Initializable, ERC721Upgradeable, IERC721EnumerableUpgradeable {
-    function __ERC721Enumerable_init() internal initializer {
+    function __ERC721Enumerable_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC721Enumerable_init_unchained();
     }
 
-    function __ERC721Enumerable_init_unchained() internal initializer {
+    function __ERC721Enumerable_init_unchained() internal onlyInitializing {
     }
     // Mapping from owner to list of owned token IDs
     mapping(address => mapping(uint256 => uint256)) private _ownedTokens;

contracts/token/ERC721/extensions/ERC721PausableUpgradeable.sol

@@ -15,14 +15,14 @@ import "../../../proxy/utils/Initializable.sol";
  * event of a large bug.
  */
 abstract contract ERC721PausableUpgradeable is Initializable, ERC721Upgradeable, PausableUpgradeable {
-    function __ERC721Pausable_init() internal initializer {
+    function __ERC721Pausable_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __Pausable_init_unchained();
         __ERC721Pausable_init_unchained();
     }
 
-    function __ERC721Pausable_init_unchained() internal initializer {
+    function __ERC721Pausable_init_unchained() internal onlyInitializing {
     }
     /**
      * @dev See {ERC721-_beforeTokenTransfer}.

contracts/token/ERC721/extensions/ERC721URIStorageUpgradeable.sol

@@ -10,13 +10,13 @@ import "../../../proxy/utils/Initializable.sol";
  * @dev ERC721 token with storage based token URI management.
  */
 abstract contract ERC721URIStorageUpgradeable is Initializable, ERC721Upgradeable {
-    function __ERC721URIStorage_init() internal initializer {
+    function __ERC721URIStorage_init() internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __ERC721URIStorage_init_unchained();
     }
 
-    function __ERC721URIStorage_init_unchained() internal initializer {
+    function __ERC721URIStorage_init_unchained() internal onlyInitializing {
     }
     using StringsUpgradeable for uint256;
 

contracts/token/ERC721/presets/ERC721PresetMinterPauserAutoIdUpgradeable.sol

@@ -63,7 +63,7 @@ contract ERC721PresetMinterPauserAutoIdUpgradeable is
         string memory name,
         string memory symbol,
         string memory baseTokenURI
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC165_init_unchained();
         __AccessControl_init_unchained();
@@ -80,7 +80,7 @@ contract ERC721PresetMinterPauserAutoIdUpgradeable is
         string memory name,
         string memory symbol,
         string memory baseTokenURI
-    ) internal initializer {
+    ) internal onlyInitializing {
         _baseTokenURI = baseTokenURI;
 
         _setupRole(DEFAULT_ADMIN_ROLE, _msgSender());

contracts/token/ERC721/utils/ERC721HolderUpgradeable.sol

@@ -13,11 +13,11 @@ import "../../../proxy/utils/Initializable.sol";
  * Make sure the contract is able to use its token with {IERC721-safeTransferFrom}, {IERC721-approve} or {IERC721-setApprovalForAll}.
  */
 contract ERC721HolderUpgradeable is Initializable, IERC721ReceiverUpgradeable {
-    function __ERC721Holder_init() internal initializer {
+    function __ERC721Holder_init() internal onlyInitializing {
         __ERC721Holder_init_unchained();
     }
 
-    function __ERC721Holder_init_unchained() internal initializer {
+    function __ERC721Holder_init_unchained() internal onlyInitializing {
     }
     /**
      * @dev See {IERC721Receiver-onERC721Received}.

contracts/token/ERC777/ERC777Upgradeable.sol

@@ -62,7 +62,7 @@ contract ERC777Upgradeable is Initializable, ContextUpgradeable, IERC777Upgradea
         string memory name_,
         string memory symbol_,
         address[] memory defaultOperators_
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC777_init_unchained(name_, symbol_, defaultOperators_);
     }
@@ -71,7 +71,7 @@ contract ERC777Upgradeable is Initializable, ContextUpgradeable, IERC777Upgradea
         string memory name_,
         string memory symbol_,
         address[] memory defaultOperators_
-    ) internal initializer {
+    ) internal onlyInitializing {
         _name = name_;
         _symbol = symbol_;
 

contracts/token/ERC777/presets/ERC777PresetFixedSupplyUpgradeable.sol

@@ -34,7 +34,7 @@ contract ERC777PresetFixedSupplyUpgradeable is Initializable, ERC777Upgradeable
         address[] memory defaultOperators,
         uint256 initialSupply,
         address owner
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __ERC777_init_unchained(name, symbol, defaultOperators);
         __ERC777PresetFixedSupply_init_unchained(name, symbol, defaultOperators, initialSupply, owner);
@@ -46,7 +46,7 @@ contract ERC777PresetFixedSupplyUpgradeable is Initializable, ERC777Upgradeable
         address[] memory defaultOperators,
         uint256 initialSupply,
         address owner
-    ) internal initializer {
+    ) internal onlyInitializing {
         _mint(owner, initialSupply, "", "");
     }
     uint256[50] private __gap;

contracts/utils/ContextUpgradeable.sol

@@ -15,11 +15,11 @@ import "../proxy/utils/Initializable.sol";
  * This contract is only required for intermediate, library-like contracts.
  */
 abstract contract ContextUpgradeable is Initializable {
-    function __Context_init() internal initializer {
+    function __Context_init() internal onlyInitializing {
         __Context_init_unchained();
     }
 
-    function __Context_init_unchained() internal initializer {
+    function __Context_init_unchained() internal onlyInitializing {
     }
     function _msgSender() internal view virtual returns (address) {
         return msg.sender;

contracts/utils/MulticallUpgradeable.sol

@@ -12,11 +12,11 @@ import "../proxy/utils/Initializable.sol";
  * _Available since v4.1._
  */
 abstract contract MulticallUpgradeable is Initializable {
-    function __Multicall_init() internal initializer {
+    function __Multicall_init() internal onlyInitializing {
         __Multicall_init_unchained();
     }
 
-    function __Multicall_init_unchained() internal initializer {
+    function __Multicall_init_unchained() internal onlyInitializing {
     }
     /**
      * @dev Receives and executes a batch of function calls on this contract.

contracts/utils/cryptography/draft-EIP712Upgradeable.sol

@@ -45,11 +45,11 @@ abstract contract EIP712Upgradeable is Initializable {
      * NOTE: These parameters cannot be changed except through a xref:learn::upgrading-smart-contracts.adoc[smart
      * contract upgrade].
      */
-    function __EIP712_init(string memory name, string memory version) internal initializer {
+    function __EIP712_init(string memory name, string memory version) internal onlyInitializing {
         __EIP712_init_unchained(name, version);
     }
 
-    function __EIP712_init_unchained(string memory name, string memory version) internal initializer {
+    function __EIP712_init_unchained(string memory name, string memory version) internal onlyInitializing {
         bytes32 hashedName = keccak256(bytes(name));
         bytes32 hashedVersion = keccak256(bytes(version));
         _HASHED_NAME = hashedName;

contracts/utils/escrow/ConditionalEscrowUpgradeable.sol

@@ -12,14 +12,14 @@ import "../../proxy/utils/Initializable.sol";
  * @dev Intended usage: See {Escrow}. Same usage guidelines apply here.
  */
 abstract contract ConditionalEscrowUpgradeable is Initializable, EscrowUpgradeable {
-    function __ConditionalEscrow_init() internal initializer {
+    function __ConditionalEscrow_init() internal onlyInitializing {
         __Context_init_unchained();
         __Ownable_init_unchained();
         __Escrow_init_unchained();
         __ConditionalEscrow_init_unchained();
     }
 
-    function __ConditionalEscrow_init_unchained() internal initializer {
+    function __ConditionalEscrow_init_unchained() internal onlyInitializing {
     }
     /**
      * @dev Returns whether an address is allowed to withdraw their funds. To be

contracts/utils/escrow/EscrowUpgradeable.sol

@@ -24,13 +24,13 @@ contract EscrowUpgradeable is Initializable, OwnableUpgradeable {
     function initialize() public virtual initializer {
         __Escrow_init();
     }
-    function __Escrow_init() internal initializer {
+    function __Escrow_init() internal onlyInitializing {
         __Context_init_unchained();
         __Ownable_init_unchained();
         __Escrow_init_unchained();
     }
 
-    function __Escrow_init_unchained() internal initializer {
+    function __Escrow_init_unchained() internal onlyInitializing {
     }
     using AddressUpgradeable for address payable;
 

contracts/utils/escrow/RefundEscrowUpgradeable.sol

@@ -35,7 +35,7 @@ contract RefundEscrowUpgradeable is Initializable, ConditionalEscrowUpgradeable
      * @dev Constructor.
      * @param beneficiary_ The beneficiary of the deposits.
      */
-    function __RefundEscrow_init(address payable beneficiary_) internal initializer {
+    function __RefundEscrow_init(address payable beneficiary_) internal onlyInitializing {
         __Context_init_unchained();
         __Ownable_init_unchained();
         __Escrow_init_unchained();
@@ -43,7 +43,7 @@ contract RefundEscrowUpgradeable is Initializable, ConditionalEscrowUpgradeable
         __RefundEscrow_init_unchained(beneficiary_);
     }
 
-    function __RefundEscrow_init_unchained(address payable beneficiary_) internal initializer {
+    function __RefundEscrow_init_unchained(address payable beneficiary_) internal onlyInitializing {
         require(beneficiary_ != address(0), "RefundEscrow: beneficiary is the zero address");
         _beneficiary = beneficiary_;
         _state = State.Active;

contracts/utils/introspection/ERC165StorageUpgradeable.sol

@@ -13,12 +13,12 @@ import "../../proxy/utils/Initializable.sol";
  * their support of an interface.
  */
 abstract contract ERC165StorageUpgradeable is Initializable, ERC165Upgradeable {
-    function __ERC165Storage_init() internal initializer {
+    function __ERC165Storage_init() internal onlyInitializing {
         __ERC165_init_unchained();
         __ERC165Storage_init_unchained();
     }
 
-    function __ERC165Storage_init_unchained() internal initializer {
+    function __ERC165Storage_init_unchained() internal onlyInitializing {
     }
     /**
      * @dev Mapping of interface ids to whether or not it's supported.

contracts/utils/introspection/ERC165Upgradeable.sol

@@ -21,11 +21,11 @@ import "../../proxy/utils/Initializable.sol";
  * Alternatively, {ERC165Storage} provides an easier to use but more expensive implementation.
  */
 abstract contract ERC165Upgradeable is Initializable, IERC165Upgradeable {
-    function __ERC165_init() internal initializer {
+    function __ERC165_init() internal onlyInitializing {
         __ERC165_init_unchained();
     }
 
-    function __ERC165_init_unchained() internal initializer {
+    function __ERC165_init_unchained() internal onlyInitializing {
     }
     /**
      * @dev See {IERC165-supportsInterface}.

contracts/utils/introspection/ERC1820ImplementerUpgradeable.sol

@@ -15,11 +15,11 @@ import "../../proxy/utils/Initializable.sol";
  * registration to be complete.
  */
 contract ERC1820ImplementerUpgradeable is Initializable, IERC1820ImplementerUpgradeable {
-    function __ERC1820Implementer_init() internal initializer {
+    function __ERC1820Implementer_init() internal onlyInitializing {
         __ERC1820Implementer_init_unchained();
     }
 
-    function __ERC1820Implementer_init_unchained() internal initializer {
+    function __ERC1820Implementer_init_unchained() internal onlyInitializing {
     }
     bytes32 private constant _ERC1820_ACCEPT_MAGIC = keccak256("ERC1820_ACCEPT_MAGIC");
 

scripts/upgradeable/patch/02-add-missing-mock-arguments.patch

@@ -4,7 +4,7 @@ index d06c8722..6211da1f 100644
 +++ b/contracts/mocks/MulticallTokenMockUpgradeable.sol
 @@ -9,7 +9,7 @@ import "../proxy/utils/Initializable.sol";
  contract MulticallTokenMockUpgradeable is Initializable, ERC20MockUpgradeable, MulticallUpgradeable {
-     function __MulticallTokenMock_init(uint256 initialBalance) internal initializer {
+     function __MulticallTokenMock_init(uint256 initialBalance) internal onlyInitializing {
          __Context_init_unchained();
 -        __ERC20_init_unchained(name, symbol);
 +        __ERC20_init_unchained("MulticallToken", "BCT");

scripts/upgradeable/patch/03-remove-erc20votes-chained-init.patch

@@ -6,12 +6,12 @@ index a7a9af54..0b7f838d 100644
   * _Available since v4.2._
   */
  abstract contract ERC20VotesUpgradeable is Initializable, ERC20PermitUpgradeable {
--    function __ERC20Votes_init() internal initializer {
+-    function __ERC20Votes_init() internal onlyInitializing {
 -        __Context_init_unchained();
 -        __EIP712_init_unchained(name, "1");
 -        __ERC20Votes_init_unchained();
 -    }
 -
-     function __ERC20Votes_init_unchained() internal initializer {
+     function __ERC20Votes_init_unchained() internal onlyInitializing {
      }
      struct Checkpoint {

scripts/upgradeable/patch/04-remove-erc20votes-comp-chained-init.patch

@@ -6,13 +6,13 @@ index 6f1f8182..0f09ea48 100644
   * _Available since v4.2._
   */
  abstract contract ERC20VotesCompUpgradeable is Initializable, ERC20VotesUpgradeable {
--    function __ERC20VotesComp_init() internal initializer {
+-    function __ERC20VotesComp_init() internal onlyInitializing {
 -        __Context_init_unchained();
 -        __EIP712_init_unchained(name, "1");
 -        __ERC20Votes_init_unchained();
 -        __ERC20VotesComp_init_unchained();
 -    }
 -
-     function __ERC20VotesComp_init_unchained() internal initializer {
+     function __ERC20VotesComp_init_unchained() internal onlyInitializing {
      }
      /**

scripts/upgradeable/patch/05-fix-governor-initializers.patch

@@ -3,7 +3,7 @@ index 1f6895a6..86518b84 100644
 --- a/contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol
 +++ b/contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol
 @@ -21,7 +21,6 @@ abstract contract GovernorCompatibilityBravoUpgradeable is Initializable, IGover
-     function __GovernorCompatibilityBravo_init() internal initializer {
+     function __GovernorCompatibilityBravo_init() internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -15,7 +15,7 @@ index 4873166b..6a88e6b4 100644
 --- a/contracts/governance/extensions/GovernorCountingSimpleUpgradeable.sol
 +++ b/contracts/governance/extensions/GovernorCountingSimpleUpgradeable.sol
 @@ -14,7 +14,6 @@ abstract contract GovernorCountingSimpleUpgradeable is Initializable, GovernorUp
-     function __GovernorCountingSimple_init() internal initializer {
+     function __GovernorCountingSimple_init() internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -27,7 +27,7 @@ index c6ed355a..9236c546 100644
 --- a/contracts/governance/extensions/GovernorTimelockCompoundUpgradeable.sol
 +++ b/contracts/governance/extensions/GovernorTimelockCompoundUpgradeable.sol
 @@ -96,7 +96,6 @@ abstract contract GovernorTimelockCompoundUpgradeable is Initializable, IGoverno
-     function __GovernorTimelockCompound_init(ICompoundTimelockUpgradeable timelockAddress) internal initializer {
+     function __GovernorTimelockCompound_init(ICompoundTimelockUpgradeable timelockAddress) internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -39,7 +39,7 @@ index 3d6a5de5..ad5f505e 100644
 --- a/contracts/governance/extensions/GovernorTimelockControlUpgradeable.sol
 +++ b/contracts/governance/extensions/GovernorTimelockControlUpgradeable.sol
 @@ -33,7 +33,6 @@ abstract contract GovernorTimelockControlUpgradeable is Initializable, IGovernor
-     function __GovernorTimelockControl_init(TimelockControllerUpgradeable timelockAddress) internal initializer {
+     function __GovernorTimelockControl_init(TimelockControllerUpgradeable timelockAddress) internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -51,7 +51,7 @@ index cc83b3ed..5398f15b 100644
 --- a/contracts/governance/extensions/GovernorVotesCompUpgradeable.sol
 +++ b/contracts/governance/extensions/GovernorVotesCompUpgradeable.sol
 @@ -17,7 +17,6 @@ abstract contract GovernorVotesCompUpgradeable is Initializable, GovernorUpgrade
-     function __GovernorVotesComp_init(ERC20VotesCompUpgradeable token_) internal initializer {
+     function __GovernorVotesComp_init(ERC20VotesCompUpgradeable token_) internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -63,7 +63,7 @@ index 5d7a88bc..39f97903 100644
 --- a/contracts/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol
 +++ b/contracts/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol
 @@ -19,7 +19,6 @@ abstract contract GovernorVotesQuorumFractionUpgradeable is Initializable, Gover
-     function __GovernorVotesQuorumFraction_init(uint256 quorumNumeratorValue) internal initializer {
+     function __GovernorVotesQuorumFraction_init(uint256 quorumNumeratorValue) internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -75,7 +75,7 @@ index cdfd0ae7..48408d9c 100644
 --- a/contracts/governance/extensions/GovernorVotesUpgradeable.sol
 +++ b/contracts/governance/extensions/GovernorVotesUpgradeable.sol
 @@ -18,7 +18,6 @@ abstract contract GovernorVotesUpgradeable is Initializable, GovernorUpgradeable
-     function __GovernorVotes_init(ERC20VotesUpgradeable tokenAddress) internal initializer {
+     function __GovernorVotes_init(ERC20VotesUpgradeable tokenAddress) internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -87,7 +87,7 @@ index c66ebc16..3bba9501 100644
 --- a/contracts/governance/extensions/GovernorProposalThresholdUpgradeable.sol
 +++ b/contracts/governance/extensions/GovernorProposalThresholdUpgradeable.sol
 @@ -14,7 +14,6 @@ abstract contract GovernorProposalThresholdUpgradeable is Initializable, Governo
-     function __GovernorProposalThreshold_init() internal initializer {
+     function __GovernorProposalThreshold_init() internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -99,7 +99,7 @@ index fbbb5ec1..06e8b9dd 100644
 --- a/contracts/governance/extensions/GovernorSettingsUpgradeable.sol
 +++ b/contracts/governance/extensions/GovernorSettingsUpgradeable.sol
 @@ -30,7 +30,6 @@ abstract contract GovernorSettingsUpgradeable is Initializable, GovernorUpgradea
-     ) internal initializer {
+     ) internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -111,7 +111,7 @@ index df6ccdaf..db9998ed 100644
 --- a/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
 +++ b/contracts/mocks/wizard/MyGovernor1Upgradeable.sol
 @@ -18,7 +18,7 @@ contract MyGovernor1Upgradeable is
-     function __MyGovernor1_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
+     function __MyGovernor1_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -124,7 +124,7 @@ index b07261a4..4ec9b6ce 100644
 --- a/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
 +++ b/contracts/mocks/wizard/MyGovernor2Upgradeable.sol
 @@ -20,7 +20,7 @@ contract MyGovernor2Upgradeable is
-     function __MyGovernor2_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
+     function __MyGovernor2_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -137,7 +137,7 @@ index 223ccb94..e05b6ce7 100644
 --- a/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
 +++ b/contracts/mocks/wizard/MyGovernor3Upgradeable.sol
 @@ -18,7 +18,7 @@ contract MyGovernorUpgradeable is
-     function __MyGovernor_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal initializer {
+     function __MyGovernor_init(ERC20VotesUpgradeable _token, TimelockControllerUpgradeable _timelock) internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());
@@ -150,7 +150,7 @@ index 9b48de71..c28f3b50 100644
 --- a/contracts/governance/extensions/GovernorPreventLateQuorumUpgradeable.sol
 +++ b/contracts/governance/extensions/GovernorPreventLateQuorumUpgradeable.sol
 @@ -38,7 +38,6 @@ abstract contract GovernorPreventLateQuorumUpgradeable is Initializable, Governo
-     function __GovernorPreventLateQuorum_init(uint64 initialVoteExtension) internal initializer {
+     function __GovernorPreventLateQuorum_init(uint64 initialVoteExtension) internal onlyInitializing {
          __Context_init_unchained();
          __ERC165_init_unchained();
 -        __EIP712_init_unchained(name_, version());