feat: add upg to token

contracts/contracts/DevRewardDistributor.sol

@@ -6,14 +6,14 @@ import "./FluenceToken.sol";
 import "./Executor.sol";
 import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
-import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
 
 /**
  * @title DevRewardDistributor
  * @notice Contract for managing developers reward
  */
 contract DevRewardDistributor {
-    using SafeERC20 for IERC20;
+    using SafeERC20Upgradeable for IERC20Upgradeable;
 
     /**
      * @notice Reward token
@@ -143,7 +143,7 @@ contract DevRewardDistributor {
 
         uint256 amount = currentReward();
 
-        IERC20(token).safeTransfer(msg.sender, amount);
+        IERC20Upgradeable(token).safeTransfer(msg.sender, amount);
 
         emit Claimed(userId, msg.sender, amount, leaf);
     }
@@ -152,7 +152,7 @@ contract DevRewardDistributor {
      * @notice used to move any remaining tokens out of the contract after expiration
      **/
     function transferUnclaimed() external whenClaimingIs(false) {
-        IERC20 rewardToken = IERC20(token); //gas saving
+        IERC20Upgradeable rewardToken = IERC20Upgradeable(token); //gas saving
 
         uint256 remainingBalance = rewardToken.balanceOf(address(this));
         rewardToken.safeTransfer(address(executor), remainingBalance);

contracts/contracts/FluenceToken.sol

@@ -2,38 +2,51 @@
 
 pragma solidity >=0.8.15;
 
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Permit.sol";
-import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";
+import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20PermitUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
-contract FluenceToken is ERC20, ERC20Permit, ERC20Votes {
-    constructor(
+contract FluenceToken is ERC20Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, OwnableUpgradeable, UUPSUpgradeable {
+    /// @custom:oz-upgrades-unsafe-allow constructor
+    constructor() {
+        _disableInitializers();
+    }
+
+    function initialize(
         string memory name_,
         string memory symbol_,
         uint256 totalSupply_
-    ) ERC20(name_, symbol_) ERC20Permit(name_) {
+    ) initializer public {
+        __ERC20_init(name_, symbol_);
+        __Ownable_init();
+        __UUPSUpgradeable_init();
+
         _mint(msg.sender, totalSupply_);
     }
 
     function _afterTokenTransfer(
         address from,
         address to,
         uint256 amount
-    ) internal override(ERC20, ERC20Votes) {
+    ) internal override(ERC20Upgradeable, ERC20VotesUpgradeable) {
         super._afterTokenTransfer(from, to, amount);
     }
 
     function _mint(address to, uint256 amount)
         internal
-        override(ERC20, ERC20Votes)
+        override(ERC20Upgradeable, ERC20VotesUpgradeable)
     {
         super._mint(to, amount);
     }
 
     function _burn(address account, uint256 amount)
         internal
-        override(ERC20, ERC20Votes)
+        override(ERC20Upgradeable, ERC20VotesUpgradeable)
     {
         super._burn(account, amount);
     }
+
+    function _authorizeUpgrade(address) internal override onlyOwner {}
 }

contracts/contracts/Vesting.sol

@@ -2,7 +2,8 @@
 
 pragma solidity >=0.8.15;
 
-import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import "./FluenceToken.sol";
 import "./interfaces/IVestingERC20.sol";
 
@@ -12,7 +13,7 @@ import "./interfaces/IVestingERC20.sol";
  * @dev This contract implements the ERC20 standard. It is possible to add the contract to a wallet. Transferring to zero address is unlocking the released amount.
  */
 contract Vesting is IVestingERC20 {
-    using SafeERC20 for IERC20;
+    using SafeERC20Upgradeable for IERC20Upgradeable;
 
     /**
      * @notice Returns the vesting token
@@ -200,7 +201,7 @@ contract Vesting is IVestingERC20 {
 
         _beforeBurn(from, amount);
 
-        IERC20(token).safeTransfer(from, amount);
+        IERC20Upgradeable(token).safeTransfer(from, amount);
 
         balanceOf[from] -= amount;
     }

contracts/contracts/dev/DevERC20.sol

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+
+pragma solidity >=0.8.15;
+
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+/*
+* @dev This contract is used for testing purposes only.
+*/
+contract DevERC20 is ERC20 {
+    constructor(
+        string memory name_,
+        string memory symbol_,
+        uint256 totalSupply_
+    ) ERC20(name_, symbol_) {
+        _mint(msg.sender, totalSupply_);
+    }
+}

contracts/deploy/0000_FluenceToken.ts

@@ -12,11 +12,20 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   await hre.deployments.deploy("FluenceToken", {
     from: deployer,
-    args: [
-      "Fluence Token",
-      "FLT",
-      ethers.utils.parseEther(String(config.deployment!.token!.totalSupply)),
-    ],
+    proxy: {
+      proxyContract: "ERC1967Proxy",
+      proxyArgs: ["{implementation}", "{data}"],
+      execute: {
+        methodName: "initialize",
+        args: [
+          "Fluence Token",
+          "FLT",
+          ethers.utils.parseEther(
+            String(config.deployment!.token!.totalSupply)
+          ),
+        ],
+      },
+    },
     log: true,
     autoMine: true,
     waitConfirmations: 1,

contracts/hardhat.config.ts

@@ -7,6 +7,7 @@ import "solidity-coverage";
 import "hardhat-deploy";
 import "hardhat-tracer";
 import "hardhat-docgen";
+import "dotenv/config";
 import { HardhatUserConfig, task } from "hardhat/config";
 import { Config } from "./utils/config";
 import fs from "fs";