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

Executed dapp based fee model.

Browse Source
This commit is contained in:
Sowmayjain 2018-11-30 12:20:50 +05:30
parent b1c3e807d5
commit 99a1fc199e
2 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
contracts/protocols/InstaKyber.sol
View File

@ -79,7 +79,9 @@ contract Trade is Registry {
uint destAmt,
address beneficiary,
uint minConversionRate,
address affiliate
address referral,
uint cut,
address partner
);
function getExpectedPrice(
@ -106,14 +108,16 @@ contract Trade is Registry {
address src, // token to sell
address dest, // token to buy
uint srcAmt, // amount of token for sell
uint srcAmtToFetch, // amount of token for sell + fees // equal to srcAmt or greater
uint minConversionRate, // minimum slippage rate
uint maxDestAmt // max amount of dest token
uint maxDestAmt, // max amount of dest token
address partner // affiliate partner
) public payable returns (uint destAmt)
{
address eth = getAddress("eth");
uint ethQty = getToken(
msg.sender, src, srcAmt, eth
msg.sender, src, srcAmt, srcAmtToFetch, eth
);
// Interacting with Kyber Proxy Contract
@ -129,18 +133,27 @@ contract Trade is Registry {
);
// maxDestAmt usecase implementated
if (src == eth && address(this).balance > 0) {
msg.sender.transfer(address(this).balance);
uint cut = srcAmtToFetch - srcAmt;
if (src == eth && (address(this).balance - cut) > 0) {
msg.sender.transfer(address(this).balance - cut);
} else if (src != eth) { // as there is no balanceOf of eth
IERC20 srcTkn = IERC20(src);
uint srcBal = srcTkn.balanceOf(address(this));
if (srcBal > 0) {
srcTkn.transfer(msg.sender, srcBal);
if ((srcBal - cut) > 0) {
srcTkn.transfer(msg.sender, srcBal - cut);
}
}
emit KyberTrade(
src, srcAmt, dest, destAmt, msg.sender, minConversionRate, getAddress("admin")
src,
srcAmt,
dest,
destAmt,
msg.sender,
minConversionRate,
getAddress("admin"),
cut,
partner
);
}
@ -149,6 +162,7 @@ contract Trade is Registry {
address trader,
address src,
uint srcAmt,
uint srcAmtToFetch,
address eth
) internal returns (uint ethQty)
{
@ -157,7 +171,7 @@ contract Trade is Registry {
ethQty = srcAmt;
} else {
IERC20 tokenFunctions = IERC20(src);
tokenFunctions.transferFrom(trader, address(this), srcAmt);
tokenFunctions.transferFrom(trader, address(this), srcAmtToFetch);
ethQty = 0;
}
}

19
contracts/protocols/InstaMaker.sol
View File

@ -57,8 +57,10 @@ interface InstaKyber {
address src,
address dest,
uint srcAmt,
uint srcAmtToFetch,
uint minConversionRate,
uint maxDestAmt
uint maxDestAmt,
address partner
) external payable returns (uint destAmt);
function getExpectedPrice(
@ -207,12 +209,15 @@ contract RepayLoan is IssueLoan {
uint minRate;
(, minRate) = instak.getExpectedPrice(eth, mkr, ethQty);
uint mkrBought = instak.executeTrade.value(ethQty)(
eth, mkr, ethQty, minRate, mkrCharged
eth,
mkr,
ethQty,
ethQty,
minRate,
mkrCharged,
address(this)
);
require(mkrCharged == mkrBought, "ETH not sufficient to cover the MKR fees.");
if (address(this).balance > 0) {
msg.sender.transfer(address(this).balance);
}
}
}
@ -278,4 +283,8 @@ contract InstaMaker is BorrowTasks {
emit MKRCollected(amount);
}
function collectETH(uint amount) public onlyAdmin {
msg.sender.transfer(amount);
}
}