crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added RichReverts to exchange-libs

Browse Source
This commit is contained in:
James Towle
2019-06-07 15:31:30 -07:00
committed by Amir Bandeali
parent 0395188aed
commit 3d58dc2a50
3 changed files with 86 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
contracts/exchange-libs/contracts/src/LibMath.sol
View File

@@ -19,10 +19,12 @@
pragma solidity ^0.5.9;
import "@0x/contracts-utils/contracts/src/SafeMath.sol";
import "./MixinLibMathRichErrors.sol";
contract LibMath is
SafeMath
SafeMath,
MixinLibMathRichErrors
{
/// @dev Calculates partial value given a numerator and denominator rounded down.
/// Reverts if rounding error is >= 0.1%
@@ -39,19 +41,21 @@ contract LibMath is
pure
returns (uint256 partialAmount)
{
require(
denominator > 0,
"DIVISION_BY_ZERO"
);
if (denominator == 0) {
_rrevert(DivisionByZeroError());
}
require(
!_isRoundingErrorFloor(
if (_isRoundingErrorFloor(
numerator,
denominator,
target
),
"ROUNDING_ERROR"
);
)) {
_rrevert(RoundingError(
numerator,
denominator,
target
));
}
partialAmount = _safeDiv(
_safeMul(numerator, target),
@@ -75,19 +79,21 @@ contract LibMath is
pure
returns (uint256 partialAmount)
{
require(
denominator > 0,
"DIVISION_BY_ZERO"
);
if (denominator == 0) {
_rrevert(DivisionByZeroError());
}
require(
!_isRoundingErrorCeil(
if (_isRoundingErrorFloor(
numerator,
denominator,
target
),
"ROUNDING_ERROR"
);
)) {
_rrevert(RoundingError(
numerator,
denominator,
target
));
}
// _safeDiv computes `floor(a / b)`. We use the identity (a, b integer):
// ceil(a / b) = floor((a + b - 1) / b)
@@ -116,10 +122,9 @@ contract LibMath is
pure
returns (uint256 partialAmount)
{
require(
denominator > 0,
"DIVISION_BY_ZERO"
);
if (denominator == 0) {
_rrevert(DivisionByZeroError());
}
partialAmount = _safeDiv(
_safeMul(numerator, target),
@@ -142,10 +147,9 @@ contract LibMath is
pure
returns (uint256 partialAmount)
{
require(
denominator > 0,
"DIVISION_BY_ZERO"
);
if (denominator == 0) {
_rrevert(DivisionByZeroError());
}
// _safeDiv computes `floor(a / b)`. We use the identity (a, b integer):
// ceil(a / b) = floor((a + b - 1) / b)
@@ -174,10 +178,9 @@ contract LibMath is
pure
returns (bool isError)
{
require(
denominator > 0,
"DIVISION_BY_ZERO"
);
if (denominator == 0) {
_rrevert(DivisionByZeroError());
}
// The absolute rounding error is the difference between the rounded
// value and the ideal value. The relative rounding error is the
@@ -228,10 +231,9 @@ contract LibMath is
pure
returns (bool isError)
{
require(
denominator > 0,
"DIVISION_BY_ZERO"
);
if (denominator == 0) {
_rrevert(DivisionByZeroError());
}
// See the comments in `isRoundingError`.
if (target == 0 || numerator == 0) {

36
contracts/exchange-libs/contracts/src/MixinLibMathRichErrors.sol Normal file
View File

@@ -0,0 +1,36 @@
pragma solidity ^0.5.9;
import "@0x/contracts-utils/contracts/src/RichErrors.sol";
import "./interfaces/IMixinLibMathRichErrors.sol";
contract MixinLibMathRichErrors is
IMixinLibMathRichErrors,
RichErrors
{
// solhint-disable func-name-mixedcase
function DivisionByZeroError()
internal
pure
returns (bytes memory)
{
return abi.encodeWithSelector(DIVISION_BY_ZERO);
}
function RoundingError(
uint256 numerator,
uint256 denominator,
uint256 target
)
internal
pure
returns (bytes memory)
{
return abi.encodeWithSelector(
ROUNDING_ERROR,
numerator,
denominator,
target
);
}
}

13
contracts/exchange-libs/contracts/src/interfaces/IMixinLibMathRichErrors.sol Normal file
View File

@@ -0,0 +1,13 @@
pragma solidity ^0.5.9;
contract IMixinLibMathRichErrors {
// bytes4(keccak256("DivisionByZeroError()"))
bytes4 internal constant DIVISION_BY_ZERO =
0xa791837c;
// bytes4(keccak256("RoundingError(uint256,uint256,uint256)"))
bytes4 internal constant ROUNDING_ERROR =
0x339f3de2;
}