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

Merge pull request #3 from InstaDApp/dev

Browse Source 
Added payTo & Claim external CDP feature. Bug fixing.
This commit is contained in:
Sowmay Jain 2018-12-02 04:18:28 +05:30 committed by GitHub
commit b6145dd90b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
contracts/protocols/InstaMaker.sol
View File

@ -41,6 +41,7 @@ interface MakerCDP {
function draw(bytes32 cup, uint wad) external;
function wipe(bytes32 cup, uint wad) external;
function per() external view returns (uint ray);
function lad(bytes32 cup) external view returns (address);
}
interface PriceInterface {
@ -104,7 +105,7 @@ contract GlobalVar is Registry {
contract IssueLoan is GlobalVar {
event LockedETH(address borrower, uint lockETH, uint lockPETH, address lockedBy);
event LoanedDAI(address borrower, uint loanDAI);
event LoanedDAI(address borrower, uint loanDAI, address payTo);
event NewCDP(address borrower, bytes32 cdpBytes);
function pethPEReth(uint ethNum) public view returns (uint rPETH) {
@ -112,9 +113,9 @@ contract IssueLoan is GlobalVar {
rPETH = (ethNum.mul(10 ** 27)).div(loanMaster.per());
}
function borrow(uint daiDraw) public payable {
function borrow(uint daiDraw, address beneficiary) public payable {
if (msg.value > 0) {lockETH(msg.sender);}
if (daiDraw > 0) {drawDAI(daiDraw);}
if (daiDraw > 0) {drawDAI(daiDraw, beneficiary);}
}
function lockETH(address borrower) public payable {
@ -134,13 +135,17 @@ contract IssueLoan is GlobalVar {
);
}
function drawDAI(uint daiDraw) public {
function drawDAI(uint daiDraw, address beneficiary) public {
require(!freezed, "Operation Disabled");
MakerCDP loanMaster = MakerCDP(cdpAddr);
loanMaster.draw(cdps[msg.sender], daiDraw);
IERC20 daiTkn = IERC20(getAddress("dai"));
daiTkn.transfer(msg.sender, daiDraw);
emit LoanedDAI(msg.sender, daiDraw);
address payTo = msg.sender;
if (payTo != address(0)) {
payTo = beneficiary;
}
daiTkn.transfer(payTo, daiDraw);
emit LoanedDAI(msg.sender, daiDraw, payTo);
}
}
@ -221,6 +226,7 @@ contract RepayLoan is IssueLoan {
contract BorrowTasks is RepayLoan {
event TranferCDP(bytes32 cdp, address owner, address nextOwner);
event CDPClaimed(bytes32 cdp, address owner);
function transferCDP(address nextOwner) public {
require(nextOwner != 0, "Invalid Address.");
@ -230,6 +236,15 @@ contract BorrowTasks is RepayLoan {
emit TranferCDP(cdps[msg.sender], msg.sender, nextOwner);
}
function claimCDP(uint cdpNum) public {
bytes32 cdpBytes = bytes32(cdpNum);
MakerCDP loanMaster = MakerCDP(cdpAddr);
address cdpOwner = loanMaster.lad(cdpBytes);
require(cdps[cdpOwner] == blankCDP, "More than 1 CDP is not allowed.");
cdps[cdpOwner] = cdpBytes;
emit CDPClaimed(cdpBytes, msg.sender);
}
function getETHRate() public view returns (uint) {
PriceInterface ethRate = PriceInterface(getAddress("ethfeed"));
bytes32 ethrate;