Instadapp/yield-contract
1
0
Fork 0
mirror of https://github.com/Instadapp/yield-contract.git synced 2024-07-29 21:47:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from InstaDApp/audit-changes

Browse Source 
Audit changes
This commit is contained in:
Samyak Jain 2020-10-08 18:56:12 +11:00 committed by GitHub
commit b330e485e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contracts/pools/erc20.sol
View File

@ -105,6 +105,7 @@ contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
* @param _data array of connector's function calldata
*/
function settle(address[] calldata _targets, bytes[] calldata _data) external isChief {
require(_targets.length != 0, "targets-length-zero");
require(_targets.length == _data.length , "array-length-invalid");
require(registry.checkSettleLogics(address(this), _targets), "not-logic");
for (uint i = 0; i < _targets.length; i++) {
@ -118,15 +119,19 @@ contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
* @param tknAmt token amount
* @return mintAmt amount of wrap token minted
*/
function deposit(uint tknAmt) external payable whenNotPaused returns (uint mintAmt) {
function deposit(uint tknAmt) external payable nonReentrant whenNotPaused returns (uint mintAmt) {
require(msg.value == 0, "non-eth-pool");
require(tknAmt != 0, "tknAmt-is-zero");
uint _tokenBal = wdiv(totalSupply(), exchangeRate);
uint _newTknBal = add(_tokenBal, tknAmt);
require(_newTknBal < registry.poolCap(address(this)), "pool-cap-reached");
uint initalBal = baseToken.balanceOf(address(this));
baseToken.safeTransferFrom(msg.sender, address(this), tknAmt);
mintAmt = wmul(tknAmt, exchangeRate);
uint finalBal = baseToken.balanceOf(address(this));
uint _tknAmt = sub(finalBal, initalBal);
mintAmt = wmul(_tknAmt, exchangeRate);
_mint(msg.sender, mintAmt);
emit LogDeposit(msg.sender, tknAmt, mintAmt);
emit LogDeposit(msg.sender, _tknAmt, mintAmt);
}
/**

8
contracts/pools/eth.sol
View File

@ -4,6 +4,7 @@ pragma experimental ABIEncoderV2;
import "@openzeppelin/contracts/token/ERC20/ERC20Pausable.sol";
import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
import "@openzeppelin/contracts/utils/Address.sol";
import { DSMath } from "../libs/safeMath.sol";
@ -102,6 +103,7 @@ contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath {
* @param _data array of connector's function calldata
*/
function settle(address[] calldata _targets, bytes[] calldata _data) external isChief {
require(_targets.length != 0, "targets-length-zero");
require(_targets.length == _data.length , "array-length-invalid");
require(registry.checkSettleLogics(address(this), _targets), "not-logic");
for (uint i = 0; i < _targets.length; i++) {
@ -115,7 +117,7 @@ contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath {
* @param tknAmt token amount
* @return mintAmt amount of wrap token minted
*/
function deposit(uint tknAmt) external whenNotPaused payable returns (uint mintAmt) {
function deposit(uint tknAmt) external nonReentrant whenNotPaused payable returns (uint mintAmt) {
require(tknAmt == msg.value, "unmatched-amount");
uint _tokenBal = wdiv(totalSupply(), exchangeRate);
uint _newTknBal = add(_tokenBal, tknAmt);
@ -145,7 +147,7 @@ contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath {
require(wdAmt <= address(this).balance, "not-enough-liquidity-available");
_burn(msg.sender, _burnAmt);
payable(target).transfer(wdAmt);
Address.sendValue(payable(target), wdAmt);
emit LogWithdraw(msg.sender, wdAmt, _burnAmt);
}
@ -158,7 +160,7 @@ contract PoolETH is ReentrancyGuard, ERC20Pausable, DSMath {
function withdrawFee(uint wdAmt) external {
require(msg.sender == instaIndex.master(), "not-master");
if (wdAmt > feeAmt) wdAmt = feeAmt;
msg.sender.transfer(wdAmt);
Address.sendValue(payable(msg.sender), wdAmt);
feeAmt = sub(feeAmt, wdAmt);
emit LogWithdrawFee(wdAmt);
}