Merge pull request #318 from PolymathNetwork/allow_issuance_transfers

Add the ability to bypass issuance transfers
PolymathNetwork · Oct 5, 2018 · a2f50db · a2f50db
2 parents 3b7be9c + 186b9fd
commit a2f50db
Show file tree

Hide file tree

Showing 6 changed files with 1,658 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ All notable changes to this project will be documented in this file.
 [__1.5.0__](https://www.npmjs.com/package/polymath-core?activeTab=readme) __15-08-18__
 
 ## Added
+* Added `SingleTradeVolumeRestrictionManager` module
+* Added flag in `PercentageTransferManager` to allow ignoring of issuance transfers
+* Added `transferWithData`, `transferFromWithData`, `mintWithData`, `burnWithData` to allow passing of a `bytes _data` for off-chain validation
+* Added ability for modules to have multiple types
 * Added `name` field to dividends struct in DividendCheckpoint. #295
 * Added `getTagsByType`, `getTagsByTypeAndToken`, `getModulesByType`, `getModulesByTypeAndToken` to MR
 * Added `getTokensByOwner` to STR

diff --git a/contracts/modules/TransferManager/PercentageTransferManager.sol b/contracts/modules/TransferManager/PercentageTransferManager.sol
@@ -11,10 +11,14 @@ contract PercentageTransferManager is ITransferManager {
 
     // Permission key for modifying the whitelist
     bytes32 public constant WHITELIST = "WHITELIST";
+    bytes32 public constant ADMIN = "ADMIN";
 
     // Maximum percentage that any holder can have, multiplied by 10**16 - e.g. 20% is 20 * 10**16
     uint256 public maxHolderPercentage;
 
+    // Ignore transactions which are part of the primary issuance
+    bool public allowPrimaryIssuance = true;
+
     // Addresses on this list are always able to send / receive tokens
     mapping (address => bool) public whitelist;
 
@@ -25,6 +29,7 @@ contract PercentageTransferManager is ITransferManager {
         address _addedBy,
         bool    _valid
     );
+    event SetAllowPrimaryIssuance(bool _allowPrimaryIssuance, uint256 _timestamp);
 
     /**
      * @notice Constructor
@@ -38,8 +43,11 @@ contract PercentageTransferManager is ITransferManager {
     }
 
     /// @notice Used to verify the transfer transaction according to the rule implemented in the trnasfer managers
-    function verifyTransfer(address /* _from */, address _to, uint256 _amount, bytes /* _data */, bool /* _isTransfer */) public returns(Result) {
+    function verifyTransfer(address _from, address _to, uint256 _amount, bytes /* _data */, bool /* _isTransfer */) public returns(Result) {
         if (!paused) {
+            if (_from == address(0) && allowPrimaryIssuance) {
+                return Result.NA;
+            }
             // If an address is on the whitelist, it is allowed to hold more than maxHolderPercentage of the tokens.
             if (whitelist[_to]) {
                 return Result.NA;
@@ -57,15 +65,16 @@ contract PercentageTransferManager is ITransferManager {
      * @notice Used to intialize the variables of the contract
      * @param _maxHolderPercentage Maximum amount of ST20 tokens(in %) can hold by the investor
      */
-    function configure(uint256 _maxHolderPercentage) public onlyFactory {
+    function configure(uint256 _maxHolderPercentage, bool _allowPrimaryIssuance) public onlyFactory {
         maxHolderPercentage = _maxHolderPercentage;
+        allowPrimaryIssuance = _allowPrimaryIssuance;
     }
 
     /**
      * @notice This function returns the signature of configure function
      */
     function getInitFunction() public pure returns (bytes4) {
-        return bytes4(keccak256("configure(uint256)"));
+        return bytes4(keccak256("configure(uint256,bool)"));
     }
 
     /**
@@ -99,12 +108,23 @@ contract PercentageTransferManager is ITransferManager {
         }
     }
 
+    /**
+    * @notice sets whether or not to consider primary issuance transfers
+    * @param _allowPrimaryIssuance whether to allow all primary issuance transfers
+    */
+    function setAllowPrimaryIssuance(bool _allowPrimaryIssuance) public withPerm(ADMIN) {
+        require(_allowPrimaryIssuance != allowPrimaryIssuance, "Must change setting");
+        allowPrimaryIssuance = _allowPrimaryIssuance;
+        emit SetAllowPrimaryIssuance(_allowPrimaryIssuance, now);
+    }
+
     /**
      * @notice Return the permissions flag that are associated with Percentage transfer Manager
      */
     function getPermissions() public view returns(bytes32[]) {
-        bytes32[] memory allPermissions = new bytes32[](1);
+        bytes32[] memory allPermissions = new bytes32[](2);
         allPermissions[0] = WHITELIST;
+        allPermissions[1] = ADMIN;
         return allPermissions;
     }