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.

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

♻️ Saturating #1334

Merged
merged 3 commits into from
Feb 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 33 additions & 0 deletions docs/utils/fixedpointmathlib.md
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,41 @@ function zeroFloorSub(uint256 x, uint256 y)
returns (uint256 z)
```

Returns `max(0, x - y)`. Alias for `saturatingSub`.

### saturatingSub(uint256,uint256)

```solidity
function saturatingSub(uint256 x, uint256 y)
internal
pure
returns (uint256 z)
```

Returns `max(0, x - y)`.

### saturatingAdd(uint256,uint256)

```solidity
function saturatingAdd(uint256 x, uint256 y)
internal
pure
returns (uint256 z)
```

Returns `min(2 ** 256 - 1, x + y)`.

### saturatingMul(uint256,uint256)

```solidity
function saturatingMul(uint256 x, uint256 y)
internal
pure
returns (uint256 z)
```

Returns `min(2 ** 256 - 1, x * y)`.

### ternary(bool,uint256,uint256)

```solidity
Expand Down
10 changes: 9 additions & 1 deletion src/utils/FixedPointMathLib.sol
Original file line number Diff line number Diff line change
Expand Up @@ -653,14 +653,22 @@ library FixedPointMathLib {
}
}

/// @dev Returns `max(0, x - y)`. Also known as saturating subtraction.
/// @dev Returns `max(0, x - y)`. Alias for `saturatingSub`.
function zeroFloorSub(uint256 x, uint256 y) internal pure returns (uint256 z) {
/// @solidity memory-safe-assembly
assembly {
z := mul(gt(x, y), sub(x, y))
}
}

/// @dev Returns `max(0, x - y)`.
function saturatingSub(uint256 x, uint256 y) internal pure returns (uint256 z) {
/// @solidity memory-safe-assembly
assembly {
z := mul(gt(x, y), sub(x, y))
}
}

/// @dev Returns `min(2 ** 256 - 1, x + y)`.
function saturatingAdd(uint256 x, uint256 y) internal pure returns (uint256 z) {
/// @solidity memory-safe-assembly
Expand Down
10 changes: 5 additions & 5 deletions test/FixedPointMathLib.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2184,30 +2184,30 @@ contract FixedPointMathLibTest is SoladyTest {
assert(FixedPointMathLib.saturatingAdd(x, y) == expected);
}

function testSaturatingAdd() public {
function testSaturatingAdd() public view {
testSaturatingAdd(123, 456);
}

function check_SaturatingAddEquivalence(uint256 x, uint256 y) public {
function check_SaturatingAddEquivalence(uint256 x, uint256 y) public view {
testSaturatingAdd(x, y);
}

function add(uint256 x, uint256 y) public pure returns (uint256) {
return x + y;
}

function testSaturatingMul(uint256 x, uint256 y) public {
function testSaturatingMul(uint256 x, uint256 y) public view {
bytes memory data = abi.encodeWithSignature("mul(uint256,uint256)", x, y);
(bool success,) = address(this).staticcall(data);
uint256 expected = !success ? type(uint256).max : x * y;
assert(FixedPointMathLib.saturatingMul(x, y) == expected);
}

function check_SaturatingMulEquivalence(uint256 x, uint256 y) public {
function check_SaturatingMulEquivalence(uint256 x, uint256 y) public view {
testSaturatingMul(x, y);
}

function testSaturatingMul() public {
function testSaturatingMul() public view {
testSaturatingMul(123, 456);
}

Expand Down