Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated PercentageMath

Browse Source
This commit is contained in:
emilio 2020-10-28 12:39:11 +01:00
parent 064af06385
commit e91e3595d6
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contracts/libraries/math/PercentageMath.sol
View File

@ -22,19 +22,13 @@ library PercentageMath {
* @return the percentage of value * @return the percentage of value
**/ **/
function percentMul(uint256 value, uint256 percentage) internal pure returns (uint256) { function percentMul(uint256 value, uint256 percentage) internal pure returns (uint256) {
if (value == 0) { if (value == 0 || percentage == 0) {
return 0; return 0;
} }
uint256 result = value * percentage; require(value <= (type(uint256).max - HALF_PERCENT)/percentage, Errors.MULTIPLICATION_OVERFLOW);
require(result / value == percentage, Errors.MULTIPLICATION_OVERFLOW); return (value * percentage + HALF_PERCENT) / PERCENTAGE_FACTOR;
result += HALF_PERCENT;
require(result >= HALF_PERCENT, Errors.ADDITION_OVERFLOW);
return result / PERCENTAGE_FACTOR;
} }
/** /**
@ -47,14 +41,8 @@ library PercentageMath {
require(percentage != 0, Errors.DIVISION_BY_ZERO); require(percentage != 0, Errors.DIVISION_BY_ZERO);
uint256 halfPercentage = percentage / 2; uint256 halfPercentage = percentage / 2;
uint256 result = value * PERCENTAGE_FACTOR; require(value <= (type(uint256).max - halfPercentage)/PERCENTAGE_FACTOR, Errors.MULTIPLICATION_OVERFLOW);
require(result / PERCENTAGE_FACTOR == value, Errors.MULTIPLICATION_OVERFLOW); return (value * PERCENTAGE_FACTOR + halfPercentage) / percentage;
result += halfPercentage;
require(result >= halfPercentage, Errors.ADDITION_OVERFLOW);
return result / percentage;
} }
} }