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

Fixed err & added function to collect MKR base fees.

Browse Source
This commit is contained in:
Sowmayjain 2018-11-26 03:56:31 +05:30
parent cdb14394b4
commit 2fefb96da1
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contracts/protocols/InstaKyber.sol
View File

@ -1,5 +1,6 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
library SafeMath { library SafeMath {
function mul(uint256 a, uint256 b) internal pure returns (uint256) { function mul(uint256 a, uint256 b) internal pure returns (uint256) {

20
contracts/protocols/InstaMaker.sol
View File

@ -104,8 +104,6 @@ contract GlobalVar is Registry {
// address public ethfeed = 0x729D19f657BD0614b4985Cf1D82531c67569197B // pip // address public ethfeed = 0x729D19f657BD0614b4985Cf1D82531c67569197B // pip
// address public mkrfeed = 0x99041F808D598B782D5a3e498681C2452A31da08 // pep // address public mkrfeed = 0x99041F808D598B782D5a3e498681C2452A31da08 // pep
MakerCDP loanMaster = MakerCDP(getAddress("cdp"));
bytes32 public blankCDP = 0x0000000000000000000000000000000000000000000000000000000000000000; bytes32 public blankCDP = 0x0000000000000000000000000000000000000000000000000000000000000000;
mapping (address => bytes32) public cdps; // borrower >>> CDP Bytes mapping (address => bytes32) public cdps; // borrower >>> CDP Bytes
bool public freezed; bool public freezed;
@ -119,11 +117,13 @@ contract IssueLoan is GlobalVar {
event OpenedNewCDP(address borrower, bytes32 cdpBytes); event OpenedNewCDP(address borrower, bytes32 cdpBytes);
function pethPEReth(uint ethNum) public view returns (uint rPETH) { function pethPEReth(uint ethNum) public view returns (uint rPETH) {
MakerCDP loanMaster = MakerCDP(getAddress("cdp"));
rPETH = (ethNum.mul(10 ** 27)).div(loanMaster.per()); rPETH = (ethNum.mul(10 ** 27)).div(loanMaster.per());
} }
function borrow(uint daiDraw) public payable { function borrow(uint daiDraw) public payable {
if (cdps[msg.sender] == blankCDP) { if (cdps[msg.sender] == blankCDP) {
MakerCDP loanMaster = MakerCDP(getAddress("cdp"));
cdps[msg.sender] = loanMaster.open(); cdps[msg.sender] = loanMaster.open();
emit OpenedNewCDP(msg.sender, cdps[msg.sender]); emit OpenedNewCDP(msg.sender, cdps[msg.sender]);
} }
@ -135,6 +135,7 @@ contract IssueLoan is GlobalVar {
WETHFace wethTkn = WETHFace(getAddress("weth")); WETHFace wethTkn = WETHFace(getAddress("weth"));
wethTkn.deposit.value(msg.value)(); // ETH to WETH wethTkn.deposit.value(msg.value)(); // ETH to WETH
uint pethToLock = pethPEReth(msg.value); uint pethToLock = pethPEReth(msg.value);
MakerCDP loanMaster = MakerCDP(getAddress("cdp"));
loanMaster.join(pethToLock); // WETH to PETH loanMaster.join(pethToLock); // WETH to PETH
loanMaster.lock(cdps[msg.sender], pethToLock); // PETH to CDP loanMaster.lock(cdps[msg.sender], pethToLock); // PETH to CDP
emit LockedETH(msg.sender, msg.value, pethToLock); emit LockedETH(msg.sender, msg.value, pethToLock);
@ -142,6 +143,7 @@ contract IssueLoan is GlobalVar {
function drawDAI(uint daiDraw) public { function drawDAI(uint daiDraw) public {
require(!freezed, "Operation Disabled"); require(!freezed, "Operation Disabled");
MakerCDP loanMaster = MakerCDP(getAddress("cdp"));
loanMaster.draw(cdps[msg.sender], daiDraw); loanMaster.draw(cdps[msg.sender], daiDraw);
IERC20 daiTkn = IERC20(getAddress("dai")); IERC20 daiTkn = IERC20(getAddress("dai"));
daiTkn.transfer(msg.sender, daiDraw); daiTkn.transfer(msg.sender, daiDraw);
@ -175,6 +177,7 @@ contract RepayLoan is IssueLoan {
uint contractMKR = mkrTkn.balanceOf(address(this)); // contract MKR balance before wiping uint contractMKR = mkrTkn.balanceOf(address(this)); // contract MKR balance before wiping
daiTkn.transferFrom(msg.sender, address(this), daiWipe); // get DAI to pay the debt daiTkn.transferFrom(msg.sender, address(this), daiWipe); // get DAI to pay the debt
MakerCDP loanMaster = MakerCDP(getAddress("cdp"));
loanMaster.wipe(cdps[msg.sender], daiWipe); // wipe DAI loanMaster.wipe(cdps[msg.sender], daiWipe); // wipe DAI
uint mkrCharged = contractMKR - mkrTkn.balanceOf(address(this)); // MKR fee = before wiping bal - after wiping bal uint mkrCharged = contractMKR - mkrTkn.balanceOf(address(this)); // MKR fee = before wiping bal - after wiping bal
@ -196,6 +199,7 @@ contract RepayLoan is IssueLoan {
function unlockETH(uint ethFree) public { function unlockETH(uint ethFree) public {
require(!freezed, "Operation Disabled"); require(!freezed, "Operation Disabled");
uint pethToUnlock = pethPEReth(ethFree); uint pethToUnlock = pethPEReth(ethFree);
MakerCDP loanMaster = MakerCDP(getAddress("cdp"));
loanMaster.free(cdps[msg.sender], pethToUnlock); // CDP to PETH loanMaster.free(cdps[msg.sender], pethToUnlock); // CDP to PETH
loanMaster.exit(pethToUnlock); // PETH to WETH loanMaster.exit(pethToUnlock); // PETH to WETH
WETHFace wethTkn = WETHFace(getAddress("weth")); WETHFace wethTkn = WETHFace(getAddress("weth"));
@ -236,6 +240,7 @@ contract BorrowTasks is RepayLoan {
function transferCDP(address nextOwner) public { function transferCDP(address nextOwner) public {
require(nextOwner != 0, "Invalid Address."); require(nextOwner != 0, "Invalid Address.");
MakerCDP loanMaster = MakerCDP(getAddress("cdp"));
loanMaster.give(cdps[msg.sender], nextOwner); loanMaster.give(cdps[msg.sender], nextOwner);
emit TranferCDP(cdps[msg.sender], msg.sender, nextOwner); emit TranferCDP(cdps[msg.sender], msg.sender, nextOwner);
cdps[msg.sender] = blankCDP; cdps[msg.sender] = blankCDP;
@ -267,7 +272,9 @@ contract BorrowTasks is RepayLoan {
} }
contract MoatMaker is BorrowTasks { contract InstaMaker is BorrowTasks {
event MKRCollected(uint amount);
constructor(address rAddr) public { constructor(address rAddr) public {
addressRegistry = rAddr; addressRegistry = rAddr;
@ -280,4 +287,11 @@ contract MoatMaker is BorrowTasks {
freezed = stop; freezed = stop;
} }
// MKR fees kept as balance
function collectMKR(uint amount) public onlyAdmin {
IERC20 mkrTkn = IERC20(getAddress("mkr"));
mkrTkn.transfer(msg.sender, amount);
emit MKRCollected(amount);
}
} }