fixes

Author: PeterMPhillips

script/TokenDeployer.s.sol

@@ -1,19 +1,23 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.13;
 
-import { Distribution, EnsoToken } from "../src/EnsoToken.sol";
-import { Script } from "forge-std/Script.sol";
+import { Distribution } from "../src/Distribution.sol";
+import { EnsoToken } from "../src/EnsoToken.sol";
+import { Script, console } from "forge-std/Script.sol";
 import { ERC1967Proxy } from "openzeppelin-contracts/proxy/ERC1967/ERC1967Proxy.sol";
 
 contract TokenDeployer is Script {
     address public OWNER = 0x0676675F4fddC2f572cf0CdDaAf0a6b31841CDaC; // TODO
-    address public COINLIST = 0x6969696969696969696969696969696969696969; // TODO
+    address public COINLIST = 0x477F48C93738C0A3a49E365c90Dc56e5466544Df;
+    address public COINLIST_FEE = 0x9CA33da9D11cCb2E2b0870f83C0f963573B74A43;
 
-    uint256 WEI = 10 ** 18;
-    uint256 TOTAL_SUPPLY = 100_000_000 * WEI;
-    uint256 BASIS_POINTS = 10_000;
-    uint256 COINLIST_SHARE = (TOTAL_SUPPLY * 440) / BASIS_POINTS;
-    uint256 OWNER_SHARE = TOTAL_SUPPLY - COINLIST_SHARE;
+    uint256 internal WEI = 10 ** 18;
+    uint256 internal BASIS_POINTS = 10_000;
+
+    uint256 public TOTAL_SUPPLY = 100_000_000 * WEI;
+    uint256 public COINLIST_SHARE = (TOTAL_SUPPLY * 400) / BASIS_POINTS;
+    uint256 public COINLIST_FEE_SHARE = (TOTAL_SUPPLY * 45) / BASIS_POINTS;
+    uint256 public OWNER_SHARE = TOTAL_SUPPLY - COINLIST_SHARE - COINLIST_FEE_SHARE;
 
     function deploy() public returns (ERC1967Proxy token, EnsoToken implementation) {
         implementation = new EnsoToken();
@@ -22,9 +26,10 @@ contract TokenDeployer is Script {
 
         string memory name = "Enso";
         string memory symbol = "ENSO";
-        Distribution[] memory distribution = new Distribution[](2);
+        Distribution[] memory distribution = new Distribution[](3);
         distribution[0] = Distribution(OWNER, OWNER_SHARE);
         distribution[1] = Distribution(COINLIST, COINLIST_SHARE);
+        distribution[2] = Distribution(COINLIST_FEE, COINLIST_FEE_SHARE);
         bytes memory initializationCall =
             abi.encodeWithSelector(EnsoToken.initialize.selector, name, symbol, OWNER, distribution);
         token = new ERC1967Proxy(address(implementation), initializationCall);

src/Distribution.sol

@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-3.0-only
+pragma solidity ^0.8.0;
+
+struct Distribution {
+    address account;
+    uint256 amount;
+}

src/EnsoToken.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 pragma solidity ^0.8.20;
 
+import { Distribution } from "./Distribution.sol";
 import { OwnableUpgradeable } from "openzeppelin-contracts-upgradeable/access/OwnableUpgradeable.sol";
 import { UUPSUpgradeable } from "openzeppelin-contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import { ERC20Upgradeable } from "openzeppelin-contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
@@ -13,11 +14,6 @@ import {
 import { ERC20VotesUpgradeable } from
     "openzeppelin-contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";
 
-struct Distribution {
-    address account;
-    uint256 amount;
-}
-
 contract EnsoToken is
     ERC20Upgradeable,
     ERC20PausableUpgradeable,
@@ -35,21 +31,21 @@ contract EnsoToken is
         external
         initializer
     {
-        __ERC20_init(name, symbol);
-        __ERC20Permit_init(name);
-        __ERC20Votes_init();
-        __Ownable_init(owner);
-        __UUPSUpgradeable_init();
+        __ERC20_init_unchained(name, symbol);
+        __EIP712_init_unchained(name, "1");
+        __Ownable_init_unchained(owner);
         for (uint256 i = 0; i < distribution.length; ++i) {
             _mint(distribution[i].account, distribution[i].amount);
         }
         _pause();
     }
 
+    // @notice Pause transfer functions
     function pause() external onlyOwner {
         _pause();
     }
 
+    // @notice Unpause transfer functions
     function unpause() external onlyOwner {
         _unpause();
     }
@@ -84,5 +80,7 @@ contract EnsoToken is
         ERC20VotesUpgradeable._update(from, to, value);
     }
 
-    function _authorizeUpgrade(address) internal override onlyOwner { }
+    function _authorizeUpgrade(address) internal override onlyOwner {
+        // all necessary validation is handled by the onlyOwner modifier
+    }
 }

test/TokenTest.t.sol

@@ -22,6 +22,14 @@ contract TokenTest is Test {
         token = EnsoToken(address(proxy));
     }
 
+    function test_Decimals() public view {
+        assertEq(token.decimals(), 18);
+    }
+
+    function test_TotalSupply() public view {
+        assertEq(token.totalSupply(), deployer.TOTAL_SUPPLY());
+    }
+
     function test_PausedFail() public {
         vm.startPrank(deployer.COINLIST());
         vm.expectRevert(PausableUpgradeable.EnforcedPause.selector);