Instadapp/dsa-connectors-old
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors-old.git synced 2024-07-29 22:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update order

Browse Source
This commit is contained in:
Mubaris NK 2021-01-09 19:05:14 +05:30
parent 70e3bc6348
commit b9778e822c
No known key found for this signature in database
GPG Key ID: 1F132294E8700320
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contracts/connectors/refinance.sol
View File

@ -494,10 +494,12 @@ contract Helpers is DSMath {
} }
function transferFees(address token, uint feeAmt) internal { function transferFees(address token, uint feeAmt) internal {
if (token == getEthAddr()) { if (feeAmt > 0) {
feeCollector.transfer(feeAmt); if (token == getEthAddr()) {
} else { feeCollector.transfer(feeAmt);
IERC20(token).safeTransfer(feeCollector, feeAmt); } else {
IERC20(token).safeTransfer(feeCollector, feeAmt);
}
} }
} }
} }
@ -992,12 +994,13 @@ contract MakerHelpers is AaveV2Helpers {
makerData.daiJoin = getMcdDaiJoin(); makerData.daiJoin = getMcdDaiJoin();
makerData.vatContract = VatLike(managerContract.vat()); makerData.vatContract = VatLike(managerContract.vat());
transferFees(address(makerData.tokenContract), collateralFeeAmt);
if (address(makerData.tokenContract) == getWethAddr()) { if (address(makerData.tokenContract) == getWethAddr()) {
makerData.tokenContract.deposit.value(_collateralAmt)(); makerData.tokenContract.deposit.value(_collateralAmt)();
} }
transferFees(address(makerData.tokenContract), collateralFeeAmt);
transferFees(getMcdDai(), debtFeeAmt);
makerData.tokenContract.approve(address(makerData.colAddr), _collateralAmt); makerData.tokenContract.approve(address(makerData.colAddr), _collateralAmt);
makerData.tokenJoinContract.join(urn, _collateralAmt); makerData.tokenJoinContract.join(urn, _collateralAmt);