Merge branch 'development-1.5.0' into add_dai

PolymathNetwork · Sep 20, 2018 · 6c404e5 · 6c404e5
2 parents 475544f + 69dbc41
commit 6c404e5
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 2 deletions.
diff --git a/contracts/SecurityTokenRegistry.sol b/contracts/SecurityTokenRegistry.sol
@@ -147,7 +147,7 @@ contract SecurityTokenRegistry is ISecurityTokenRegistry, EternalStorage {
      * @param _expiryDate Expiry date of the ticker
      * @param _status Token deployed status
      */
-    function modifyTicker(address _owner, string _ticker, string _tokenName, uint256 _registrationDate, uint256 _expiryDate, bool _status) public onlyOwner {
+    function modifyTicker(address _owner, string _ticker, string _tokenName, uint256 _registrationDate, uint256 _expiryDate, bool _status) external onlyOwner {
         require(bytes(_ticker).length > 0 && bytes(_ticker).length <= 10, "Ticker length range (0,10]");
         require(_expiryDate != 0 && _registrationDate != 0, "Dates should not be 0");
         require(_registrationDate <= _expiryDate, "Registration date should < expiry date");
@@ -177,7 +177,7 @@ contract SecurityTokenRegistry is ISecurityTokenRegistry, EternalStorage {
      * @notice Remove the ticker details and associated ownership & security token mapping
      * @param _ticker token ticker
      */
-    function removeTicker(string _ticker) public onlyOwner {
+    function removeTicker(string _ticker) external onlyOwner {
         string memory ticker = Util.upper(_ticker);
         address owner = getAddress(Encoder.getKey("registeredTickers_owner", ticker));
         require(owner != address(0), "Ticker does not exist");

diff --git a/contracts/interfaces/ISecurityTokenRegistry.sol b/contracts/interfaces/ISecurityTokenRegistry.sol
@@ -96,4 +96,53 @@ interface ISecurityTokenRegistry {
      */
     function getTickerDetails(string _ticker) external view returns (address, uint256, uint256, string, bool);
 
+    /**
+     * @notice Modify the ticker details. Only polymath account has the ability
+     * to do so. Only allowed to modify the tickers which are not yet deployed
+     * @param _owner Owner of the token
+     * @param _ticker token ticker
+     * @param _tokenName Name of the token
+     * @param _registrationDate Date on which ticker get registered
+     * @param _expiryDate Expiry date of the ticker
+     * @param _status Token deployed status
+     */
+    function modifyTicker(address _owner, string _ticker, string _tokenName, uint256 _registrationDate, uint256 _expiryDate, bool _status) external;
+
+     /**
+     * @notice Remove the ticker details and associated ownership & security token mapping
+     * @param _ticker token ticker
+     */
+    function removeTicker(string _ticker) external;
+
+    /**
+     * @notice Transfer the ownership of the ticker
+     * @dev _newOwner Address whom ownership to transfer
+     * @dev _ticker Ticker
+     */
+    function transferTickerOwnership(address _newOwner, string _ticker) external;
+
+    /**
+     * @notice Change the expiry time for the token ticker
+     * @param _newExpiry new time period for token ticker expiry
+     */
+    function changeExpiryLimit(uint256 _newExpiry) external;
+
+    /**
+    * @notice set the ticker registration fee in POLY tokens
+    * @param _tickerRegFee registration fee in POLY tokens (base 18 decimals)
+    */
+   function changeTickerRegistrationFee(uint256 _tickerRegFee) external;
+
+   /**
+    * @notice set the ticker registration fee in POLY tokens
+    * @param _stLaunchFee registration fee in POLY tokens (base 18 decimals)
+    */
+   function changeSecurityLaunchFee(uint256 _stLaunchFee) external;
+
+    /**
+     * @notice Change the PolyToken address
+     * @param _newAddress Address of the polytoken
+     */
+    function updatePolyTokenAddress(address _newAddress) external;
+
 }