intial commit

Author: supercontracts

src/WeEthModule.sol

@@ -1,9 +1,13 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity ^0.8.21;
 
-import { AccessControlEnumerable }  from "openzeppelin-contracts/contracts/access/extensions/AccessControlEnumerable.sol";
 import { IERC20Metadata as IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
+import { AccessControlEnumerableUpgradeable }
+    from "openzeppelin-contracts-upgradeable/contracts/access/extensions/AccessControlEnumerableUpgradeable.sol";
+
+import { UUPSUpgradeable } from "openzeppelin-contracts-upgradeable/contracts/proxy/utils/UUPSUpgradeable.sol";
+
 import { Ethereum } from "spark-address-registry/Ethereum.sol";
 
 import { IEETHLike, ILiquidityPoolLike, IWETHLike, IWEETHLike } from "./libraries/WeETHLib.sol";
@@ -14,22 +18,29 @@ interface IWithdrawRequestNFTLike {
     function isValid(uint256 requestId) external view returns (bool);
 }
 
-contract WeEthModule is AccessControlEnumerable {
+contract WeEthModule is AccessControlEnumerableUpgradeable, UUPSUpgradeable {
 
-    address public immutable almProxy;
+    address public almProxy;
 
     /**********************************************************************************************/
     /*** Initialization                                                                         ***/
     /**********************************************************************************************/
 
-    constructor(address admin, address _almProxy) {
+    constructor() {
+        _disableInitializers();
+    }
+
+    function initialize(address admin, address _almProxy) external initializer {
         require(_almProxy != address(0), "WeEthModule/invalid-alm-proxy");
 
         _grantRole(DEFAULT_ADMIN_ROLE, admin);
 
         almProxy = _almProxy;
     }
 
+    // Only DEFAULT_ADMIN_ROLE can upgrade the implementation
+    function _authorizeUpgrade(address) internal view override onlyRole(DEFAULT_ADMIN_ROLE) {}
+
     /**********************************************************************************************/
     /*** External functions                                                                     ***/
     /**********************************************************************************************/

test/mainnet-fork/weETH.t.sol

@@ -3,6 +3,8 @@ pragma solidity >=0.8.0;
 
 import { ReentrancyGuard } from "../../lib/openzeppelin-contracts/contracts/utils/ReentrancyGuard.sol";
 
+import { ERC1967Proxy } from "../../lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
+
 import { IWEETHLike, ILiquidityPoolLike, IEETHLike } from "../../src/libraries/WeETHLib.sol";
 
 import { WeEthModule } from "../../src/WeEthModule.sol";
@@ -20,6 +22,10 @@ interface IWithdrawRequestNFTLike {
     function roleRegistry() external view returns (address);
 }
 
+interface IWeEthModuleLike {
+    function initialize(address admin, address _almProxy) external;
+}
+
 contract MainnetControllerWeETHTestBase is ForkTestBase {
 
     IWEETHLike weETH = IWEETHLike(Ethereum.WEETH);
@@ -39,7 +45,15 @@ contract MainnetControllerWeETHTestBase is ForkTestBase {
         eETH          = IEETHLike(address(IWEETHLike(Ethereum.WEETH).eETH()));
         liquidityPool = ILiquidityPoolLike(IEETHLike(eETH).liquidityPool());
 
-        weETHModule = address(new WeEthModule(Ethereum.SPARK_PROXY, address(almProxy)));
+        weETHModule = address(
+                new ERC1967Proxy(
+                    address(new WeEthModule()),
+                    abi.encodeCall(
+                        WeEthModule.initialize,
+                        (Ethereum.SPARK_PROXY, address(almProxy))
+                    )
+                )
+            );
     }
 
     function _getBlock() internal override pure returns (uint256) {