Revert "Feature/MintingAllowance + Role Base System Role (#31)"

This reverts commit 60e07fa.

Author: KristenPire

assets/tokens/eur/info.json

@@ -26,18 +26,16 @@ import "./IERC677Recipient.sol";
  * The contract accepts token ownership and stores data in public member variables.
  */
 contract AcceptingRecipient is CanReclaimToken, IERC677Recipient {
+
     address public from;
     uint256 public amount;
     bytes public data;
 
-    function onTokenTransfer(
-        address from_,
-        uint256 amount_,
-        bytes calldata data_
-    ) external returns (bool) {
+    function onTokenTransfer(address from_, uint256 amount_, bytes calldata data_) external returns (bool) {
         from = from_;
         amount = amount_;
         data = data_;
         return true;
     }
+
 }

assets/tokens/gbp/info.json

@@ -17,7 +17,7 @@
 
 pragma solidity ^0.8.11;
 
-import "./ClaimableSystemRole.sol";
+import "./ownership/Claimable.sol";
 import "./ownership/NoOwner.sol";
 import "./ownership/CanReclaimToken.sol";
 import "./IValidator.sol";
@@ -26,13 +26,9 @@ import "./IValidator.sol";
  * @title BlacklistValidator
  * @dev Implements a validator which rejects transfers to blacklisted addresses.
  */
-contract BlacklistValidator is
-    IValidator,
-    ClaimableSystemRole,
-    CanReclaimToken,
-    NoOwner
-{
-    mapping(address => bool) public blacklist;
+contract BlacklistValidator is IValidator, Claimable, CanReclaimToken, NoOwner {
+
+    mapping (address => bool) public blacklist;
 
     /**
      * @dev Emitted when an address is added to the blacklist.
@@ -46,22 +42,11 @@ contract BlacklistValidator is
      */
     event Unban(address indexed friend);
 
-    constructor() {
-        _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
-    }
-
     /**
      * @dev Adds an address to the blacklist.
      * @param adversary Address to add.
      */
-    function ban(address adversary) external {
-        require(
-            owner == msg.sender ||
-                hasRole(SYSTEM_ROLE, msg.sender) ||
-                hasRole(ADMIN_ROLE, msg.sender),
-            "BlacklistValidator: must have admin role to ban"
-        );
-
+    function ban(address adversary) external onlyOwner {
         blacklist[adversary] = true;
         emit Ban(adversary);
     }
@@ -79,11 +64,10 @@ contract BlacklistValidator is
      * @dev Validates token transfer.
      * Implements IValidator interface.
      */
-    function validate(
-        address from,
-        address to,
-        uint amount
-    ) external returns (bool valid) {
+    function validate(address from, address to, uint amount)
+        external
+        returns (bool valid)
+    {
         if (blacklist[from]) {
             valid = false;
         } else {
@@ -96,41 +80,7 @@ contract BlacklistValidator is
      * @dev Explicit override of transferOwnership from Claimable and Ownable
      * @param newOwner Address to transfer ownership to.
      */
-    function transferOwnership(
-        address newOwner
-    ) public override(ClaimableSystemRole, Ownable) {
-        ClaimableSystemRole.transferOwnership(newOwner);
-    }
-
-    /**
-     * @dev Explicit override of addSystemAccount from ClaimableSystemRole
-     * @param account Address to add as system account.
-     */
-    function addSystemAccount(address account) public override onlyOwner {
-        super.addSystemAccount(account);
-    }
-
-    /**
-     * @dev Explicit override of removeSystemAccount from ClaimableSystemRole
-     * @param account Address to remove as system account.
-     */
-    function removeSystemAccount(address account) public override onlyOwner {
-        super.removeSystemAccount(account);
-    }
-
-    /**
-     * @dev Explicit override of addAdminAccount from ClaimableSystemRole
-     * @param account Address to add as admin account.
-     */
-    function addAdminAccount(address account) public override onlyOwner {
-        super.addAdminAccount(account);
-    }
-
-    /**
-     * @dev Explicit override of removeAdminAccount from ClaimableSystemRole
-     * @param account Address to remove as admin account.
-     */
-    function removeAdminAccount(address account) public override onlyOwner {
-        super.removeAdminAccount(account);
+    function transferOwnership(address newOwner) public override(Claimable, Ownable) {
+      Claimable.transferOwnership(newOwner);
     }
 }

contracts/AcceptingRecipient.sol

@@ -25,20 +25,14 @@ import "./SmartController.sol";
  * @dev Constantly rejects token transfers by using a rejecting validator.
  */
 contract ConstantSmartController is SmartController {
+
     /**
      * @dev Contract constructor.
      * @param storage_ Address of the new storage.
      * @param ticker 3 letter currency ticker.
      */
-    constructor(
-        address storage_,
-        bytes3 ticker
-    )
-        SmartController(
-            storage_,
-            address(new ConstantValidator(false)),
-            ticker,
-            address(0x0)
-        )
-    {}
+    constructor(address storage_, bytes3 ticker)
+      SmartController(storage_, address(new ConstantValidator(false)), ticker, address(0x0))
+    { }
+
 }

contracts/BlacklistValidator.sol

@@ -27,6 +27,7 @@ import "./IValidator.sol";
  * @dev Constantly validates token transfers based on the constructor value.
  */
 contract ConstantValidator is IValidator, Claimable, CanReclaimToken, NoOwner {
+
     bool internal valid;
 
     /**
@@ -49,9 +50,7 @@ contract ConstantValidator is IValidator, Claimable, CanReclaimToken, NoOwner {
      * @dev Explicit override of transferOwnership from Claimable and Ownable
      * @param newOwner Address to transfer ownership to.
      */
-    function transferOwnership(
-        address newOwner
-    ) public override(Claimable, Ownable) {
-        Claimable.transferOwnership(newOwner);
+    function transferOwnership(address newOwner) public override(Claimable, Ownable) {
+      Claimable.transferOwnership(newOwner);
     }
 }