Refactor MaticX contract

contracts/MaticX.sol

@@ -50,7 +50,7 @@ contract MaticX is
 	uint256 private reentrancyGuardStatus;
 
 	/**
-	 * @dev Enables guard from reentrancy calls.
+	 * @dev Enables guard from reentrant calls.
 	 */
 	modifier nonReentrant() {
 		require(
@@ -77,12 +77,9 @@ contract MaticX is
 		address _manager,
 		address _treasury
 	) external initializer {
-		__AccessControl_init();
-		__Pausable_init();
-		__ERC20_init("Liquid Staking Matic", "MaticX");
-
-		require(_manager != address(0), "Zero manager address");
-		_setupRole(DEFAULT_ADMIN_ROLE, _manager);
+		AccessControlUpgradeable.__AccessControl_init();
+		PausableUpgradeable.__Pausable_init();
+		ERC20Upgradeable.__ERC20_init("Liquid Staking Matic", "MaticX");
 
 		require(
 			_validatorRegistry != address(0),
@@ -96,6 +93,9 @@ contract MaticX is
 		require(_maticToken != address(0), "Zero matic token address");
 		maticToken = _maticToken;
 
+		require(_manager != address(0), "Zero manager address");
+		_setupRole(DEFAULT_ADMIN_ROLE, _manager);
+
 		require(_treasury != address(0), "Zero treasury address");
 		treasury = _treasury;
 

contracts/mocks/ExtendedMaticXMock.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity 0.8.7;
+
+import { MaticX } from "../MaticX.sol";
+
+contract ExtendedMaticXMock is MaticX {
+	uint256 public value;
+
+	event ValueSet(uint256 value);
+
+	function setValue(uint256 value_) external {
+		value = value_;
+		emit ValueSet(value_);
+	}
+}

test/MaticX.forking.spec.ts

@@ -340,6 +340,51 @@ describe("MaticX (Forking)", function () {
 		});
 	});
 
+	describe("Upgrade the contract", function () {
+		describe("Checks", function () {
+			it("Should return a new address of the implementation if extended", async function () {
+				const { maticX } = await loadFixture(deployFixture);
+
+				const initialImplementationAddress =
+					await upgrades.erc1967.getImplementationAddress(
+						maticX.address
+					);
+
+				const ExtendedMaticXMock =
+					await ethers.getContractFactory("ExtendedMaticXMock");
+				await upgrades.upgradeProxy(maticX, ExtendedMaticXMock);
+
+				const currentImplementationAddress: string =
+					await upgrades.erc1967.getImplementationAddress(
+						maticX.address
+					);
+				expect(initialImplementationAddress).not.to.equal(
+					currentImplementationAddress
+				);
+			});
+
+			it("Should return the same address of the implementation if not extended", async function () {
+				const { maticX } = await loadFixture(deployFixture);
+
+				const initialImplementationAddress: string =
+					await upgrades.erc1967.getImplementationAddress(
+						maticX.address
+					);
+
+				const MaticX = await ethers.getContractFactory("MaticX");
+				await upgrades.upgradeProxy(maticX, MaticX);
+
+				const currentImplementationAddress: string =
+					await upgrades.erc1967.getImplementationAddress(
+						maticX.address
+					);
+				expect(currentImplementationAddress).to.equal(
+					initialImplementationAddress
+				);
+			});
+		});
+	});
+
 	describe("Fallback", function () {
 		describe("Negative", function () {
 			it("Should revert if calling a non existing method", async function () {