Multiple stable coins support in USD Tiered STO

CHANGELOG.md

@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 [__2.1.0__](https://www.npmjs.com/package/polymath-core?activeTab=readme) __13-09-18__
 
 # USDTieredSTO 2.0.1
+* Added support for multiple stable coins in USDTSTO.
 * Added `buyTokensView` and `getTokensMintedByTier` to USDTSTO.
 * Added `getSTODetails` to USDTSTO.
 * Added an Array of Tiers that will hold data about every tier in USDTSTO.

contracts/modules/STO/ISTO.sol

@@ -11,7 +11,7 @@ import "openzeppelin-solidity/contracts/math/SafeMath.sol";
 contract ISTO is Module, Pausable  {
     using SafeMath for uint256;
 
-    enum FundRaiseType { ETH, POLY, DAI }
+    enum FundRaiseType { ETH, POLY, SC }
     mapping (uint8 => bool) public fundRaiseTypes;
     mapping (uint8 => uint256) public fundsRaised;
 
@@ -76,7 +76,7 @@ contract ISTO is Module, Pausable  {
         require(_fundRaiseTypes.length > 0, "Raise type is not specified");
         fundRaiseTypes[uint8(FundRaiseType.ETH)] = false;
         fundRaiseTypes[uint8(FundRaiseType.POLY)] = false;
-        fundRaiseTypes[uint8(FundRaiseType.DAI)] = false;
+        fundRaiseTypes[uint8(FundRaiseType.SC)] = false;
         for (uint8 j = 0; j < _fundRaiseTypes.length; j++) {
             fundRaiseTypes[uint8(_fundRaiseTypes[j])] = true;
         }

contracts/modules/STO/USDTieredSTO.sol

@@ -18,6 +18,7 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
     // Storage //
     /////////////
     struct Tier {
+        // NB rates mentioned below are actually price and are used like price in the logic.
         // How many token units a buyer gets per USD in this tier (multiplied by 10**18)
         uint256 rate;
 
@@ -44,20 +45,21 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
     string public ETH_ORACLE = "EthUsdOracle";
     mapping (bytes32 => mapping (bytes32 => string)) oracleKeys;
 
-    IERC20 public usdToken;
-
     // Determine whether users can invest on behalf of a beneficiary
     bool public allowBeneficialInvestments = false;
 
     // Whether or not the STO has been finalized
     bool public isFinalized;
 
-    // Address where ETH, POLY & DAI funds are delivered
+    // Address where ETH, POLY & Stable Coin funds are delivered
     address public wallet;
 
     // Address of issuer reserve wallet for unsold tokens
     address public reserveWallet;
 
+    // List of stable coin addresses
+    address[] public usdTokens;
+
     // Current tier
     uint256 public currentTier;
 
@@ -73,6 +75,9 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
     // List of accredited investors
     mapping (address => bool) public accredited;
 
+    // List of active stable coin addresses
+    mapping (address => bool) public usdTokenEnabled;
+
     // Default limit in USD for non-accredited investors multiplied by 10**18
     uint256 public nonAccreditedLimitUSD;
 
@@ -116,7 +121,7 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
     event SetAddresses(
         address indexed _wallet,
         address indexed _reserveWallet,
-        address indexed _usdToken
+        address[] _usdTokens
     );
     event SetLimits(
         uint256 _nonAccreditedLimitUSD,
@@ -149,8 +154,9 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
         _;
     }
 
-    modifier validDAI {
-        require(fundRaiseTypes[uint8(FundRaiseType.DAI)], "DAI not allowed");
+    modifier validSC(address _usdToken) {
+        require(fundRaiseTypes[uint8(FundRaiseType.SC)], "Stable coins not allowed");
+        require(usdTokenEnabled[_usdToken], "Invalid USD token");
         _;
     }
 
@@ -176,7 +182,7 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
      * @param _fundRaiseTypes Types of currency used to collect the funds
      * @param _wallet Ethereum account address to hold the funds
      * @param _reserveWallet Ethereum account address to receive unsold tokens
-     * @param _usdToken Contract address of the stable coin
+     * @param _usdTokens Array of contract addressess of the stable coins
      */
     function configure(
         uint256 _startTime,
@@ -190,14 +196,14 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
         FundRaiseType[] _fundRaiseTypes,
         address _wallet,
         address _reserveWallet,
-        address _usdToken
+        address[] _usdTokens
     ) public onlyFactory {
         require(endTime == 0, "Already configured");
         _modifyTimes(_startTime, _endTime);
         _modifyTiers(_ratePerTier, _ratePerTierDiscountPoly, _tokensPerTierTotal, _tokensPerTierDiscountPoly);
         // NB - _setFundRaiseType must come before modifyAddresses
         _setFundRaiseType(_fundRaiseTypes);
-        _modifyAddresses(_wallet, _reserveWallet, _usdToken);
+        _modifyAddresses(_wallet, _reserveWallet, _usdTokens);
         _modifyLimits(_nonAccreditedLimitUSD, _minimumInvestmentUSD);
     }
 
@@ -261,16 +267,16 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
      * @dev Modifies addresses used as wallet, reserve wallet and usd token
      * @param _wallet Address of wallet where funds are sent
      * @param _reserveWallet Address of wallet where unsold tokens are sent
-     * @param _usdToken Address of usd token (DAI)
+     * @param _usdTokens Address of usd tokens
      */
     function modifyAddresses(
         address _wallet,
         address _reserveWallet,
-        address _usdToken
+        address[] _usdTokens
     ) external onlyOwner {
         /*solium-disable-next-line security/no-block-members*/
-        require(now < startTime, "STO already started");
-        _modifyAddresses(_wallet, _reserveWallet, _usdToken);
+        // require(now < startTime, "STO already started");
+        _modifyAddresses(_wallet, _reserveWallet, _usdTokens);
     }
 
     function _modifyLimits(
@@ -319,16 +325,24 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
     function _modifyAddresses(
         address _wallet,
         address _reserveWallet,
-        address _usdToken
+        address[] _usdTokens
     ) internal {
         require(_wallet != address(0) && _reserveWallet != address(0), "Invalid wallet");
-        if (fundRaiseTypes[uint8(FundRaiseType.DAI)]) {
-            require(_usdToken != address(0), "Invalid usdToken");
-        }
         wallet = _wallet;
         reserveWallet = _reserveWallet;
-        usdToken = IERC20(_usdToken);
-        emit SetAddresses(_wallet, _reserveWallet, _usdToken);
+        _modifyUSDTokens(_usdTokens);
+    }
+
+    function _modifyUSDTokens(address[] _usdTokens) internal {
+        for(uint256 i = 0; i < usdTokens.length; i++) {
+            usdTokenEnabled[usdTokens[i]] = false;
+        }
+        usdTokens = _usdTokens;
+        for(i = 0; i < _usdTokens.length; i++) {
+            require(_usdTokens[i] != address(0), "Invalid USD token");
+            usdTokenEnabled[_usdTokens[i]] = true;
+        }
+        emit SetAddresses(wallet, reserveWallet, _usdTokens);
     }
 
     ////////////////////
@@ -417,8 +431,8 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
         buyWithPOLYRateLimited(_beneficiary, _investedPOLY, 0);
     }
 
-    function buyWithUSD(address _beneficiary, uint256 _investedDAI) external {
-        buyWithUSDRateLimited(_beneficiary, _investedDAI, 0);
+    function buyWithUSD(address _beneficiary, uint256 _investedSC, IERC20 _usdToken) external {
+        buyWithUSDRateLimited(_beneficiary, _investedSC, 0, _usdToken);
     }
 
     /**
@@ -448,39 +462,41 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
       * @param _minTokens Minumum number of tokens to buy or else revert
       */
     function buyWithPOLYRateLimited(address _beneficiary, uint256 _investedPOLY, uint256 _minTokens) public validPOLY {
-        _buyWithTokens(_beneficiary, _investedPOLY, FundRaiseType.POLY, _minTokens);
+        _buyWithTokens(_beneficiary, _investedPOLY, FundRaiseType.POLY, _minTokens, polyToken);
     }
 
     /**
-      * @notice Purchase tokens using DAI
+      * @notice Purchase tokens using Stable coins
       * @param _beneficiary Address where security tokens will be sent
-      * @param _investedDAI Amount of DAI invested
+      * @param _investedSC Amount of Stable coins invested
       * @param _minTokens Minumum number of tokens to buy or else revert
+      * @param _usdToken Address of USD stable coin to buy tokens with
       */
-    function buyWithUSDRateLimited(address _beneficiary, uint256 _investedDAI, uint256 _minTokens) public validDAI {
-        _buyWithTokens(_beneficiary, _investedDAI, FundRaiseType.DAI, _minTokens);
+    function buyWithUSDRateLimited(address _beneficiary, uint256 _investedSC, uint256 _minTokens, IERC20 _usdToken) 
+        public validSC(_usdToken) 
+    {
+        _buyWithTokens(_beneficiary, _investedSC, FundRaiseType.SC, _minTokens, _usdToken);
     }
 
-    function _buyWithTokens(address _beneficiary, uint256 _tokenAmount, FundRaiseType _fundRaiseType, uint256 _minTokens) internal {
-        require(_fundRaiseType == FundRaiseType.POLY || _fundRaiseType == FundRaiseType.DAI, "Invalid raise type");
+    function _buyWithTokens(address _beneficiary, uint256 _tokenAmount, FundRaiseType _fundRaiseType, uint256 _minTokens, IERC20 _token) internal {
+        require(_fundRaiseType == FundRaiseType.POLY || _fundRaiseType == FundRaiseType.SC, "Invalid raise type");
         uint256 initialMinted = getTokensMinted();
         uint256 rate = getRate(_fundRaiseType);
         (uint256 spentUSD, uint256 spentValue) = _buyTokens(_beneficiary, _tokenAmount, rate, _fundRaiseType);
         require(getTokensMinted().sub(initialMinted) >= _minTokens, "Insufficient tokens minted");
         // Modify storage
         investorInvested[_beneficiary][uint8(_fundRaiseType)] = investorInvested[_beneficiary][uint8(_fundRaiseType)].add(spentValue);
         fundsRaised[uint8(_fundRaiseType)] = fundsRaised[uint8(_fundRaiseType)].add(spentValue);
-        // Forward DAI to issuer wallet
-        IERC20 token = _fundRaiseType == FundRaiseType.POLY ? polyToken : usdToken;
-        require(token.transferFrom(msg.sender, wallet, spentValue), "Transfer failed");
+        // Forward coins to issuer wallet
+        require(_token.transferFrom(msg.sender, wallet, spentValue), "Transfer failed");
         emit FundsReceived(msg.sender, _beneficiary, spentUSD, _fundRaiseType, _tokenAmount, spentValue, rate);
     }
 
     /**
       * @notice Low level token purchase
       * @param _beneficiary Address where security tokens will be sent
-      * @param _investmentValue Amount of POLY, ETH or DAI invested
-      * @param _fundRaiseType Fund raise type (POLY, ETH, DAI)
+      * @param _investmentValue Amount of POLY, ETH or Stable coins invested
+      * @param _fundRaiseType Fund raise type (POLY, ETH, SC)
       */
     function _buyTokens(
         address _beneficiary,
@@ -530,8 +546,8 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
     /**
       * @notice Getter function for buyer to calculate how many tokens will they get
       * @param _beneficiary Address where security tokens are to be sent
-      * @param _investmentValue Amount of POLY, ETH or DAI invested
-      * @param _fundRaiseType Fund raise type (POLY, ETH, DAI)
+      * @param _investmentValue Amount of POLY, ETH or Stable coins invested
+      * @param _fundRaiseType Fund raise type (POLY, ETH, SC)
       */
     function buyTokensView(
         address _beneficiary,
@@ -542,7 +558,7 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
         view
         returns(uint256 spentUSD, uint256 spentValue, uint256 tokensMinted)
     {
-        require(_fundRaiseType == FundRaiseType.POLY || _fundRaiseType == FundRaiseType.DAI || _fundRaiseType == FundRaiseType.ETH, "Invalid raise type");
+        require(_fundRaiseType == FundRaiseType.POLY || _fundRaiseType == FundRaiseType.SC || _fundRaiseType == FundRaiseType.ETH, "Invalid raise type");
         uint256 rate = getRate(_fundRaiseType);
         uint256 originalUSD = DecimalMath.mul(rate, _investmentValue);
         uint256 allowedUSD = _buyTokensChecks(_beneficiary, _investmentValue, originalUSD);
@@ -749,7 +765,7 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
             return IOracle(_getOracle(bytes32("ETH"), bytes32("USD"))).getPrice();
         } else if (_fundRaiseType == FundRaiseType.POLY) {
             return IOracle(_getOracle(bytes32("POLY"), bytes32("USD"))).getPrice();
-        } else if (_fundRaiseType == FundRaiseType.DAI) {
+        } else if (_fundRaiseType == FundRaiseType.SC) {
             return 1 * 10**18;
         } else {
             revert("Incorrect funding");
@@ -803,7 +819,7 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
 
     /**
      * @notice Return the total no. of tokens sold for the given fund raise type
-     * param _fundRaiseType The fund raising currency (e.g. ETH, POLY, DAI) to calculate sold tokens for
+     * param _fundRaiseType The fund raising currency (e.g. ETH, POLY, SC) to calculate sold tokens for
      * @return uint256 Total number of tokens sold for ETH
      */
     function getTokensSoldFor(FundRaiseType _fundRaiseType) public view returns (uint256) {
@@ -824,7 +840,7 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
         uint256[] memory tokensMinted = new uint256[](3);
         tokensMinted[0] = tiers[_tier].minted[uint8(FundRaiseType.ETH)];
         tokensMinted[1] = tiers[_tier].minted[uint8(FundRaiseType.POLY)];
-        tokensMinted[2] = tiers[_tier].minted[uint8(FundRaiseType.DAI)];
+        tokensMinted[2] = tiers[_tier].minted[uint8(FundRaiseType.SC)];
         return tokensMinted;
     }
 
@@ -838,7 +854,7 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
         uint256 tokensSold;
         tokensSold = tokensSold.add(tiers[_tier].minted[uint8(FundRaiseType.ETH)]);
         tokensSold = tokensSold.add(tiers[_tier].minted[uint8(FundRaiseType.POLY)]);
-        tokensSold = tokensSold.add(tiers[_tier].minted[uint8(FundRaiseType.DAI)]);
+        tokensSold = tokensSold.add(tiers[_tier].minted[uint8(FundRaiseType.SC)]);
         return tokensSold;
     }
 
@@ -868,7 +884,7 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
      * @return Amount of funds raised
      * @return Number of individual investors this STO have.
      * @return Amount of tokens sold.
-     * @return Array of bools to show if funding is allowed in ETH, POLY, DAI respectively
+     * @return Array of bools to show if funding is allowed in ETH, POLY, SC respectively
      */
     function getSTODetails() public view returns(uint256, uint256, uint256, uint256[], uint256[], uint256, uint256, uint256, bool[]) {
         uint256[] memory cap = new uint256[](tiers.length);
@@ -880,7 +896,7 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
         bool[] memory _fundRaiseTypes = new bool[](3);
         _fundRaiseTypes[0] = fundRaiseTypes[uint8(FundRaiseType.ETH)];
         _fundRaiseTypes[1] = fundRaiseTypes[uint8(FundRaiseType.POLY)];
-        _fundRaiseTypes[2] = fundRaiseTypes[uint8(FundRaiseType.DAI)];
+        _fundRaiseTypes[2] = fundRaiseTypes[uint8(FundRaiseType.SC)];
         return (
             startTime,
             endTime,
@@ -899,7 +915,7 @@ contract USDTieredSTO is ISTO, ReentrancyGuard {
      * @return bytes4 Configure function signature
      */
     function getInitFunction() public pure returns (bytes4) {
-        return 0xb0ff041e;
+        return 0xeac2f9e4;
     }
 
     function _getOracle(bytes32 _currency, bytes32 _denominatedCurrency) internal view returns (address) {