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

Minor edits; Added dsa address in LogDeploy

Browse Source
This commit is contained in:
Thrilok Kumar 2020-08-30 23:40:32 +05:30
parent 99938ad737
commit 1c2bd398f1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/pools/erc20.sol
View File

@ -33,7 +33,7 @@ interface RateInterface {
contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable { contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
using SafeERC20 for IERC20; using SafeERC20 for IERC20;
event LogDeploy(address token, uint amount); event LogDeploy(address indexed dsa, address token, uint amount);
event LogExchangeRate(uint exchangeRate, uint tokenBalance, uint insuranceAmt); event LogExchangeRate(uint exchangeRate, uint tokenBalance, uint insuranceAmt);
event LogSettle(uint settleBlock); event LogSettle(uint settleBlock);
event LogDeposit(uint depositAmt, uint poolMintAmt); event LogDeposit(uint depositAmt, uint poolMintAmt);
@ -46,7 +46,7 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
RegistryInterface public immutable registry; // Pool Registry RegistryInterface public immutable registry; // Pool Registry
IndexInterface public constant instaIndex = IndexInterface(0x2971AdFa57b20E5a416aE5a708A8655A9c74f723); // Main Index IndexInterface public constant instaIndex = IndexInterface(0x2971AdFa57b20E5a416aE5a708A8655A9c74f723); // Main Index
uint private tokenBalance; // total token balance since last rebalancing uint private tokenBalance; // total token balance
uint public exchangeRate; // initial 1 token = 1 uint public exchangeRate; // initial 1 token = 1
uint public insuranceAmt; // insurance amount to keep pool safe uint public insuranceAmt; // insurance amount to keep pool safe
@ -76,14 +76,14 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable {
} else { // non-pool other tokens } else { // non-pool other tokens
IERC20(token).safeTransfer(_dsa, amount); IERC20(token).safeTransfer(_dsa, amount);
} }
emit LogDeploy(token, amount); emit LogDeploy(_dsa, token, amount);
} }
/** /**
* @dev get pool token rate * @dev get pool token rate
* @param tokenAmt total token amount * @param tokenAmt total token amount
*/ */
function getCurrentRate(uint tokenAmt) public returns (uint) { function getCurrentRate(uint tokenAmt) public view returns (uint) {
return wdiv(totalSupply(), tokenAmt); return wdiv(totalSupply(), tokenAmt);
} }

6
contracts/pools/eth.sol
View File

@ -33,7 +33,7 @@ interface RateInterface {
contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath { contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
using SafeERC20 for IERC20; using SafeERC20 for IERC20;
event LogDeploy(address indexed token, uint amount); event LogDeploy(address indexed dsa, address indexed token, uint amount);
event LogExchangeRate(uint exchangeRate, uint tokenBalance, uint insuranceAmt); event LogExchangeRate(uint exchangeRate, uint tokenBalance, uint insuranceAmt);
event LogSettle(uint settleBlock); event LogSettle(uint settleBlock);
event LogDeposit(uint depositAmt, uint poolMintAmt); event LogDeposit(uint depositAmt, uint poolMintAmt);
@ -73,14 +73,14 @@ contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
} else { // non-pool other tokens } else { // non-pool other tokens
IERC20(token).safeTransfer(_dsa, amount); IERC20(token).safeTransfer(_dsa, amount);
} }
emit LogDeploy(token, amount); emit LogDeploy(_dsa, token, amount);
} }
/** /**
* @dev get pool token rate * @dev get pool token rate
* @param tokenAmt total token amount * @param tokenAmt total token amount
*/ */
function getCurrentRate(uint tokenAmt) public returns (uint) { function getCurrentRate(uint tokenAmt) public view returns (uint) {
return wdiv(totalSupply(), tokenAmt); return wdiv(totalSupply(), tokenAmt);
} }