feat(protocol): enforce initializer call with onlyInitializing modifi…

…er (taikoxyz#16061)
rustsol · Feb 25, 2024 · f3d7d82 · f3d7d82
1 parent b9ee868
commit f3d7d82
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/packages/protocol/contracts/L2/CrossChainOwned.sol b/packages/protocol/contracts/L2/CrossChainOwned.sol
@@ -15,7 +15,6 @@
 pragma solidity 0.8.24;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-
 import "../common/EssentialContract.sol";
 import "../bridge/IBridge.sol";
 
@@ -66,6 +65,7 @@ abstract contract CrossChainOwned is EssentialContract, IMessageInvocable {
     )
         internal
         virtual
+        onlyInitializing
     {
         __Essential_init(_addressManager);
 

diff --git a/packages/protocol/contracts/common/AddressResolver.sol b/packages/protocol/contracts/common/AddressResolver.sol
@@ -14,6 +14,7 @@
 
 pragma solidity 0.8.24;
 
+import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "./AddressManager.sol";
 
 /// @title AddressResolver
@@ -25,7 +26,7 @@ import "./AddressManager.sol";
 /// Note that the address manager should be changed using upgradability, there
 /// is no setAddressManager() function go guarantee atomicness across all
 /// contracts that are resolvers.
-abstract contract AddressResolver {
+abstract contract AddressResolver is Initializable {
     address public addressManager;
     uint256[49] private __gap;
 
@@ -93,7 +94,7 @@ abstract contract AddressResolver {
     /// @dev Initialization method for setting up AddressManager reference.
     /// @param _addressManager Address of the AddressManager.
     // solhint-disable-next-line func-name-mixedcase
-    function __AddressResolver_init(address _addressManager) internal virtual {
+    function __AddressResolver_init(address _addressManager) internal virtual onlyInitializing {
         if (block.chainid > type(uint64).max) {
             revert RESOLVER_UNEXPECTED_CHAINID();
         }

diff --git a/packages/protocol/contracts/common/EssentialContract.sol b/packages/protocol/contracts/common/EssentialContract.sol
@@ -31,14 +31,14 @@ abstract contract Essential1StepContract is OwnerUUPSUpgradable, AddressResolver
     /// @notice Initializes the contract with an address manager.
     /// @param _addressManager The address of the address manager.
     // solhint-disable-next-line func-name-mixedcase
-    function __Essential_init(address _addressManager) internal virtual {
+    function __Essential_init(address _addressManager) internal virtual onlyInitializing {
         __OwnerUUPSUpgradable_init();
         __AddressResolver_init(_addressManager);
     }
 
     /// @notice Initializes the contract without an address manager.
     // solhint-disable-next-line func-name-mixedcase
-    function __Essential_init() internal virtual {
+    function __Essential_init() internal virtual onlyInitializing {
         __Essential_init(address(0));
     }
 }

diff --git a/packages/protocol/contracts/common/OwnerUUPSUpgradable.sol b/packages/protocol/contracts/common/OwnerUUPSUpgradable.sol
@@ -83,7 +83,7 @@ abstract contract OwnerUUPSUpgradable is UUPSUpgradeable, OwnableUpgradeable {
 
     /// @notice Initializes the contract with an address manager.
     // solhint-disable-next-line func-name-mixedcase
-    function __OwnerUUPSUpgradable_init() internal virtual {
+    function __OwnerUUPSUpgradable_init() internal virtual onlyInitializing {
         __Ownable_init();
         _paused = _FALSE;
     }

diff --git a/packages/protocol/contracts/team/airdrop/MerkleClaimable.sol b/packages/protocol/contracts/team/airdrop/MerkleClaimable.sol
@@ -63,6 +63,7 @@ abstract contract MerkleClaimable is EssentialContract {
         bytes32 _merkleRoot
     )
         internal
+        onlyInitializing
     {
         _setConfig(_claimStart, _claimEnd, _merkleRoot);
     }