DS deployment

Author: maxsam4

contracts/datastore/DataStore.sol

@@ -5,20 +5,6 @@ import "../interfaces/IOwnable.sol";
 import "./DataStoreStorage.sol";
 
 contract DataStore is 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;
 
     modifier onlyDataModuleWithValidKey(bytes32 _key) {
         require(_key != bytes32(0), "Missing key");

contracts/proxy/DataStoreProxy.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.5.0;
 
 import "./OwnedProxy.sol";
-import "../DataStore/DataStoreStorage.sol";
+import "../datastore/DataStoreStorage.sol";
 
 /**
  * @title DataStoreProxy Proxy

contracts/tokens/STFactory.sol

@@ -2,15 +2,18 @@ pragma solidity ^0.5.0;
 
 import "./SecurityToken.sol";
 import "../interfaces/ISTFactory.sol";
+import "../datastore/DataStoreFactory.sol";
 
 /**
  * @title Proxy for deploying SecurityToken instances
  */
 contract STFactory is ISTFactory {
     address public transferManagerFactory;
+    DataStoreFactory public dataStoreFactory;
 
-    constructor(address _transferManagerFactory) public {
+    constructor(address _transferManagerFactory, address _dataStoreFactory) public {
         transferManagerFactory = _transferManagerFactory;
+        dataStoreFactory = DataStoreFactory(_dataStoreFactory);
     }
 
     /**
@@ -38,6 +41,7 @@ contract STFactory is ISTFactory {
             _polymathRegistry
         );
         newSecurityToken.addModule(transferManagerFactory, "", 0, 0);
+        newSecurityToken.setDataStore(dataStoreFactory.generateDataStore(address(newSecurityToken)));
         newSecurityToken.transferOwnership(_issuer);
         return address(newSecurityToken);
     }

contracts/tokens/SecurityToken.sol

@@ -46,6 +46,7 @@ contract SecurityToken is ERC20, ERC20Detailed, ReentrancyGuard, RegistryUpdater
     uint8 constant MINT_KEY = 3;
     uint8 constant CHECKPOINT_KEY = 4;
     uint8 constant BURN_KEY = 5;
+    uint8 constant DATA_KEY = 10;
 
     uint256 public granularity;
 
@@ -64,6 +65,8 @@ contract SecurityToken is ERC20, ERC20Detailed, ReentrancyGuard, RegistryUpdater
     // Address whitelisted by issuer as controller
     address public controller;
 
+    address public dataStore;
+
     // Records added modules - module list should be order agnostic!
     mapping(uint8 => address[]) modules;
 
@@ -207,6 +210,11 @@ contract SecurityToken is ERC20, ERC20Detailed, ReentrancyGuard, RegistryUpdater
         securityTokenVersion = SemanticVersion(2, 0, 0);
     }
 
+    function setDataStore(address _dataStore) public {
+        require(_dataStore != address(0), "Invalid address");
+        dataStore = _dataStore;
+    }
+
      /**
       * @notice Attachs a module to the SecurityToken
       * @dev  E.G.: On deployment (through the STR) ST gets a TransferManager module attached to it

migrations/2_deploy_contracts.js

@@ -28,7 +28,8 @@ const MockOracle = artifacts.require("./MockOracle.sol");
 const TokenLib = artifacts.require("./TokenLib.sol");
 const SecurityToken = artifacts.require("./tokens/SecurityToken.sol");
 const STRGetter = artifacts.require('./STRGetter.sol');
-
+const DataStoreLogic = artifacts.require('./DataStore.sol');
+const DataStoreFactory = artifacts.require('./DataStoreFactory.sol');
 
 const Web3 = require("web3");
 let BN = Web3.utils.BN;
@@ -246,6 +247,14 @@ module.exports = function(deployer, network, accounts) {
             // manager attach with the securityToken contract at the time of deployment)
             return deployer.deploy(CappedSTOLogic, nullAddress, nullAddress, { from: PolymathAccount });
         })
+        .then(() => {
+            // B) Deploy the DataStoreLogic Contract
+            return deployer.deploy(DataStoreLogic, { from: PolymathAccount });
+        })
+        .then(() => {
+            // B) Deploy the DataStoreFactory Contract
+            return deployer.deploy(DataStoreFactory, DataStoreLogic.address, { from: PolymathAccount });
+        })
         .then(() => {
             // B) Deploy the GeneralTransferManagerFactory Contract (Factory used to generate the GeneralTransferManager contract and this
             // manager attach with the securityToken contract at the time of deployment)
@@ -297,7 +306,7 @@ module.exports = function(deployer, network, accounts) {
         })
         .then(() => {
             // H) Deploy the STVersionProxy001 Contract which contains the logic of deployment of securityToken.
-            return deployer.deploy(STFactory, GeneralTransferManagerFactory.address, { from: PolymathAccount });
+            return deployer.deploy(STFactory, GeneralTransferManagerFactory.address, DataStoreFactory.address, { from: PolymathAccount });
         })
         .then(() => {
             // K) Deploy the FeatureRegistry contract to control feature switches