Add storage varibable #16

kaonone · Jan 6, 2019 · 79565a3 · 79565a3
1 parent 5611f5c
commit 79565a3
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 78 deletions.
diff --git a/contracts/helpers/Whitelist.sol b/contracts/helpers/Whitelist.sol
@@ -16,13 +16,11 @@ contract Whitelist is Ownable {
 
     mapping(address => bool) whitelist;
 
-    bool public whitelisted = false;
-
     /**
     * @dev Modifier to make a function callable only when msg.sender is in whitelist.
     */
     modifier onlyWhitelist() {
-        if (whitelisted == true) {
+        if (isWhitelisted() == true) {
             require(whitelist[msg.sender] == true, "Address is not in whitelist");
         }
         _;
@@ -33,7 +31,7 @@ contract Whitelist is Ownable {
     */
 
     function enableWhitelist() public onlyOwner {
-        whitelisted = true;
+        setWhitelisted(true);
         emit EnableWhitelist();
     }
 
@@ -42,7 +40,7 @@ contract Whitelist is Ownable {
     * @dev called by the owner to disable whitelist
     */
     function disableWhitelist() public onlyOwner {
-        whitelisted = false;
+        setWhitelisted(false);
         emit DisableWhitelist();
     }
 
@@ -61,4 +59,24 @@ contract Whitelist is Ownable {
         whitelist[_address] = false;
         emit RemoveFromWhitelist(_address);
     }
+
+
+    // bool public whitelisted = false;
+
+    function setWhitelisted(bool value) internal {
+        bytes32 slot = keccak256(abi.encode("Whitelist", "whitelisted"));
+        uint256 v = value ? 1 : 0;
+        assembly {
+            sstore(slot, v)
+        }
+    }
+
+    function isWhitelisted() public view returns (bool) {
+        bytes32 slot = keccak256(abi.encode("Whitelist", "whitelisted"));
+        uint256 v;
+        assembly {
+            v := sload(slot)
+        }
+        return v != 0;
+    }
 }
diff --git a/contracts/token/AkropolisBaseToken.sol b/contracts/token/AkropolisBaseToken.sol
@@ -4,7 +4,7 @@ import "./dataStorage/TokenStorage.sol";
 import "openzeppelin-solidity/contracts/math/SafeMath.sol";
 import "openzeppelin-solidity/contracts/AddressUtils.sol";
 import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";
-import '../helpers/Ownable.sol';
+import "../helpers/Ownable.sol";
 
 /**
 * @title AkropolisBaseToken
@@ -20,8 +20,8 @@ contract AkropolisBaseToken is ERC20, TokenStorage, Ownable {
     event Approval(address indexed owner, address indexed spender, uint256 value);
 
 
-    constructor (address _balances, address _allowances) public 
-    TokenStorage(_balances, _allowances) {}
+    constructor (address _balances, address _allowances, string _name, uint8 _decimals, string _symbol) public 
+    TokenStorage(_balances, _allowances, _name, _decimals, _symbol) {}
 
     /** Modifiers **/
 

diff --git a/contracts/token/TokenProxy.sol b/contracts/token/TokenProxy.sol
@@ -2,24 +2,17 @@ pragma solidity ^0.4.24;
 
 import "./dataStorage/TokenStorage.sol";
 import "zos-lib/contracts/upgradeability/UpgradeabilityProxy.sol";
-import '../helpers/Ownable.sol';
+import "../helpers/Ownable.sol";
+import "./dataStorage/StorageState.sol";
 
 /**
 * @title TokenProxy
 * @notice A proxy contract that serves the latest implementation of TokenProxy.
 */
-contract TokenProxy is UpgradeabilityProxy, TokenStorage, Ownable {
-
-    string public name;   //name of Token                
-    uint8  public decimals;        //decimals of Token        
-    string public symbol;   //Symbol of Token
-
+contract TokenProxy is UpgradeabilityProxy, TokenStorage, Ownable, StorageState {
     constructor(address _implementation, address _balances, address _allowances, string _name, uint8 _decimals, string _symbol) 
     UpgradeabilityProxy(_implementation) 
-    TokenStorage(_balances, _allowances) public {
-        name = _name;
-        decimals = _decimals;
-        symbol = _symbol;
+    TokenStorage(_balances, _allowances, _name, _decimals, _symbol) public {
     }
 
     /**

diff --git a/contracts/token/TokenProxyDelayed.sol b/contracts/token/TokenProxyDelayed.sol
@@ -10,9 +10,9 @@ import '../helpers/Ownable.sol';
 * upgrades only after a set amount of time (denominated in blocks mined) 
 */
 contract TokenProxyDelayed is DelayedUpgradeabilityProxy, TokenStorage, Ownable {
-    constructor(address _implementation, address _balances, address _allowances) 
+    constructor(address _implementation, address _balances, address _allowances, string _name, uint8 _decimals, string _symbol) 
     DelayedUpgradeabilityProxy(_implementation) 
-    TokenStorage(_balances, _allowances) public {}
+    TokenStorage(_balances, _allowances, _name, _decimals, _symbol) public {}
 
     /**
     * @dev Upgrade the backing implementation of the proxy.

diff --git a/contracts/token/dataStorage/KeyValueStorage.sol b/contracts/token/dataStorage/KeyValueStorage.sol
diff --git a/contracts/token/dataStorage/TokenStorage.sol b/contracts/token/dataStorage/TokenStorage.sol
@@ -13,13 +13,22 @@ contract TokenStorage {
     BalanceSheet public balances;
     AllowanceSheet public allowances;
 
+
+    string public name;   //name of Token                
+    uint8  public decimals;        //decimals of Token        
+    string public symbol;   //Symbol of Token
+
     /**
     * @dev a TokenStorage consumer can set its storages only once, on construction
     *
     **/
-    constructor (address _balances, address _allowances) public {
+    constructor (address _balances, address _allowances, string _name, uint8 _decimals, string _symbol) public {
         balances = BalanceSheet(_balances);
         allowances = AllowanceSheet(_allowances);
+
+        name = _name;
+        decimals = _decimals;
+        symbol = _symbol;
     }
 
     /**