Delete Roles

contracts/MeToken.sol

@@ -4,33 +4,38 @@ pragma solidity ^0.8.0;
 import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";
 
-import "./Roles.sol";
-
 /// @title meToken
 /// @author Carl Farterson (@carlfarterson)
 /// @notice Base erc20-like meToken contract used for all meTokens
-contract MeToken is Initializable, ERC20Burnable {
+contract MeToken is ERC20Burnable {
     string public version;
+    address public foundry;
+    address public meTokenRegistry;
 
-    constructor(string memory _name, string memory _symbol)
-        ERC20(_name, _symbol)
-    {
+    constructor(
+        string memory _name,
+        string memory _symbol,
+        address _foundry,
+        address _meTokenRegistry
+    ) ERC20(_name, _symbol) {
         version = "0.2";
+        foundry = _foundry;
+        meTokenRegistry = _meTokenRegistry;
     }
 
     function mint(address to, uint256 amount) external {
-        /*  require(
-            hasRole(FOUNDRY, msg.sender) ||
-                hasRole(METOKEN_REGISTRY, msg.sender)
-        ); */
+        require(
+            msg.sender == foundry || msg.sender == meTokenRegistry,
+            "!authorized"
+        );
         _mint(to, amount);
     }
 
     function burn(address from, uint256 value) external {
-        /*  require(
-            hasRole(FOUNDRY, msg.sender) ||
-                hasRole(METOKEN_REGISTRY, msg.sender)
-        ); */
+        require(
+            msg.sender == foundry || msg.sender == meTokenRegistry,
+            "!authorized"
+        );
         _burn(from, value);
     }
 }

contracts/MeTokenFactory.sol

@@ -3,24 +3,21 @@ pragma solidity ^0.8.0;
 
 import "./MeToken.sol";
 
-// import "../Roles.sol";
-
 /// @title meToken factory
 /// @author Carl Farterson (@carlfarterson)
 /// @notice This contract creates and deploys a users' meToken
 contract MeTokenFactory {
     /// @notice create a meToken
     /// @param _name name of meToken
     /// @param _symbol symbol of meToken
-    function create(string calldata _name, string calldata _symbol)
-        external
-        returns (address)
-    {
-        // TODO: access control
-        // require(hasRole(METOKEN_REGISTRY, msg.sender), "!meTokenRegistry");
-
+    function create(
+        string calldata _name,
+        string calldata _symbol,
+        address _foundry,
+        address _meTokenRegistry
+    ) external returns (address) {
         // Create our meToken
-        MeToken erc20 = new MeToken(_name, _symbol);
+        MeToken erc20 = new MeToken(_name, _symbol, _foundry, _meTokenRegistry);
         return address(erc20);
     }
 }

contracts/interfaces/IMeTokenFactory.sol

@@ -2,7 +2,10 @@
 pragma solidity ^0.8.0;
 
 interface IMeTokenFactory {
-    function create(string calldata name, string calldata symbol)
-        external
-        returns (address);
+    function create(
+        string calldata name,
+        string calldata symbol,
+        address foundry,
+        address meTokenRegistry
+    ) external returns (address);
 }

contracts/registries/MeTokenRegistry.sol

@@ -71,7 +71,12 @@ contract MeTokenRegistry is Ownable, IMeTokenRegistry {
         }
 
         // Create meToken erc20 contract
-        address meTokenAddr = meTokenFactory.create(_name, _symbol);
+        address meTokenAddr = meTokenFactory.create(
+            _name,
+            _symbol,
+            foundry,
+            address(this)
+        );
 
         // Mint meToken to user
         uint256 _meTokensMinted;