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:
Sowmay Jain 2020-08-30 23:34:04 +10:00
commit 365a91ed10
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contracts/pools/erc20.sol
View File

@ -9,7 +9,6 @@ import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
import { DSMath } from "../libs/safeMath.sol"; import { DSMath } from "../libs/safeMath.sol";
interface AccountInterface { interface AccountInterface {
function enable(address authority) external;
function isAuth(address) external view returns(bool); function isAuth(address) external view returns(bool);
function cast(address[] calldata _targets, bytes[] calldata _datas, address _origin) external payable; function cast(address[] calldata _targets, bytes[] calldata _datas, address _origin) external payable;
} }

7
contracts/pools/eth.sol
View File

@ -9,7 +9,7 @@ import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
import { DSMath } from "../libs/safeMath.sol"; import { DSMath } from "../libs/safeMath.sol";
interface AccountInterface { interface AccountInterface {
function enable(address authority) external; function isAuth(address) external view returns(bool);
function cast(address[] calldata _targets, bytes[] calldata _datas, address _origin) external payable; function cast(address[] calldata _targets, bytes[] calldata _datas, address _origin) external payable;
} }
@ -66,6 +66,7 @@ contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
function deploy(address _dsa, address token, uint amount) external isChief { function deploy(address _dsa, address token, uint amount) external isChief {
require(registry.isDsa(address(this), _dsa), "not-autheticated-dsa"); require(registry.isDsa(address(this), _dsa), "not-autheticated-dsa");
require(AccountInterface(_dsa).isAuth(address(this)), "token-pool-not-auth");
if (token == address(0)) { if (token == address(0)) {
payable(_dsa).transfer(amount); payable(_dsa).transfer(amount);
} else { } else {
@ -101,9 +102,11 @@ contract PoolToken is ReentrancyGuard, ERC20Pausable, DSMath {
function settle(address _dsa, address[] calldata _targets, bytes[] calldata _datas, address _origin) external isChief { function settle(address _dsa, address[] calldata _targets, bytes[] calldata _datas, address _origin) external isChief {
require(registry.isDsa(address(this), _dsa), "not-autheticated-dsa"); require(registry.isDsa(address(this), _dsa), "not-autheticated-dsa");
AccountInterface dsaWallet = AccountInterface(_dsa);
if (_targets.length > 0 && _datas.length > 0) { if (_targets.length > 0 && _datas.length > 0) {
AccountInterface(_dsa).cast(_targets, _datas, _origin); dsaWallet.cast(_targets, _datas, _origin);
} }
require(dsaWallet.isAuth(address(this)), "token-pool-not-auth");
setExchangeRate(); setExchangeRate();
emit LogSettle(block.timestamp); emit LogSettle(block.timestamp);

1
contracts/registry.sol
View File

@ -15,7 +15,6 @@ contract Registry {
event LogAddSigner(address indexed signer); event LogAddSigner(address indexed signer);
event LogRemoveSigner(address indexed signer); event LogRemoveSigner(address indexed signer);
event LogUpdatePool(address pool, bool poolState); event LogUpdatePool(address pool, bool poolState);
event LogUpdatePoolCap(address pool, uint newCap);
event LogUpdatePoolLogic(address pool, address newLogic); event LogUpdatePoolLogic(address pool, address newLogic);
event LogUpdateInsureFee(address pool, uint newFee); event LogUpdateInsureFee(address pool, uint newFee);
event LogUpdateWithdrawalFee(address pool, uint newFee); event LogUpdateWithdrawalFee(address pool, uint newFee);