pool Cap and erc20 code update

contracts/pools/erc20.sol

@@ -8,11 +8,6 @@ import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 
 import { DSMath } from "../libs/safeMath.sol";
 
-interface AccountInterface {
-  function isAuth(address) external view returns(bool);
-  function cast(address[] calldata _targets, bytes[] calldata _datas, address _origin) external payable;
-}
-
 interface IndexInterface {
   function master() external view returns (address);
   function build(address _owner, uint accountVersion, address _origin) external returns (address _account);
@@ -22,8 +17,7 @@ interface RegistryInterface {
   function chief(address) external view returns (bool);
   function poolLogic(address) external returns (address);
   function fee(address) external view returns (uint);
-  function withdrawalFee(address) external view returns (uint);
+  function poolCap(address) external view returns (uint);
-  function isDsa(address, address) external view returns (bool);
   function checkSettleLogics(address, address[] calldata) external view returns (bool);
 }
 
@@ -38,7 +32,7 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
   event LogExchangeRate(uint exchangeRate, uint tokenBalance, uint insuranceAmt);
   event LogSettle(uint settleBlock);
   event LogDeposit(address indexed user, uint depositAmt, uint poolMintAmt);
-    event LogWithdraw(address indexed user, uint withdrawAmt, uint poolBurnAmt, uint feeAmt);
+  event LogWithdraw(address indexed user, uint withdrawAmt, uint poolBurnAmt);
   event LogAddFee(uint amount);
   event LogWithdrawFee(uint amount);
   event LogPausePool(bool);
@@ -47,7 +41,6 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
   RegistryInterface public immutable registry; // Pool Registry
   IndexInterface public constant instaIndex = IndexInterface(0x2971AdFa57b20E5a416aE5a708A8655A9c74f723); // Main Index
 
-    uint private tokenBalance; // total token balance
   uint public exchangeRate; // initial 1 token = 1
   uint public feeAmt; // fee collected on profits
 
@@ -63,56 +56,39 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
   }
 
   modifier isChief() {
-        require(registry.chief(msg.sender) || msg.sender == instaIndex.master() || msg.sender == address(this), "not-chief");
+      require(registry.chief(msg.sender) || msg.sender == instaIndex.master(), "not-chief");
       _;
   }
 
-    /**
-      * @dev Deploy assets to DSA.
-      * @param _dsa DSA address
-      * @param token token address
-      * @param amount token amount
-    */
-    function deploy(address _dsa, address token, uint amount) public isChief {
-      require(registry.isDsa(address(this), _dsa), "not-autheticated-dsa");
-      require(AccountInterface(_dsa).isAuth(address(this)), "token-pool-not-auth");  
-      if (token == address(0)) { // pool base token
-        baseToken.safeTransfer(_dsa, amount);
-      } else if (token == 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE){ // non-pool ethereum
-        payable(_dsa).transfer(amount);
-      } else { // non-pool other tokens
-        IERC20(token).safeTransfer(_dsa, amount);
-      }
-      emit LogDeploy(_dsa, token, amount);
-    }
-
   /**
     * @dev get pool token rate
     * @param tokenAmt total token amount
     */
