Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: getExpectedAmount gas savings (C4 #62) #45

Merged
merged 7 commits into from
Dec 12, 2021
Merged

fix: getExpectedAmount gas savings (C4 #62) #45

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
35fbbcb
chore: Remove TODO on pullFunds (c4 #10)
deluca-mike Dec 12, 2021
e5f0d2e
chore: strict 0.8.7 (c4 #23)
deluca-mike Dec 12, 2021
b97df8a
fix: Add named returns where missing (c4 #25)
deluca-mike Dec 12, 2021
4a4c954
fix: `handleClaimOfRepossessed` gas optimization (c4 #66)
deluca-mike Dec 12, 2021
0f8bfc7
fix: `getExpectedAmount` gas savings (c4 #62)
deluca-mike Dec 12, 2021
cad1d11
Merge branch 'main' into sc-4304-c4-issue-62-colalteralassetdecimals-…
Dec 12, 2021
c779090
formatting: use loan instead of loanAddress
Dec 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions contracts/DebtLocker.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,19 +236,24 @@ contract DebtLocker is IDebtLocker, DebtLockerStorage, MapleProxied {
}

function getExpectedAmount(uint256 swapAmount_) external view override whenProtocolNotPaused returns (uint256 returnAmount_) {
address collateralAsset = IMapleLoanLike(_loan).collateralAsset();
address fundsAsset = IMapleLoanLike(_loan).fundsAsset();
address loan = _loan;
address collateralAsset = IMapleLoanLike(loan).collateralAsset();
address fundsAsset = IMapleLoanLike(loan).fundsAsset();

address globals = _getGlobals();

uint8 collateralAssetDecimals = IERC20Like(collateralAsset).decimals();

uint256 oracleAmount =
swapAmount_
* IMapleGlobalsLike(_getGlobals()).getLatestPrice(collateralAsset) // Convert from `fromAsset` value.
* 10 ** uint256(IERC20Like(fundsAsset).decimals()) // Convert to `toAsset` decimal precision.
* (10_000 - _allowedSlippage) // Multiply by allowed slippage basis points
/ IMapleGlobalsLike(_getGlobals()).getLatestPrice(fundsAsset) // Convert to `toAsset` value.
/ 10 ** uint256(IERC20Like(collateralAsset).decimals()) // Convert from `fromAsset` decimal precision.
/ 10_000; // Divide basis points for slippage

uint256 minRatioAmount = swapAmount_ * _minRatio / 10 ** IERC20Like(collateralAsset).decimals();
* IMapleGlobalsLike(globals).getLatestPrice(collateralAsset) // Convert from `fromAsset` value.
* uint256(10) ** uint256(IERC20Like(fundsAsset).decimals()) // Convert to `toAsset` decimal precision.
* (uint256(10_000) - _allowedSlippage) // Multiply by allowed slippage basis points
/ IMapleGlobalsLike(globals).getLatestPrice(fundsAsset) // Convert to `toAsset` value.
/ uint256(10) ** uint256(collateralAssetDecimals) // Convert from `fromAsset` decimal precision.
/ uint256(10_000); // Divide basis points for slippage.

uint256 minRatioAmount = swapAmount_ * _minRatio / 10 ** collateralAssetDecimals;

return oracleAmount > minRatioAmount ? oracleAmount : minRatioAmount;
}
Expand Down