Merge Develop into Master

contracts/ERC20Interface.sol

@@ -0,0 +1,37 @@
+pragma solidity 0.5.2;
+
+/**
+ * @title ERC20 interface
+ * @dev see https://github.com/ethereum/EIPs/issues/20
+ * @notice interface contract from Zeppelin token erc20;
+ */
+interface ERC20Interface {
+  function totalSupply() external view returns (uint256);
+
+  function decimals() external view returns (uint256);
+
+  function balanceOf(address who) external view returns (uint256);
+
+  function allowance(address owner, address spender)
+    external view returns (uint256);
+
+  function transfer(address to, uint256 value) external returns (bool);
+
+  function approve(address spender, uint256 value)
+    external returns (bool);
+
+  function transferFrom(address from, address to, uint256 value)
+    external returns (bool);
+
+  event Transfer(
+    address indexed from,
+    address indexed to,
+    uint256 value
+  );
+
+  event Approval(
+    address indexed owner,
+    address indexed spender,
+    uint256 value
+  );
+}

contracts/Migrations.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.4.24;
+pragma solidity 0.5.2;
 
 contract Migrations {
   address public owner;

contracts/Ownable.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.4.24;
+pragma solidity 0.5.2;
 
 
 

contracts/SafeMath.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.4.24;
+pragma solidity 0.5.2;
 
 
 /**

contracts/TokenIOAuthority.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.4.24;
+pragma solidity 0.5.2;
 
 /*
 COPYRIGHT 2018 Token, Inc.
@@ -31,6 +31,8 @@ contract TokenIOAuthority is Ownable {
     using TokenIOLib for TokenIOLib.Data;
     TokenIOLib.Data lib;
 
+    address public proxyInstance;
+
     /**
      * @notice Constructor method for Authority contract
      * @param _storageContract Ethereum Address of TokenIOStorage contract
@@ -48,13 +50,20 @@ contract TokenIOAuthority is Ownable {
         owner[msg.sender] = true;
     }
 
+    function initProxy(address _proxy) public onlyOwner {
+      require(_proxy != address(0));
+
+      proxyInstance = _proxy;
+      lib.proxyInstance = _proxy;
+    }
+
     /**
      * @notice Registers a firm as authorized true/false
      * @param firmName Name of firm
      * @param _authorized Authorization status
      * @return {"success" : "Returns true if lib.setRegisteredFirm succeeds"}
      */
-    function setRegisteredFirm(string firmName, bool _authorized) public onlyAuthority(firmName, msg.sender) returns (bool success) {
+    function setRegisteredFirm(string memory firmName, bool _authorized, address sender) public onlyAuthority(firmName, sender) returns (bool success) {
         /// @notice set firm registration status
         require(
           lib.setRegisteredFirm(firmName, _authorized),
@@ -70,7 +79,7 @@ contract TokenIOAuthority is Ownable {
      * @param _authorized Authorization status
      * @return {"success" : "Returns true if lib.setRegisteredAuthority succeeds"}
      */
-    function setRegisteredAuthority(string firmName, address authority, bool _authorized) public onlyAuthority(firmName, msg.sender) returns (bool success) {
+    function setRegisteredAuthority(string memory firmName, address authority, bool _authorized, address sender) public onlyAuthority(firmName, sender) returns (bool success) {
         /// @notice set authority of firm to given status
         require(
           lib.setRegisteredAuthority(firmName, authority, _authorized),
@@ -84,7 +93,7 @@ contract TokenIOAuthority is Ownable {
      * @param authority Address of authority account
      * @return {"firm" : "name of firm"}
      */
-    function getFirmFromAuthority(address authority) public view returns (string firm) {
+    function getFirmFromAuthority(address authority) public view returns (string memory firm) {
         return lib.getFirmFromAuthority(authority);
     }
 
@@ -93,7 +102,7 @@ contract TokenIOAuthority is Ownable {
      * @param firmName Name of firm
      * @return {"status" : "Returns status of firm registration"}
      */
-    function isRegisteredFirm(string firmName) public view returns (bool status) {
+    function isRegisteredFirm(string memory firmName) public view returns (bool status) {
         /// @notice check firm's registration status
         return lib.isRegisteredFirm(firmName);
     }
@@ -104,7 +113,7 @@ contract TokenIOAuthority is Ownable {
      * @param authority Address of authority account
      * @return {"registered" : "Returns status of account registration to firm"}
      */
-    function isRegisteredToFirm(string firmName, address authority) public view returns (bool registered) {
+    function isRegisteredToFirm(string memory firmName, address authority) public view returns (bool registered) {
         /// @notice check if registered to firm
         return lib.isRegisteredToFirm(firmName, authority);
     }
@@ -134,7 +143,7 @@ contract TokenIOAuthority is Ownable {
       }
 
 
-    modifier onlyAuthority(string firmName, address authority) {
+    modifier onlyAuthority(string memory firmName, address authority) {
         /// @notice throws if not an owner authority or not registered to the given firm
         require(owner[authority] || lib.isRegisteredToFirm(firmName, authority),
           "Error: Transaction sender does not have permission for this operation!"

contracts/TokenIOAuthorityProxy.sol

@@ -0,0 +1,84 @@
+pragma solidity 0.5.2;
+
+import "./Ownable.sol";
+
+interface TokenIOAuthorityI {
+  function setRegisteredFirm(string calldata firmName, bool _authorized, address sender) external returns (bool success);
+
+  function setRegisteredAuthority(string calldata firmName, address authority, bool _authorized, address sender) external returns (bool success);
+
+  function getFirmFromAuthority(address authority) external view returns (string memory firm);
+
+  function isRegisteredFirm(string calldata firmName) external view returns (bool status);
+
+  function isRegisteredToFirm(string calldata firmName, address authority) external view returns (bool registered);
+
+  function isRegisteredAuthority(address authority) external view returns (bool registered);
+
+  function setMasterFeeContract(address feeContract) external returns (bool success);
+}
+
+contract TokenIOAuthorityProxy is Ownable {
+
+    address implementationInstance;
+
+    constructor(address _tokenIOAuthorityImpl) public {
+      implementationInstance = _tokenIOAuthorityImpl;
+    }
+
+    function upgradeTo(address _newTokenIOAuthorityImpl) onlyOwner external {
+      require(_newTokenIOAuthorityImpl != address(0));
+      implementationInstance = _newTokenIOAuthorityImpl;
+    }
+
+    function staticCall(bytes calldata payload) external view returns(bytes memory) {
+      (bool res, bytes memory result) = implementationInstance.staticcall(payload);
+      return result;
+    }
+
+    function call(bytes calldata payload) external {
+      (bool res, bytes memory result) = implementationInstance.call(payload);
+      require(res);
+    }
+
+    function setRegisteredFirm(string memory firmName, bool _authorized) public returns (bool success) {
+        require(
+          TokenIOAuthorityI(implementationInstance).setRegisteredFirm(firmName, _authorized, msg.sender),
+          "Unable to execute setRegisteredFirm"
+        );
+        return true;
+    }
+
+    function setRegisteredAuthority(string memory firmName, address authority, bool _authorized) public returns (bool success) {
+        require(
+          TokenIOAuthorityI(implementationInstance).setRegisteredAuthority(firmName, authority, _authorized, msg.sender),
+          "Unable to execute setRegisteredFirm"
+        );
+        return true;
+    }
+
+    function getFirmFromAuthority(address authority) public view returns (string memory firm) {
+        return TokenIOAuthorityI(implementationInstance).getFirmFromAuthority(authority);
+    }
+
+    function isRegisteredFirm(string memory firmName) public view returns (bool status) {
+        return TokenIOAuthorityI(implementationInstance).isRegisteredFirm(firmName);
+    }
+
+    function isRegisteredToFirm(string memory firmName, address authority) public view returns (bool registered) {
+        return TokenIOAuthorityI(implementationInstance).isRegisteredToFirm(firmName, authority);
+    }
+
+    function isRegisteredAuthority(address authority) public view returns (bool registered) {
+        return TokenIOAuthorityI(implementationInstance).isRegisteredAuthority(authority);
+    }
+
+    function setMasterFeeContract(address feeContract) public onlyOwner returns (bool success) {
+        require(
+          TokenIOAuthorityI(implementationInstance).setMasterFeeContract(feeContract),
+          "Unable to execute setMasterFeeContract"
+        );
+        return true;
+    }
+
+}

contracts/TokenIOCurrencyAuthority.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.4.24;
+pragma solidity 0.5.2;
 
 import "./Ownable.sol";
 import "./TokenIOStorage.sol";
@@ -29,6 +29,8 @@ contract TokenIOCurrencyAuthority is Ownable {
     using TokenIOLib for TokenIOLib.Data;
     TokenIOLib.Data lib;
 
+    address public proxyInstance;
+
     /**
      * @notice Constructor method for CurrencyAuthority contract
      * @param _storageContract Address of TokenIOStorage contract
@@ -45,13 +47,20 @@ contract TokenIOCurrencyAuthority is Ownable {
         owner[msg.sender] = true;
     }
 
+    function initProxy(address _proxy) public onlyOwner {
+      require(_proxy != address(0));
+
+      proxyInstance = _proxy;
+      lib.proxyInstance = _proxy;
+    }
+
     /**
      * @notice Gets balance of sepcified account for a given currency
      * @param currency Currency symbol 'USDx'
      * @param account Sepcified account address
      * @return { "balance": "Returns account balance"}
      */
-    function getTokenBalance(string currency, address account) public view returns (uint balance) {
+    function getTokenBalance(string memory currency, address account) public view returns (uint balance) {
       return lib.getTokenBalance(currency, account);
     }
 
@@ -60,7 +69,7 @@ contract TokenIOCurrencyAuthority is Ownable {
      * @param currency Currency symbol 'USDx'
      * @return { "supply": "Returns total supply of currency"}
      */
-    function getTokenSupply(string currency) public view returns (uint supply) {
+    function getTokenSupply(string memory currency) public view returns (uint supply) {
       return lib.getTokenSupply(currency);
     }
 
@@ -71,7 +80,7 @@ contract TokenIOCurrencyAuthority is Ownable {
      * @param issuerFirm Name of the issuer firm with authority on account holder;
      * @return { "success": "Returns true if successfully called from another contract"}
      */
-    function freezeAccount(address account, bool isAllowed, string issuerFirm) public onlyAuthority(issuerFirm, msg.sender) returns (bool success) {
+    function freezeAccount(address account, bool isAllowed, string memory issuerFirm, address sender) public onlyAuthority(issuerFirm, sender) returns (bool success) {
         // @notice updates account status
         // @dev !!! mutates storage state
         require(
@@ -88,7 +97,7 @@ contract TokenIOCurrencyAuthority is Ownable {
      * @param issuerFirm Name of the issuer firm with authority on account holder;
      * @return { "success": "Returns true if successfully called from another contract"}
      */
-    function approveKYC(address account, bool isApproved, uint limit, string issuerFirm) public onlyAuthority(issuerFirm, msg.sender) returns (bool success) {
+    function approveKYC(address account, bool isApproved, uint limit, string memory issuerFirm, address sender) public onlyAuthority(issuerFirm, sender) returns (bool success) {
         // @notice updates kyc approval status
         // @dev !!! mutates storage state
         require(
@@ -120,7 +129,7 @@ contract TokenIOCurrencyAuthority is Ownable {
      * @param issuerFirm Name of the issuer firm with authority on account holder;
      * @return { "success": "Returns true if successfully called from another contract"}
      */
-    function approveKYCAndDeposit(string currency, address account, uint amount, uint limit, string issuerFirm) public onlyAuthority(issuerFirm, msg.sender) returns (bool success) {
+    function approveKYCAndDeposit(string memory currency, address account, uint amount, uint limit, string memory issuerFirm, address sender) public onlyAuthority(issuerFirm, sender) returns (bool success) {
         /// @notice updates kyc approval status
         /// @dev !!! mutates storage state
         require(
@@ -155,7 +164,7 @@ contract TokenIOCurrencyAuthority is Ownable {
      * @param issuerFirm Name of the issuer firm with authority on account holder;
      * @return { "success": "Returns true if successfully called from another contract"}
      */
-    function setAccountSpendingLimit(address account, uint limit, string issuerFirm) public onlyAuthority(issuerFirm, msg.sender) returns (bool success) {
+    function setAccountSpendingLimit(address account, uint limit, string memory issuerFirm, address sender) public onlyAuthority(issuerFirm, sender) returns (bool success) {
       require(
         lib.setAccountSpendingLimit(account, limit),
         "Error: Unable to set initial spending limit for account. Please check issuerFirm and firm authority are registered"
@@ -189,7 +198,7 @@ contract TokenIOCurrencyAuthority is Ownable {
      * @param issuerFirm Firm setting the foreign currency exchange
      * @return { "success": "Returns true if successfully called from another contract"}
      */
-    function setFxBpsRate(string currency, uint bpsRate, string issuerFirm) public onlyAuthority(issuerFirm, msg.sender) returns (bool success) {
+    function setFxBpsRate(string memory currency, uint bpsRate, string memory issuerFirm, address sender) public onlyAuthority(issuerFirm, sender) returns (bool success) {
       require(
         lib.setFxUSDBPSRate(currency, bpsRate),
         "Error: Unable to set FX USD basis points rate. Please ensure issuerFirm is authorized"
@@ -203,7 +212,7 @@ contract TokenIOCurrencyAuthority is Ownable {
      * @param fxAmount Amount of foreign currency to exchange into USD
      * @return {"usdAmount" : "Returns the foreign currency amount in USD"}
      */
-    function getFxUSDAmount(string currency, uint fxAmount) public view returns (uint usdAmount) {
+    function getFxUSDAmount(string memory currency, uint fxAmount) public view returns (uint usdAmount) {
       return lib.getFxUSDAmount(currency, fxAmount);
     }
 
@@ -214,7 +223,7 @@ contract TokenIOCurrencyAuthority is Ownable {
      * @param issuerFirm Name of the issuer firm with authority on account holder;
      * @return { "success": "Returns true if successfully called from another contract"}
      */
-    function approveForwardedAccount(address originalAccount, address updatedAccount, string issuerFirm) public onlyAuthority(issuerFirm, msg.sender) returns (bool success) {
+    function approveForwardedAccount(address originalAccount, address updatedAccount, string memory issuerFirm, address sender) public onlyAuthority(issuerFirm, sender) returns (bool success) {
         // @notice updatesa forwarded account
         // @dev !!! mutates storage state
         require(
@@ -231,7 +240,7 @@ contract TokenIOCurrencyAuthority is Ownable {
      * @param issuerFirm Name of the issuer firm with authority on account holder;
      * @return { "success": "Returns true if successfully called from another contract"}
      */
-    function deposit(string currency, address account, uint amount, string issuerFirm) public onlyAuthority(issuerFirm, msg.sender) returns (bool success) {
+    function deposit(string memory currency, address account, uint amount, string memory issuerFirm, address sender) public onlyAuthority(issuerFirm, sender) returns (bool success) {
         require(
           lib.verifyAccount(account),
           "Error: Account is not verified!"
@@ -253,7 +262,7 @@ contract TokenIOCurrencyAuthority is Ownable {
      * @param issuerFirm Name of the issuer firm with authority on account holder
      * @return { "success": "Returns true if successfully called from another contract"}
      */
-    function withdraw(string currency, address account, uint amount, string issuerFirm) public onlyAuthority(issuerFirm, msg.sender) returns (bool success) {
+    function withdraw(string memory currency, address account, uint amount, string memory issuerFirm, address sender) public onlyAuthority(issuerFirm, sender) returns (bool success) {
         require(
           lib.verifyAccount(account),
           "Error: Account is not verified!"
@@ -271,7 +280,7 @@ contract TokenIOCurrencyAuthority is Ownable {
      * @notice Ensure only authorized currency firms and authorities can modify protected methods
      * @dev authority must be registered to an authorized firm to use protected methods
      */
-    modifier onlyAuthority(string firmName, address authority) {
+    modifier onlyAuthority(string memory firmName, address authority) {
         // @notice throws if authority account is not registred to the given firm
         require(
           lib.isRegisteredToFirm(firmName, authority),