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

Code refactor

Browse Source
This commit is contained in:
Thrilok Kumar 2019-11-12 03:46:16 +05:30
parent 3003d00e44
commit 95485916fa
1 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
contracts/ProxyLogics/MCD/InstaMcdMigrate.sol
View File

@ -262,6 +262,27 @@ contract MKRSwapper is LiquidityResolver {
contract SCDResolver is MKRSwapper { contract SCDResolver is MKRSwapper {
function getFeeOfCdp(bytes32 cup, uint _wad) internal returns (uint feeAmt) {
// Set ratio according to user.
TubInterface tub = TubInterface(getSaiTubAddress());
(bytes32 val, bool ok) = tub.pep().peek();
TokenInterface mkr = TubInterface(getSaiTubAddress()).gov();
feeAmt = 0;
// wad according to toConvert ratio
if (ok && val != 0) {
// MKR required for wipe = Stability fees accrued in Dai / MKRUSD value
uint mkrFee = rdiv(tub.rap(cup), tub.tab(cup));
mkrFee = rmul(_wad, mkrFee);
mkrFee = wdiv(mkrFee, uint(val));
feeAmt = OtcInterface(getOtcAddress()).getPayAmount(getSaiAddress(), address(mkr), mkrFee);
}
}
function open() internal returns (bytes32 cup) { function open() internal returns (bytes32 cup) {
cup = TubInterface(getSaiTubAddress()).open(); cup = TubInterface(getSaiTubAddress()).open();
} }
@ -278,17 +299,10 @@ contract SCDResolver is MKRSwapper {
setAllowance(dai, getSaiTubAddress()); setAllowance(dai, getSaiTubAddress());
setAllowance(mkr, getSaiTubAddress()); setAllowance(mkr, getSaiTubAddress());
(bytes32 val, bool ok) = tub.pep().peek(); uint mkrFee = getFeeOfCdp(cup, _wad);
if (ok && val != 0) { if (payFeeWith != address(mkr) && mkrFee > 0) {
// MKR required for wipe = Stability fees accrued in Dai / MKRUSD value swapToMkrOtc(payFeeWith, mkrFee); //otc
uint mkrFee = rdiv(tub.rap(cup), tub.tab(cup));
mkrFee = rmul(_wad, mkrFee);
mkrFee = wdiv(mkrFee, uint(val));
if (payFeeWith != address(mkr) && mkrFee > 0) { // Check Thrilok - if not mkr
swapToMkrOtc(payFeeWith, mkrFee); //otc
}
} }
tub.wipe(cup, _wad); tub.wipe(cup, _wad);
@ -380,27 +394,6 @@ contract MCDResolver is SCDResolver {
contract MigrateHelper is MCDResolver { contract MigrateHelper is MCDResolver {
function setFeeWithDebt(bytes32 cup, uint _wad) internal returns (uint feeAmt) {
// Set ratio according to user.
TubInterface tub = TubInterface(getSaiTubAddress());
(bytes32 val, bool ok) = tub.pep().peek();
TokenInterface mkr = TubInterface(getSaiTubAddress()).gov();
feeAmt = 0;
// wad according to toConvert ratio
if (ok && val != 0) {
// MKR required for wipe = Stability fees accrued in Dai / MKRUSD value
uint mkrFee = rdiv(tub.rap(cup), tub.tab(cup));
mkrFee = rmul(_wad, mkrFee);
mkrFee = wdiv(mkrFee, uint(val));
feeAmt = OtcInterface(getOtcAddress()).getPayAmount(getSaiAddress(), address(mkr), mkrFee);
}
}
function setSplitAmount( function setSplitAmount(
bytes32 cup, bytes32 cup,
uint toConvert, uint toConvert,
@ -421,7 +414,7 @@ contract MigrateHelper is MCDResolver {
_wad = wmul(_wadTotal, toConvert); _wad = wmul(_wadTotal, toConvert);
if (payFeeWith == getSaiAddress()) { if (payFeeWith == getSaiAddress()) {
feeAmt = setFeeWithDebt(cup, _wad); feeAmt = getFeeOfCdp(cup, _wad);
_wad = add(_wad, feeAmt); _wad = add(_wad, feeAmt);
} }
@ -447,27 +440,28 @@ contract MigrateHelper is MCDResolver {
//getting InstaDApp Pool Balance. //getting InstaDApp Pool Balance.
uint initialPoolBal = sub(getPoolAddress().balance, 10000000000); uint initialPoolBal = sub(getPoolAddress().balance, 10000000000);
uint _wadWithFee = payFeeWith == getSaiAddress() ? add(_wad, setFeeWithDebt(scdCup, _wad)) : _wad; // Check Thrilok - gas fee; // Check if the split fee is paid by debt from the cdp.
uint _wadForDebt = payFeeWith == getSaiAddress() ? add(_wad, getFeeOfCdp(scdCup, _wad)) : _wad; // Check Thrilok - gas fee;
//fetch liquidity from InstaDApp Pool. //fetch liquidity from InstaDApp Pool.
getLiquidity(_wadWithFee); getLiquidity(_wadForDebt);
//transfer assets from scdCup to splitCup. //transfer assets from scdCup to splitCup.
wipe(scdCup, _wad, payFeeWith); wipe(scdCup, _wad, payFeeWith);
free(scdCup, _ink); free(scdCup, _ink);
lock(splitCup, _ink); lock(splitCup, _ink);
draw(splitCup, _wadWithFee); draw(splitCup, _wadForDebt);
//transfer and payback liquidity to InstaDApp Pool. //transfer and payback liquidity to InstaDApp Pool.
paybackLiquidity(_wadWithFee); paybackLiquidity(_wadForDebt);
uint finalPoolBal = getPoolAddress().balance; uint finalPoolBal = getPoolAddress().balance;
assert(finalPoolBal >= initialPoolBal); assert(finalPoolBal >= initialPoolBal);
} }
function drawDebtForFee(bytes32 cup) internal { function drawDebtForFee(bytes32 cup) internal {
TubInterface tub = TubInterface(getSaiTubAddress()); uint _wad = TubInterface(getSaiTubAddress()).tab(cup);
uint _wad = tub.tab(cup); uint fee = getFeeOfCdp(cup, _wad);
uint fee = setFeeWithDebt(cup, _wad);
draw(cup, fee); draw(cup, fee);
} }
} }