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 branch 'master' of https://github.com/InstaDApp/dsa-yield-contract

Browse Source
This commit is contained in:
Samyak Jain 2020-08-30 01:24:23 +10:00
commit b73c7be2e1
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contracts/deployer.sol
View File

@ -7,12 +7,7 @@ interface IProxy {
contract Deployer { contract Deployer {
event LogNewProxy( event LogNewProxy(address indexed owner, address indexed logic, address indexed token);
address indexed owner,
address indexed proxy,
address indexed logic,
address token
);
/** /**
* @dev deploy create2 + minimal proxy * @dev deploy create2 + minimal proxy
@ -38,7 +33,7 @@ contract Deployer {
proxy := create2(0, clone, 0x37, salt) proxy := create2(0, clone, 0x37, salt)
} }
IProxy(proxy).setBasic(owner, token); IProxy(proxy).setBasic(owner, token);
emit LogNewProxy(owner, proxy, logic, token); emit LogNewProxy(owner, logic, token);
} }
/** /**

2
contracts/pools/erc20.sol
View File

@ -135,7 +135,7 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
uint _burnAmt; uint _burnAmt;
if (tknAmt == uint(-1)) { if (tknAmt == uint(-1)) {
_burnAmt = _bal; _burnAmt = _bal;
_tknAmt = wdiv(_burnAmt, exchangeRate); _tknAmt = _tknBal;
} else { } else {
require(tknAmt <= _tknBal, "balance-exceeded"); require(tknAmt <= _tknBal, "balance-exceeded");
_burnAmt = wmul(tknAmt, exchangeRate); _burnAmt = wmul(tknAmt, exchangeRate);

2
contracts/pools/eth.sol
View File

@ -128,7 +128,7 @@ contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
uint _burnAmt; uint _burnAmt;
if (tknAmt == uint(-1)) { if (tknAmt == uint(-1)) {
_burnAmt = _bal; _burnAmt = _bal;
_tknAmt = wdiv(_burnAmt, exchangeRate); _tknAmt = _tknBal;
} else { } else {
require(tknAmt <= _tknBal, "balance-exceeded"); require(tknAmt <= _tknBal, "balance-exceeded");
_burnAmt = wmul(tknAmt, exchangeRate); _burnAmt = wmul(tknAmt, exchangeRate);