mirror of
https://github.com/Instadapp/smart-contract.git
synced 2024-07-29 22:08:07 +00:00
Merge branch 'master' of https://github.com/InstaDApp/contract-v2
This commit is contained in:
commit
ca4cbec1e1
|
@ -282,7 +282,7 @@ contract MakerHelpers is Helpers {
|
||||||
function joinDaiJoin(address urn, uint wad) internal {
|
function joinDaiJoin(address urn, uint wad) internal {
|
||||||
address daiJoin = InstaMcdAddress(getMcdAddresses()).daiJoin();
|
address daiJoin = InstaMcdAddress(getMcdAddresses()).daiJoin();
|
||||||
// Gets DAI from the user's wallet
|
// Gets DAI from the user's wallet
|
||||||
DaiJoinLike(daiJoin).dai().transferFrom(msg.sender, address(this), wad);
|
// DaiJoinLike(daiJoin).dai().transferFrom(msg.sender, address(this), wad); // getting dai from eth swap.
|
||||||
// Approves adapter to take the DAI amount
|
// Approves adapter to take the DAI amount
|
||||||
DaiJoinLike(daiJoin).dai().approve(daiJoin, wad);
|
DaiJoinLike(daiJoin).dai().approve(daiJoin, wad);
|
||||||
// Joins DAI into the vat
|
// Joins DAI into the vat
|
||||||
|
@ -630,7 +630,6 @@ contract Save is GetDetails {
|
||||||
uint maxDebtLimit = sub(wdiv(colToUSD, 1500000000000000000), 10);
|
uint maxDebtLimit = sub(wdiv(colToUSD, 1500000000000000000), 10);
|
||||||
debtToBorrow = sub(maxDebtLimit, daiDebt);
|
debtToBorrow = sub(maxDebtLimit, daiDebt);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user