-    function getCurrentRate(uint tokenAmt) public view returns (uint) {
+  function getCurrentRate(uint tokenAmt) internal view returns (uint) {
     return wdiv(totalSupply(), tokenAmt);
   }
 
   /**
     * @dev sets exchange rates
     */
-    function setExchangeRate() public isChief {
+  function setExchangeRate() public {
+    require(msg.sender == address(this), "not-pool-address");
     uint _previousRate = exchangeRate;
     uint _totalToken = RateInterface(registry.poolLogic(address(this))).getTotalToken();
     _totalToken = sub(_totalToken, feeAmt);
     uint _currentRate = getCurrentRate(_totalToken);
+    uint _tokenBal;
     require(_currentRate != 0, "current-rate-is-zero");
     if (_currentRate > _previousRate) { // loss => deduct partially/fully from insurance amount
         _currentRate = _previousRate;
     } else { // profit => add to insurance amount
-        uint _newFee = wmul(sub(_totalToken, tokenBalance), registry.fee(address(this)));
+      uint _newFee = wmul(sub(_totalToken, _tokenBal), registry.fee(address(this)));
       feeAmt = add(feeAmt, _newFee);
-        tokenBalance = sub(_totalToken, _newFee);
+      _tokenBal = sub(_totalToken, _newFee);
-        _currentRate = getCurrentRate(tokenBalance);
+      _currentRate = getCurrentRate(_tokenBal);
     }
     exchangeRate = _currentRate;
-      emit LogExchangeRate(exchangeRate, tokenBalance, feeAmt);
+    emit LogExchangeRate(exchangeRate, _tokenBal, feeAmt);
   }
 
   /**
@@ -146,7 +122,6 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
     for (uint i = 0; i < _targets.length; i++) {
       spell(_targets[i], _data[i]);
     }
-      setExchangeRate();
     emit LogSettle(block.number);
   }
 
@@ -157,12 +132,12 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
   */
   function deposit(uint tknAmt) external whenNotPaused payable returns (uint _mintAmt) {
     require(msg.value == 0, "non-eth-pool");
-      tokenBalance = add(tokenBalance, tknAmt);
+    uint _tokenBal = wdiv(totalSupply(), exchangeRate);
-
+    uint _newTknBal = add(_tokenBal, tknAmt);
+    require(_newTknBal < registry.poolCap(address(this)), "unmatched-amount");
     baseToken.safeTransferFrom(msg.sender, address(this), tknAmt);
     _mintAmt = wmul(tknAmt, exchangeRate);
     _mint(msg.sender, _mintAmt);
-
     emit LogDeposit(msg.sender, tknAmt, _mintAmt);
   }
 
@@ -173,58 +148,35 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
     * @return _tknAmt amount of token withdrawn
   */
   function withdraw(uint tknAmt, address to) external nonReentrant whenNotPaused returns (uint _tknAmt) {
-      uint poolBal = baseToken.balanceOf(address(this));
     require(to != address(0), "to-address-not-vaild");
-      uint _bal = balanceOf(msg.sender);
+    uint _userBal = wdiv(balanceOf(msg.sender), exchangeRate);
-      uint _tknBal = wdiv(_bal, exchangeRate);
     uint _burnAmt;
-      if (tknAmt >= _tknBal) {
+    if (tknAmt >= _userBal) {
-        _burnAmt = _bal;
+      _burnAmt = balanceOf(msg.sender);
-        _tknAmt = _tknBal;
+      _tknAmt = _userBal;
     } else {
       _burnAmt = wmul(tknAmt, exchangeRate);
       _tknAmt = tknAmt;
     }
-      require(_tknAmt <= poolBal, "not-enough-liquidity-available");
+    require(_tknAmt <= baseToken.balanceOf(address(this)), "not-enough-liquidity-available");
-
-      tokenBalance = sub(tokenBalance, _tknAmt);
 
     _burn(msg.sender, _burnAmt);
-
-      uint _withdrawalFee = registry.withdrawalFee(address(this));
-      uint _feeAmt;
-      if (_withdrawalFee > 0) {
-        _feeAmt = wmul(_tknAmt, _withdrawalFee);
-        feeAmt = add(feeAmt, _feeAmt);
-        _tknAmt = sub(_tknAmt, _feeAmt);
-      }
-
     baseToken.safeTransfer(to, _tknAmt);
 
-      emit LogWithdraw(msg.sender, _tknAmt, _burnAmt, _feeAmt);
+    emit LogWithdraw(msg.sender, _tknAmt, _burnAmt);
-    }
-
-    /**
-      * @dev Add Insurance to the pool.
-      * @param tknAmt insurance token amount to add
-    */
-    function addFee(uint tknAmt) external {
-      baseToken.safeTransferFrom(msg.sender, address(this), tknAmt);
-      feeAmt = add(feeAmt, tknAmt);
-      emit LogAddFee(tknAmt);
   }
 
   /**
     * @dev Withdraw Insurance from the pool.
     * @notice only master can call this function.
-      * @param tknAmt insurance token amount to remove
+    * @param wdAmt insurance token amount to remove
   */
-    function withdrawFee(uint tknAmt) external {
+  function withdrawFee(uint wdAmt) external {
     require(msg.sender == instaIndex.master(), "not-master");
-      require(tknAmt <= feeAmt, "not-enough-insurance");
+    if (wdAmt > feeAmt) wdAmt = feeAmt;
-      baseToken.safeTransfer(msg.sender, tknAmt);
+    baseToken.safeTransfer(msg.sender, wdAmt);
-      feeAmt = sub(feeAmt, tknAmt);
+    feeAmt = sub(feeAmt, wdAmt);
-      emit LogWithdrawFee(tknAmt);
+    emit LogWithdrawFee(wdAmt);
   }
 
   /**
@@ -237,4 +189,5 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
   }
 
   receive() external payable {}
+
 }

contracts/pools/eth.sol

@@ -17,6 +17,7 @@ interface RegistryInterface {
   function chief(address) external view returns (bool);
   function poolLogic(address) external returns (address);
   function fee(address) external view returns (uint);
+  function poolCap(address) external view returns (uint);
   function checkSettleLogics(address, address[] calldata) external view returns (bool);
 }
 
@@ -60,23 +61,25 @@ contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath {
     * @dev get pool token rate
     * @param tokenAmt total token amount
   */
-  function getCurrentRate(uint tokenAmt) internal returns (uint) {
+  function getCurrentRate(uint tokenAmt) internal view returns (uint) {
     return wdiv(totalSupply(), tokenAmt);
   }
 
   /**
     * @dev sets exchange rates
     */
-  function setExchangeRate() public isChief {
+  function setExchangeRate() public {
+    require(msg.sender == address(this), "not-pool-address");
     uint _prevRate = exchangeRate;
     uint _totalToken = RateInterface(registry.poolLogic(address(this))).getTotalToken();
     _totalToken = sub(_totalToken, feeAmt);
     uint _newRate = getCurrentRate(_totalToken);
+    uint _tokenBal;
     require(_newRate != 0, "current-rate-is-zero");
     if (_newRate > _prevRate) {
       _newRate = _prevRate;
     } else {
-      uint _tokenBal = wdiv(totalSupply(), _prevRate);
+      _tokenBal = wdiv(totalSupply(), _prevRate);
       uint _newFee = wmul(sub(_totalToken, _tokenBal), registry.fee(address(this)));
       feeAmt = add(feeAmt, _newFee);
       _tokenBal = sub(_totalToken, _newFee);
@@ -127,6 +130,9 @@ contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath {
   */
   function deposit(uint tknAmt) public whenNotPaused payable returns (uint mintAmt) {
     require(tknAmt == msg.value, "unmatched-amount");
+    uint _tokenBal = wdiv(totalSupply(), exchangeRate);
+    uint _newTknBal = add(_tokenBal, tknAmt);
+    require(_newTknBal < registry.poolCap(address(this)), "unmatched-amount");
     mintAmt = wmul(msg.value, exchangeRate);
     _mint(msg.sender, mintAmt);
     emit LogDeposit(msg.sender, tknAmt, mintAmt);
@@ -136,7 +142,7 @@ contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath {
     * @dev Withdraw tokens.
     * @param tknAmt token amount
     * @param target withdraw tokens to address
-    * @return "wdAmt" amount of token withdrawn
+    * @return wdAmt amount of token withdrawn
   */
   function withdraw(uint tknAmt, address target) external nonReentrant whenNotPaused returns (uint wdAmt) {
     require(target != address(0), "invalid-target-address");

contracts/registry.sol

@@ -16,6 +16,7 @@ contract Registry {
   event LogRemoveSigner(address indexed signer);
   event LogUpdatePoolLogic(address token, address newLogic);
   event LogUpdateFee(address token, uint newFee);
+  event LogUpdateCap(address token, uint newFee);
   event LogAddPool(address indexed token, address indexed pool);
   event LogRemovePool(address indexed token, address indexed pool);
   event LogAddSettleLogic(address indexed token, address indexed logic);
@@ -125,7 +126,7 @@ contract Registry {
 
   /**
     * @dev update pool fee
-    * @param _pool pool address
+    * @param _token pool address
     * @param _newFee new fee amount
   */
   function updateFee(address _token, uint _newFee) external isMaster {
@@ -137,6 +138,18 @@ contract Registry {
     emit LogUpdateFee(_pool, _newFee);
   }
 
+  /**
+    * @dev update pool fee
+    * @param _token pool address
+    * @param _newCap new fee amount
+  */
+  function updateCap(address _token, uint _newCap) external isMaster {
+    address _pool = poolToken[_token];
+    require(_pool != address(0), "invalid-pool");
+    poolCap[_pool] = _newCap;
+    emit LogUpdateCap(_pool, _newCap);
+  }
+
   function addSettleLogic(address _token, address _logic) external isMaster {
     address _pool = poolToken[_token];
     require(_pool != address(0), "invalid-pool");