aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/2.0.0
diff options
context:
space:
mode:
authorRemco Bloemen <remco@wicked.ventures>2018-08-23 03:22:49 +0800
committerRemco Bloemen <remco@wicked.ventures>2018-08-25 05:09:50 +0800
commitab5df342e1dc4add20223fab7128f9323a114b8e (patch)
tree9002ad9a011459ed401445fc5412a34be27aeecf /packages/contracts/src/2.0.0
parente68942ee78eb19c27a96fb0b6b8b05c83b647bcc (diff)
downloaddexon-sol-tools-ab5df342e1dc4add20223fab7128f9323a114b8e.tar
dexon-sol-tools-ab5df342e1dc4add20223fab7128f9323a114b8e.tar.gz
dexon-sol-tools-ab5df342e1dc4add20223fab7128f9323a114b8e.tar.bz2
dexon-sol-tools-ab5df342e1dc4add20223fab7128f9323a114b8e.tar.lz
dexon-sol-tools-ab5df342e1dc4add20223fab7128f9323a114b8e.tar.xz
dexon-sol-tools-ab5df342e1dc4add20223fab7128f9323a114b8e.tar.zst
dexon-sol-tools-ab5df342e1dc4add20223fab7128f9323a114b8e.zip
Add getPartialAmountCeil
Diffstat (limited to 'packages/contracts/src/2.0.0')
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/libs/LibMath.sol35
1 files changed, 32 insertions, 3 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibMath.sol b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibMath.sol
index 758b7ec90..3e70d1b60 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibMath.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/libs/LibMath.sol
@@ -29,7 +29,7 @@ contract LibMath is
/// @param numerator Numerator.
/// @param denominator Denominator.
/// @param target Value to calculate partial of.
- /// @return Partial value of target.
+ /// @return Partial value of target rounded down.
function getPartialAmount(
uint256 numerator,
uint256 denominator,
@@ -45,8 +45,37 @@ contract LibMath is
);
return partialAmount;
}
-
- /// @dev Checks if rounding error >= 0.1%.
+
+ /// @dev Calculates partial value given a numerator and denominator.
+ /// @param numerator Numerator.
+ /// @param denominator Denominator.
+ /// @param target Value to calculate partial of.
+ /// @return Partial value of target rounded up.
+ function getPartialAmountCeil(
+ uint256 numerator,
+ uint256 denominator,
+ uint256 target
+ )
+ internal
+ pure
+ returns (uint256 partialAmount)
+ {
+ require(
+ denominator > 0,
+ "DIVISION_BY_ZERO"
+ );
+
+ // SafeDiv rounds down. To use it to round up we need to add
+ // denominator - 1. This causes anything less than an exact multiple
+ // of denominator to be rounded up.
+ partialAmount = safeDiv(
+ safeAdd(safeMul(numerator, target), safeSub(denominator, 1)),
+ denominator
+ );
+ return partialAmount;
+ }
+
+ /// @dev Checks if rounding error > 0.1%.
/// @param numerator Numerator.
/// @param denominator Denominator.
/// @param target Value to multiply with numerator/denominator.