Merge pull request #594 from PolymathNetwork/fix-types-tags

Clean up types & tags

Author: maxsam4

contracts/modules/Checkpoint/ERC20/ERC20DividendCheckpoint.sol

@@ -165,6 +165,7 @@ contract ERC20DividendCheckpoint is ERC20DividendCheckpointStorage, DividendChec
         require(_name[0] != 0);
         uint256 dividendIndex = dividends.length;
         uint256 currentSupply = securityTokenInstance.totalSupplyAt(_checkpointId);
+        require(currentSupply > 0, "Invalid supply");
         uint256 excludedSupply = 0;
         dividends.push(
             Dividend(

contracts/modules/Checkpoint/ERC20/ERC20DividendCheckpointFactory.sol

@@ -29,6 +29,10 @@ contract ERC20DividendCheckpointFactory is UpgradableModuleFactory {
         name = "ERC20DividendCheckpoint";
         title = "ERC20 Dividend Checkpoint";
         description = "Create ERC20 dividends for token holders at a specific checkpoint";
+        typesData.push(4);
+        tagsData.push("ERC20");
+        tagsData.push("Dividend");
+        tagsData.push("Checkpoint");
         compatibleSTVersionRange["lowerBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
         compatibleSTVersionRange["upperBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
     }
@@ -43,23 +47,4 @@ contract ERC20DividendCheckpointFactory is UpgradableModuleFactory {
         return erc20DividendCheckpoint;
     }
 
-    /**
-     * @notice Type of the Module factory
-     */
-    function types() external view returns(uint8[] memory) {
-        uint8[] memory res = new uint8[](1);
-        res[0] = 4;
-        return res;
-    }
-
-    /**
-     * @notice Get the tags related to the module factory
-     */
-    function tags() external view returns(bytes32[] memory) {
-        bytes32[] memory availableTags = new bytes32[](3);
-        availableTags[0] = "ERC20";
-        availableTags[1] = "Dividend";
-        availableTags[2] = "Checkpoint";
-        return availableTags;
-    }
 }

contracts/modules/Checkpoint/Ether/EtherDividendCheckpoint.sol

@@ -131,6 +131,7 @@ contract EtherDividendCheckpoint is DividendCheckpoint {
         require(_name[0] != 0);
         uint256 dividendIndex = dividends.length;
         uint256 currentSupply = ISecurityToken(securityToken).totalSupplyAt(_checkpointId);
+        require(currentSupply > 0, "Invalid supply");
         uint256 excludedSupply = 0;
         dividends.push(
             Dividend(

contracts/modules/Checkpoint/Ether/EtherDividendCheckpointFactory.sol

@@ -29,6 +29,10 @@ contract EtherDividendCheckpointFactory is UpgradableModuleFactory {
         name = "EtherDividendCheckpoint";
         title = "Ether Dividend Checkpoint";
         description = "Create ETH dividends for token holders at a specific checkpoint";
+        typesData.push(4);
+        tagsData.push("Ether");
+        tagsData.push("Dividend");
+        tagsData.push("Checkpoint");
         compatibleSTVersionRange["lowerBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
         compatibleSTVersionRange["upperBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
     }
@@ -43,23 +47,4 @@ contract EtherDividendCheckpointFactory is UpgradableModuleFactory {
         return ethDividendCheckpoint;
     }
 
-    /**
-     * @notice Type of the Module factory
-     */
-    function types() external view returns(uint8[] memory) {
-        uint8[] memory res = new uint8[](1);
-        res[0] = 4;
-        return res;
-    }
-
-    /**
-     * @notice Get the tags related to the module factory
-     */
-    function tags() external view returns(bytes32[] memory) {
-        bytes32[] memory availableTags = new bytes32[](3);
-        availableTags[0] = "ETH";
-        availableTags[1] = "Checkpoint";
-        availableTags[2] = "Dividend";
-        return availableTags;
-    }
 }

contracts/modules/Experimental/Burn/TrackedRedemptionFactory.sol

@@ -25,6 +25,9 @@ contract TrackedRedemptionFactory is ModuleFactory {
         name = "TrackedRedemption";
         title = "Tracked Redemption";
         description = "Track token redemptions";
+        typesData.push(5);
+        tagsData.push("Tracked");
+        tagsData.push("Redemption");
         compatibleSTVersionRange["lowerBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
         compatibleSTVersionRange["upperBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
     }
@@ -44,23 +47,4 @@ contract TrackedRedemptionFactory is ModuleFactory {
         return trackedRedemption;
     }
 
-    /**
-     * @notice Type of the Module factory
-     */
-    function types() external view returns(uint8[] memory) {
-        uint8[] memory res = new uint8[](1);
-        res[0] = 5;
-        return res;
-    }
-
-    /**
-     * @notice Get the tags related to the module factory
-     */
-    function tags() external view returns(bytes32[] memory) {
-        bytes32[] memory availableTags = new bytes32[](2);
-        availableTags[0] = "Redemption";
-        availableTags[1] = "Tracked";
-        return availableTags;
-    }
-
 }

contracts/modules/Experimental/Mixed/ScheduledCheckpointFactory.sol

@@ -25,6 +25,10 @@ contract ScheduledCheckpointFactory is ModuleFactory {
         name = "ScheduledCheckpoint";
         title = "Schedule Checkpoints";
         description = "Allows you to schedule checkpoints in the future";
+        typesData.push(4);
+        typesData.push(2);
+        tagsData.push("Scheduled");
+        tagsData.push("Checkpoint");
         compatibleSTVersionRange["lowerBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
         compatibleSTVersionRange["upperBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
     }
@@ -44,23 +48,4 @@ contract ScheduledCheckpointFactory is ModuleFactory {
         return scheduledCheckpoint;
     }
 
-    /**
-     * @notice Type of the Module factory
-     */
-    function types() external view returns(uint8[] memory) {
-        uint8[] memory res = new uint8[](2);
-        res[0] = 4;
-        res[1] = 2;
-        return res;
-    }
-
-    /**
-     * @notice Get the tags related to the module factory
-     */
-    function tags() external view returns(bytes32[] memory) {
-        bytes32[] memory availableTags = new bytes32[](2);
-        availableTags[0] = "Scheduled";
-        availableTags[1] = "Checkpoint";
-        return availableTags;
-    }
 }

contracts/modules/Experimental/TransferManager/BlacklistTransferManagerFactory.sol

@@ -22,6 +22,9 @@ contract BlacklistTransferManagerFactory is ModuleFactory {
         name = "BlacklistTransferManager";
         title = "Blacklist Transfer Manager";
         description = "Automate blacklist to restrict selling";
+        typesData.push(2);
+        tagsData.push("Blacklist");
+        tagsData.push("Transfer Restriction");
         compatibleSTVersionRange["lowerBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
         compatibleSTVersionRange["upperBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
     }
@@ -36,23 +39,4 @@ contract BlacklistTransferManagerFactory is ModuleFactory {
         return blacklistTransferManager;
     }
 
-    /**
-     * @notice Type of the Module factory
-     */
-    function types() external view returns(uint8[] memory) {
-        uint8[] memory res = new uint8[](1);
-        res[0] = 2;
-        return res;
-    }
-
-    /**
-     * @notice Get the tags related to the module factory
-     */
-    function tags() public view returns(bytes32[] memory) {
-        bytes32[] memory availableTags = new bytes32[](2);
-        availableTags[0] = "Blacklist";
-        availableTags[1] = "Restricted transfer";
-        return availableTags;
-    }
-
 }

contracts/modules/Experimental/TransferManager/KYCTransferManagerFactory.sol

@@ -16,6 +16,10 @@ contract KYCTransferManagerFactory is ModuleFactory {
         name = "KYCTransferManager";
         title = "KYC Transfer Manager";
         description = "Manages KYC";
+        typesData.push(2);
+        typesData.push(6);
+        tagsData.push("KYC");
+        tagsData.push("Transfer Restriction");
         compatibleSTVersionRange["lowerBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
         compatibleSTVersionRange["upperBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
     }
@@ -31,24 +35,4 @@ contract KYCTransferManagerFactory is ModuleFactory {
         return kycTransferManager;
     }
 
-
-    /**
-     * @notice Type of the Module factory
-     */
-    function types() external view returns(uint8[] memory) {
-        uint8[] memory res = new uint8[](2);
-        res[0] = 2;
-        res[1] = 6;
-        return res;
-    }
-
-    /**
-     * @notice Get the tags related to the module factory
-     */
-    function tags() public view returns(bytes32[] memory) {
-        bytes32[] memory availableTags = new bytes32[](1);
-        availableTags[0] = "KYC";
-        return availableTags;
-    }
-
 }

contracts/modules/Experimental/TransferManager/LTM/LockUpTransferManagerFactory.sol

@@ -27,6 +27,9 @@ contract LockUpTransferManagerFactory is UpgradableModuleFactory {
         name = "LockUpTransferManager";
         title = "LockUp Transfer Manager";
         description = "Manage transfers using lock ups over time";
+        typesData.push(2);
+        tagsData.push("LockUp");
+        tagsData.push("Transfer Restriction");
         compatibleSTVersionRange["lowerBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
         compatibleSTVersionRange["upperBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
     }
@@ -46,24 +49,4 @@ contract LockUpTransferManagerFactory is UpgradableModuleFactory {
         return lockUpTransferManager;
     }
 
-    /**
-     * @notice Type of the Module factory
-     * @return uint8
-     */
-    function types() external view returns(uint8[] memory) {
-        uint8[] memory res = new uint8[](1);
-        res[0] = 2;
-        return res;
-    }
-
-    /**
-     * @notice Get the tags related to the module factory
-     */
-    function tags() external view returns(bytes32[] memory) {
-        bytes32[] memory availableTags = new bytes32[](2);
-        availableTags[0] = "LockUp";
-        availableTags[1] = "Transfer Restriction";
-        return availableTags;
-    }
-
 }

contracts/modules/Experimental/TransferManager/SignedTransferManagerFactory.sol

@@ -18,6 +18,10 @@ contract SignedTransferManagerFactory is ModuleFactory {
         name = "SignedTransferManager";
         title = "Signed Transfer Manager";
         description = "Manage transfers using a signature";
+        typesData.push(2);
+        typesData.push(6);
+        tagsData.push("Signed");
+        tagsData.push("Transfer Restriction");
         compatibleSTVersionRange["lowerBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
         compatibleSTVersionRange["upperBound"] = VersionUtils.pack(uint8(0), uint8(0), uint8(0));
     }
@@ -33,26 +37,4 @@ contract SignedTransferManagerFactory is ModuleFactory {
         return signedTransferManager;
     }
 
-
-    /**
-     * @notice Type of the Module factory
-     */
-    function types() external view returns(uint8[] memory) {
-        uint8[] memory res = new uint8[](2);
-        res[0] = 2;
-        res[1] = 6;
-        return res;
-    }
-
-    /**
-     * @notice Get the tags related to the module factory
-     */
-    function tags() public view returns(bytes32[] memory) {
-        bytes32[] memory availableTags = new bytes32[](2);
-        availableTags[0] = "Signed";
-        availableTags[1] = "Transfer Restriction";
-        return availableTags;
-    }
-
-
 }