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

Fixed problem in shut() when no debt.

Browse Source
This commit is contained in:
Sowmayjain 2019-04-11 01:07:40 +05:30
parent 5692a86d51
commit fa5ec877bf
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
contracts/ProxyLogics/InstaMaker.sol
View File

@ -146,11 +146,10 @@ contract CDPResolver is Helpers {
} }
function free(uint cdpNum, uint jam) public { function free(uint cdpNum, uint jam) public {
bytes32 cup = bytes32(cdpNum);
address tubAddr = getSaiTubAddress();
if (jam > 0) { if (jam > 0) {
bytes32 cup = bytes32(cdpNum);
address tubAddr = getSaiTubAddress();
TubInterface tub = TubInterface(tubAddr); TubInterface tub = TubInterface(tubAddr);
TokenInterface peth = tub.skr(); TokenInterface peth = tub.skr();
TokenInterface weth = tub.gem(); TokenInterface weth = tub.gem();
@ -180,40 +179,40 @@ contract CDPResolver is Helpers {
} }
function wipe(uint cdpNum, uint _wad) public { function wipe(uint cdpNum, uint _wad) public {
require(_wad > 0, "no-wipe-no-dai"); if (_wad > 0) {
TubInterface tub = TubInterface(getSaiTubAddress());
UniswapExchange daiEx = UniswapExchange(getUniswapDAIExchange());
UniswapExchange mkrEx = UniswapExchange(getUniswapMKRExchange());
TokenInterface dai = tub.sai();
TokenInterface mkr = tub.gov();
TubInterface tub = TubInterface(getSaiTubAddress()); bytes32 cup = bytes32(cdpNum);
UniswapExchange daiEx = UniswapExchange(getUniswapDAIExchange());
UniswapExchange mkrEx = UniswapExchange(getUniswapMKRExchange());
TokenInterface dai = tub.sai();
TokenInterface mkr = tub.gov();
bytes32 cup = bytes32(cdpNum); setAllowance(dai, getSaiTubAddress());
setAllowance(mkr, getSaiTubAddress());
setAllowance(dai, getUniswapDAIExchange());
setAllowance(dai, getSaiTubAddress()); (bytes32 val, bool ok) = tub.pep().peek();
setAllowance(mkr, getSaiTubAddress());
setAllowance(dai, getUniswapDAIExchange());
(bytes32 val, bool ok) = tub.pep().peek(); // MKR required for wipe = Stability fees accrued in Dai / MKRUSD value
uint mkrFee = wdiv(rmul(_wad, rdiv(tub.rap(cup), tub.tab(cup))), uint(val));
// MKR required for wipe = Stability fees accrued in Dai / MKRUSD value uint daiAmt = daiEx.getTokenToEthOutputPrice(mkrEx.getEthToTokenOutputPrice(mkrFee));
uint mkrFee = wdiv(rmul(_wad, rdiv(tub.rap(cup), tub.tab(cup))), uint(val)); daiAmt = add(_wad, daiAmt);
require(dai.transferFrom(msg.sender, address(this), daiAmt), "not-approved-yet");
uint daiAmt = daiEx.getTokenToEthOutputPrice(mkrEx.getEthToTokenOutputPrice(mkrFee)); if (ok && val != 0) {
daiAmt = add(_wad, daiAmt); daiEx.tokenToTokenSwapOutput(
require(dai.transferFrom(msg.sender, address(this), daiAmt), "not-approved-yet"); mkrFee,
daiAmt,
uint(999000000000000000000),
uint(1899063809), // 6th March 2030 GMT // no logic
address(mkr)
);
}
if (ok && val != 0) { tub.wipe(cup, _wad);
daiEx.tokenToTokenSwapOutput(
mkrFee,
daiAmt,
uint(999000000000000000000),
uint(1899063809), // 6th March 2030 GMT // no logic
address(mkr)
);
} }
tub.wipe(cup, _wad);
} }
function setAllowance(TokenInterface token_, address spender_) private { function setAllowance(TokenInterface token_, address spender_) private {