wip ds proxy

Author: maxsam4

contracts/DataStore.sol renamed to contracts/datastore/DataStore.sol

@@ -1,9 +1,10 @@
 pragma solidity ^0.5.0;
 
-import "./interfaces/ISecurityToken.sol";
-import "./interfaces/IOwnable.sol";
+import "../interfaces/ISecurityToken.sol";
+import "../interfaces/IOwnable.sol";
+import "./DataStoreStorage.sol";
 
-contract DataStore {
+contract DataStore is DataStoreStorage {
     ISecurityToken public associatedToken;
 
     mapping (bytes32 => uint256) internal uintData;

contracts/datastore/DataStoreFactory.sol

@@ -0,0 +1,18 @@
+pragma solidity ^0.5.0;
+
+import "../proxy/DataStoreProxy.sol";
+
+contract DataStoreFactory {
+
+    address public implementation;
+
+    constructor(address _implementation) public {
+        require(_implementation != address(0), "Address should not be 0x");
+        implementation = _implementation;
+    }
+
+    function generateDataStore(address _securityToken) public returns (address) {
+        DataStoreProxy dsProxy = new DataStoreProxy(_securityToken, implementation);
+        return address(dsProxy);
+    }
+}

contracts/datastore/DataStoreStorage.sol

@@ -0,0 +1,20 @@
+pragma solidity ^0.5.0;
+
+import "../interfaces/ISecurityToken.sol";
+
+contract DataStoreStorage {
+    ISecurityToken public associatedToken;
+
+    mapping (bytes32 => uint256) internal uintData;
+    mapping (bytes32 => bytes32) internal bytes32Data;
+    mapping (bytes32 => address) internal addressData;
+    mapping (bytes32 => string) internal stringData;
+    mapping (bytes32 => bytes) internal bytesData;
+    mapping (bytes32 => bool) internal boolData;
+    mapping (bytes32 => uint256[]) internal uintArrayData;
+    mapping (bytes32 => bytes32[]) internal bytes32ArrayData;
+    mapping (bytes32 => address[]) internal addressArrayData;
+    mapping (bytes32 => bool[]) internal boolArrayData;
+
+    uint8 constant DATA_KEY = 10;
+}

contracts/proxy/DataStoreProxy.sol

@@ -0,0 +1,29 @@
+pragma solidity ^0.5.0;
+
+import "./OwnedProxy.sol";
+import "../DataStore/DataStoreStorage.sol";
+
+/**
+ * @title DataStoreProxy Proxy
+ */
+contract DataStoreProxy is DataStoreStorage, OwnedProxy {
+
+    /**
+    * @notice Constructor
+    * @param _securityToken Address of the security token
+    * @param _implementation representing the address of the new implementation to be set
+    */
+    constructor(
+        address _securityToken, 
+        address _implementation
+    )
+        public
+    {
+        require(_implementation != address(0) && _securityToken != address(0),
+            "Address should not be 0x"
+        );
+        associatedToken = ISecurityToken(_securityToken);
+        __implementation = _implementation;
+    }
+
+}