diff --git a/remappings.txt b/remappings.txt index 5d58c6685..b35a5d2ab 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,5 +1,5 @@ @openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/ -@prb/math/=lib/prb-math/src/ +@prb/math/=lib/prb-math/ @prb/test/=lib/prb-test/src/ forge-std/=lib/forge-std/src/ solady/=lib/solady/src/ diff --git a/slither.config.json b/slither.config.json index 33d023000..725063073 100644 --- a/slither.config.json +++ b/slither.config.json @@ -3,7 +3,7 @@ "filter_paths": "(lib|test)", "solc_remaps": [ "@openzeppelin/contracts=lib/openzeppelin-contracts/contracts/", - "@prb/math/=lib/prb-math/src/", + "@prb/math/=lib/prb-math/", "@prb/test/=lib/prb-test/src/", "forge-std/=lib/forge-std/src/", "solady/=lib/solady/src/", diff --git a/src/SablierV2Comptroller.sol b/src/SablierV2Comptroller.sol index 9787928f2..2c7390980 100644 --- a/src/SablierV2Comptroller.sol +++ b/src/SablierV2Comptroller.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { UD60x18 } from "@prb/math/UD60x18.sol"; +import { UD60x18 } from "@prb/math/src/UD60x18.sol"; import { Adminable } from "./abstracts/Adminable.sol"; import { IAdminable } from "./interfaces/IAdminable.sol"; diff --git a/src/SablierV2LockupDynamic.sol b/src/SablierV2LockupDynamic.sol index 2b1aa143e..cf0ecd919 100644 --- a/src/SablierV2LockupDynamic.sol +++ b/src/SablierV2LockupDynamic.sol @@ -4,10 +4,10 @@ pragma solidity >=0.8.19; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol"; -import { PRBMathCastingUint128 as CastingUint128 } from "@prb/math/casting/Uint128.sol"; -import { PRBMathCastingUint40 as CastingUint40 } from "@prb/math/casting/Uint40.sol"; -import { SD59x18 } from "@prb/math/SD59x18.sol"; -import { UD60x18 } from "@prb/math/UD60x18.sol"; +import { PRBMathCastingUint128 as CastingUint128 } from "@prb/math/src/casting/Uint128.sol"; +import { PRBMathCastingUint40 as CastingUint40 } from "@prb/math/src/casting/Uint40.sol"; +import { SD59x18 } from "@prb/math/src/SD59x18.sol"; +import { UD60x18 } from "@prb/math/src/UD60x18.sol"; import { SablierV2Lockup } from "./abstracts/SablierV2Lockup.sol"; import { ISablierV2Comptroller } from "./interfaces/ISablierV2Comptroller.sol"; diff --git a/src/SablierV2LockupLinear.sol b/src/SablierV2LockupLinear.sol index ceee2109f..6bda0bcde 100644 --- a/src/SablierV2LockupLinear.sol +++ b/src/SablierV2LockupLinear.sol @@ -4,7 +4,7 @@ pragma solidity >=0.8.19; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol"; -import { UD60x18, ud } from "@prb/math/UD60x18.sol"; +import { UD60x18, ud } from "@prb/math/src/UD60x18.sol"; import { SablierV2Lockup } from "./abstracts/SablierV2Lockup.sol"; import { ISablierV2Comptroller } from "./interfaces/ISablierV2Comptroller.sol"; diff --git a/src/abstracts/SablierV2Base.sol b/src/abstracts/SablierV2Base.sol index 16b5c36a5..356777840 100644 --- a/src/abstracts/SablierV2Base.sol +++ b/src/abstracts/SablierV2Base.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.19; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; -import { UD60x18 } from "@prb/math/UD60x18.sol"; +import { UD60x18 } from "@prb/math/src/UD60x18.sol"; import { IAdminable } from "../interfaces/IAdminable.sol"; import { ISablierV2Base } from "../interfaces/ISablierV2Base.sol"; diff --git a/src/abstracts/SablierV2FlashLoan.sol b/src/abstracts/SablierV2FlashLoan.sol index 928a9ec2f..2b2002f74 100644 --- a/src/abstracts/SablierV2FlashLoan.sol +++ b/src/abstracts/SablierV2FlashLoan.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.19; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; -import { ud } from "@prb/math/UD60x18.sol"; +import { ud } from "@prb/math/src/UD60x18.sol"; import { IERC3156FlashBorrower } from "../interfaces/erc3156/IERC3156FlashBorrower.sol"; import { IERC3156FlashLender } from "../interfaces/erc3156/IERC3156FlashLender.sol"; diff --git a/src/interfaces/ISablierV2Base.sol b/src/interfaces/ISablierV2Base.sol index 9e6cf1644..ec7bcdbaf 100644 --- a/src/interfaces/ISablierV2Base.sol +++ b/src/interfaces/ISablierV2Base.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { UD60x18 } from "@prb/math/UD60x18.sol"; +import { UD60x18 } from "@prb/math/src/UD60x18.sol"; import { IAdminable } from "./IAdminable.sol"; import { ISablierV2Comptroller } from "./ISablierV2Comptroller.sol"; diff --git a/src/interfaces/ISablierV2Comptroller.sol b/src/interfaces/ISablierV2Comptroller.sol index d4557ee5c..a6a471530 100644 --- a/src/interfaces/ISablierV2Comptroller.sol +++ b/src/interfaces/ISablierV2Comptroller.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { UD60x18 } from "@prb/math/UD60x18.sol"; +import { UD60x18 } from "@prb/math/src/UD60x18.sol"; import { IAdminable } from "./IAdminable.sol"; diff --git a/src/libraries/Errors.sol b/src/libraries/Errors.sol index bcabb2819..4eb1a17a3 100644 --- a/src/libraries/Errors.sol +++ b/src/libraries/Errors.sol @@ -3,7 +3,7 @@ pragma solidity >=0.8.19; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { IERC721Metadata } from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; -import { UD60x18 } from "@prb/math/UD60x18.sol"; +import { UD60x18 } from "@prb/math/src/UD60x18.sol"; /// @title Errors /// @notice Library containing all custom errors the protocol may revert with. diff --git a/src/libraries/Helpers.sol b/src/libraries/Helpers.sol index 4c5477a62..a0c195fb5 100644 --- a/src/libraries/Helpers.sol +++ b/src/libraries/Helpers.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BUSL-1.1 pragma solidity >=0.8.19; -import { UD60x18, ud } from "@prb/math/UD60x18.sol"; +import { UD60x18, ud } from "@prb/math/src/UD60x18.sol"; import { Lockup, LockupDynamic, LockupLinear } from "../types/DataTypes.sol"; import { Errors } from "./Errors.sol"; diff --git a/src/types/DataTypes.sol b/src/types/DataTypes.sol index 117b93220..7e1bf1ab3 100644 --- a/src/types/DataTypes.sol +++ b/src/types/DataTypes.sol @@ -2,8 +2,8 @@ pragma solidity >=0.8.19; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { UD2x18 } from "@prb/math/UD2x18.sol"; -import { UD60x18 } from "@prb/math/UD60x18.sol"; +import { UD2x18 } from "@prb/math/src/UD2x18.sol"; +import { UD60x18 } from "@prb/math/src/UD60x18.sol"; // DataTypes.sol // diff --git a/src/types/Math.sol b/src/types/Math.sol index 1c72c7a24..bccd1b910 100644 --- a/src/types/Math.sol +++ b/src/types/Math.sol @@ -7,6 +7,6 @@ pragma solidity >=0.8.19; // This file re-exports all PRBMath types used in V2 Core. It is provided for convenience so // that users don't have to install PRBMath separately. -import { SD59x18, sd, sd59x18 } from "@prb/math/SD59x18.sol"; -import { UD2x18, ud2x18 } from "@prb/math/UD2x18.sol"; -import { UD60x18, ud, ud60x18 } from "@prb/math/UD60x18.sol"; +import { SD59x18, sd, sd59x18 } from "@prb/math/src/SD59x18.sol"; +import { UD2x18, ud2x18 } from "@prb/math/src/UD2x18.sol"; +import { UD60x18, ud, ud60x18 } from "@prb/math/src/UD60x18.sol"; diff --git a/test/fork/LockupDynamic.t.sol b/test/fork/LockupDynamic.t.sol index dbfd4fe5d..36152e12a 100644 --- a/test/fork/LockupDynamic.t.sol +++ b/test/fork/LockupDynamic.t.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { UD60x18 } from "@prb/math/UD60x18.sol"; +import { UD60x18 } from "@prb/math/src/UD60x18.sol"; import { Solarray } from "solarray/Solarray.sol"; import { Broker, Lockup, LockupDynamic } from "src/types/DataTypes.sol"; diff --git a/test/fork/LockupLinear.t.sol b/test/fork/LockupLinear.t.sol index d41a7b90c..149ff8227 100644 --- a/test/fork/LockupLinear.t.sol +++ b/test/fork/LockupLinear.t.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { UD60x18, ud } from "@prb/math/UD60x18.sol"; +import { UD60x18, ud } from "@prb/math/src/UD60x18.sol"; import { Solarray } from "solarray/Solarray.sol"; import { Broker, Lockup, LockupLinear } from "src/types/DataTypes.sol"; diff --git a/test/integration/concrete/comptroller/protocol-fees/protocolFees.t.sol b/test/integration/concrete/comptroller/protocol-fees/protocolFees.t.sol index f680ffb72..7cd76f917 100644 --- a/test/integration/concrete/comptroller/protocol-fees/protocolFees.t.sol +++ b/test/integration/concrete/comptroller/protocol-fees/protocolFees.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; +import { UD60x18, ZERO } from "@prb/math/src/UD60x18.sol"; import { Integration_Test } from "../../../Integration.t.sol"; diff --git a/test/integration/concrete/comptroller/set-protocol-fee/setProtocolFee.t.sol b/test/integration/concrete/comptroller/set-protocol-fee/setProtocolFee.t.sol index fd65bc4ee..91944a606 100644 --- a/test/integration/concrete/comptroller/set-protocol-fee/setProtocolFee.t.sol +++ b/test/integration/concrete/comptroller/set-protocol-fee/setProtocolFee.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; +import { UD60x18, ZERO } from "@prb/math/src/UD60x18.sol"; import { Errors } from "src/libraries/Errors.sol"; diff --git a/test/integration/concrete/flash-loan/flash-fee/flashFee.t.sol b/test/integration/concrete/flash-loan/flash-fee/flashFee.t.sol index 777ac5bdf..9c98d72c1 100644 --- a/test/integration/concrete/flash-loan/flash-fee/flashFee.t.sol +++ b/test/integration/concrete/flash-loan/flash-fee/flashFee.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { ud } from "@prb/math/UD60x18.sol"; +import { ud } from "@prb/math/src/UD60x18.sol"; import { Errors } from "src/libraries/Errors.sol"; diff --git a/test/integration/concrete/flash-loan/flash-loan/flashLoan.t.sol b/test/integration/concrete/flash-loan/flash-loan/flashLoan.t.sol index ac0b4b3e6..a1155e5ef 100644 --- a/test/integration/concrete/flash-loan/flash-loan/flashLoan.t.sol +++ b/test/integration/concrete/flash-loan/flash-loan/flashLoan.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19; -import { ud } from "@prb/math/UD60x18.sol"; +import { ud } from "@prb/math/src/UD60x18.sol"; import { IERC3156FlashLender } from "src/interfaces/erc3156/IERC3156FlashLender.sol"; import { Errors } from "src/libraries/Errors.sol"; diff --git a/test/integration/concrete/lockup-dynamic/create-with-deltas/createWithDeltas.t.sol b/test/integration/concrete/lockup-dynamic/create-with-deltas/createWithDeltas.t.sol index bdb11f9a6..f5b6105e0 100644 --- a/test/integration/concrete/lockup-dynamic/create-with-deltas/createWithDeltas.t.sol +++ b/test/integration/concrete/lockup-dynamic/create-with-deltas/createWithDeltas.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { ud2x18 } from "@prb/math/UD2x18.sol"; +import { ud2x18 } from "@prb/math/src/UD2x18.sol"; import { ISablierV2LockupDynamic } from "src/interfaces/ISablierV2LockupDynamic.sol"; import { Errors } from "src/libraries/Errors.sol"; diff --git a/test/integration/concrete/lockup-dynamic/create-with-milestones/createWithMilestones.t.sol b/test/integration/concrete/lockup-dynamic/create-with-milestones/createWithMilestones.t.sol index c72d9528e..6ce4607e9 100644 --- a/test/integration/concrete/lockup-dynamic/create-with-milestones/createWithMilestones.t.sol +++ b/test/integration/concrete/lockup-dynamic/create-with-milestones/createWithMilestones.t.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { UD60x18, ud, ZERO } from "@prb/math/UD60x18.sol"; +import { UD60x18, ud, ZERO } from "@prb/math/src/UD60x18.sol"; import { stdError } from "forge-std/StdError.sol"; import { ISablierV2LockupDynamic } from "src/interfaces/ISablierV2LockupDynamic.sol"; diff --git a/test/integration/concrete/lockup-linear/create-with-range/createWithRange.t.sol b/test/integration/concrete/lockup-linear/create-with-range/createWithRange.t.sol index 957d6cb23..d4a87d8bc 100644 --- a/test/integration/concrete/lockup-linear/create-with-range/createWithRange.t.sol +++ b/test/integration/concrete/lockup-linear/create-with-range/createWithRange.t.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { UD60x18, ud } from "@prb/math/UD60x18.sol"; +import { UD60x18, ud } from "@prb/math/src/UD60x18.sol"; import { ISablierV2LockupLinear } from "src/interfaces/ISablierV2LockupLinear.sol"; import { Errors } from "src/libraries/Errors.sol"; diff --git a/test/integration/fuzz/comptroller/setFlashFee.t.sol b/test/integration/fuzz/comptroller/setFlashFee.t.sol index ae28f6cd8..328bffa53 100644 --- a/test/integration/fuzz/comptroller/setFlashFee.t.sol +++ b/test/integration/fuzz/comptroller/setFlashFee.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; +import { UD60x18, ZERO } from "@prb/math/src/UD60x18.sol"; import { Integration_Test } from "../../Integration.t.sol"; diff --git a/test/integration/fuzz/comptroller/setProtocolFee.t.sol b/test/integration/fuzz/comptroller/setProtocolFee.t.sol index 957243be4..1e68dee2a 100644 --- a/test/integration/fuzz/comptroller/setProtocolFee.t.sol +++ b/test/integration/fuzz/comptroller/setProtocolFee.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; +import { UD60x18, ZERO } from "@prb/math/src/UD60x18.sol"; import { Integration_Test } from "../../Integration.t.sol"; diff --git a/test/integration/fuzz/flash-loan/flashFee.t.sol b/test/integration/fuzz/flash-loan/flashFee.t.sol index e3f52abee..ea62eb05f 100644 --- a/test/integration/fuzz/flash-loan/flashFee.t.sol +++ b/test/integration/fuzz/flash-loan/flashFee.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { UD60x18, ud } from "@prb/math/UD60x18.sol"; +import { UD60x18, ud } from "@prb/math/src/UD60x18.sol"; import { FlashLoan_Integration_Shared_Test } from "../../shared/flash-loan/FlashLoan.t.sol"; diff --git a/test/integration/fuzz/flash-loan/flashLoan.t.sol b/test/integration/fuzz/flash-loan/flashLoan.t.sol index 835ce1852..f33584dcd 100644 --- a/test/integration/fuzz/flash-loan/flashLoan.t.sol +++ b/test/integration/fuzz/flash-loan/flashLoan.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19; -import { UD60x18, ud } from "@prb/math/UD60x18.sol"; +import { UD60x18, ud } from "@prb/math/src/UD60x18.sol"; import { IERC3156FlashBorrower } from "src/interfaces/erc3156/IERC3156FlashBorrower.sol"; import { Errors } from "src/libraries/Errors.sol"; diff --git a/test/integration/fuzz/lockup-dynamic/createWithMilestones.t.sol b/test/integration/fuzz/lockup-dynamic/createWithMilestones.t.sol index fb1b0e354..ea733aa7f 100644 --- a/test/integration/fuzz/lockup-dynamic/createWithMilestones.t.sol +++ b/test/integration/fuzz/lockup-dynamic/createWithMilestones.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { MAX_UD60x18, UD60x18, ud, ZERO } from "@prb/math/UD60x18.sol"; +import { MAX_UD60x18, UD60x18, ud, ZERO } from "@prb/math/src/UD60x18.sol"; import { stdError } from "forge-std/StdError.sol"; import { Errors } from "src/libraries/Errors.sol"; diff --git a/test/integration/fuzz/lockup-dynamic/streamedAmountOf.t.sol b/test/integration/fuzz/lockup-dynamic/streamedAmountOf.t.sol index 0a4413b39..4aa326eec 100644 --- a/test/integration/fuzz/lockup-dynamic/streamedAmountOf.t.sol +++ b/test/integration/fuzz/lockup-dynamic/streamedAmountOf.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { ZERO } from "@prb/math/UD60x18.sol"; +import { ZERO } from "@prb/math/src/UD60x18.sol"; import { Broker, LockupDynamic } from "src/types/DataTypes.sol"; import { StreamedAmountOf_Integration_Shared_Test } from "../../shared/lockup/streamedAmountOf.t.sol"; diff --git a/test/integration/fuzz/lockup-dynamic/withdrawableAmountOf.t.sol b/test/integration/fuzz/lockup-dynamic/withdrawableAmountOf.t.sol index 69ac416f2..47413a197 100644 --- a/test/integration/fuzz/lockup-dynamic/withdrawableAmountOf.t.sol +++ b/test/integration/fuzz/lockup-dynamic/withdrawableAmountOf.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { ZERO } from "@prb/math/UD60x18.sol"; +import { ZERO } from "@prb/math/src/UD60x18.sol"; import { Broker, LockupDynamic } from "src/types/DataTypes.sol"; diff --git a/test/integration/fuzz/lockup-linear/createWithRange.t.sol b/test/integration/fuzz/lockup-linear/createWithRange.t.sol index f3c4031f5..5186a889c 100644 --- a/test/integration/fuzz/lockup-linear/createWithRange.t.sol +++ b/test/integration/fuzz/lockup-linear/createWithRange.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { MAX_UD60x18, UD60x18, ud } from "@prb/math/UD60x18.sol"; +import { MAX_UD60x18, UD60x18, ud } from "@prb/math/src/UD60x18.sol"; import { Errors } from "src/libraries/Errors.sol"; import { Broker, Lockup, LockupLinear } from "src/types/DataTypes.sol"; diff --git a/test/integration/fuzz/lockup-linear/streamedAmountOf.t.sol b/test/integration/fuzz/lockup-linear/streamedAmountOf.t.sol index e3813af7f..96a027378 100644 --- a/test/integration/fuzz/lockup-linear/streamedAmountOf.t.sol +++ b/test/integration/fuzz/lockup-linear/streamedAmountOf.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { ZERO } from "@prb/math/UD60x18.sol"; +import { ZERO } from "@prb/math/src/UD60x18.sol"; import { Broker, LockupLinear } from "src/types/DataTypes.sol"; diff --git a/test/integration/fuzz/lockup-linear/withdrawableAmountOf.t.sol b/test/integration/fuzz/lockup-linear/withdrawableAmountOf.t.sol index dc0d0b78a..c7d5fead6 100644 --- a/test/integration/fuzz/lockup-linear/withdrawableAmountOf.t.sol +++ b/test/integration/fuzz/lockup-linear/withdrawableAmountOf.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { ZERO } from "@prb/math/UD60x18.sol"; +import { ZERO } from "@prb/math/src/UD60x18.sol"; import { Broker, LockupLinear } from "src/types/DataTypes.sol"; diff --git a/test/invariant/handlers/ComptrollerHandler.sol b/test/invariant/handlers/ComptrollerHandler.sol index b78e6aac6..c5d9f5e6c 100644 --- a/test/invariant/handlers/ComptrollerHandler.sol +++ b/test/invariant/handlers/ComptrollerHandler.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19 <0.9.0; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { UD60x18, UNIT } from "@prb/math/UD60x18.sol"; +import { UD60x18, UNIT } from "@prb/math/src/UD60x18.sol"; import { ISablierV2Comptroller } from "src/interfaces/ISablierV2Comptroller.sol"; diff --git a/test/unit/concrete/comptroller/flash-fee/flashFee.t.sol b/test/unit/concrete/comptroller/flash-fee/flashFee.t.sol index f24d87962..9fe6fb139 100644 --- a/test/unit/concrete/comptroller/flash-fee/flashFee.t.sol +++ b/test/unit/concrete/comptroller/flash-fee/flashFee.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; +import { UD60x18, ZERO } from "@prb/math/src/UD60x18.sol"; import { Comptroller_Unit_Concrete_Test } from "../Comptroller.t.sol"; diff --git a/test/unit/concrete/comptroller/set-flash-fee/setFlashFee.t.sol b/test/unit/concrete/comptroller/set-flash-fee/setFlashFee.t.sol index 028e04f0d..2efb39738 100644 --- a/test/unit/concrete/comptroller/set-flash-fee/setFlashFee.t.sol +++ b/test/unit/concrete/comptroller/set-flash-fee/setFlashFee.t.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: UNLICENSED pragma solidity >=0.8.19 <0.9.0; -import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; +import { UD60x18, ZERO } from "@prb/math/src/UD60x18.sol"; import { Errors } from "src/libraries/Errors.sol"; diff --git a/test/utils/Assertions.sol b/test/utils/Assertions.sol index 194d85581..ebd3020c0 100644 --- a/test/utils/Assertions.sol +++ b/test/utils/Assertions.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { PRBMathAssertions } from "@prb/math/test/Assertions.sol"; +import { PRBMathAssertions } from "@prb/math/src/test/Assertions.sol"; import { PRBTest } from "@prb/test/PRBTest.sol"; import { Lockup, LockupDynamic, LockupLinear } from "../../src/types/DataTypes.sol"; diff --git a/test/utils/Calculations.sol b/test/utils/Calculations.sol index 153461e01..1a867d7bb 100644 --- a/test/utils/Calculations.sol +++ b/test/utils/Calculations.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity >=0.8.19; -import { PRBMathCastingUint128 as CastingUint128 } from "@prb/math/casting/Uint128.sol"; -import { PRBMathCastingUint40 as CastingUint40 } from "@prb/math/casting/Uint40.sol"; -import { SD59x18 } from "@prb/math/SD59x18.sol"; -import { UD60x18, ud } from "@prb/math/UD60x18.sol"; +import { PRBMathCastingUint128 as CastingUint128 } from "@prb/math/src/casting/Uint128.sol"; +import { PRBMathCastingUint40 as CastingUint40 } from "@prb/math/src/casting/Uint40.sol"; +import { SD59x18 } from "@prb/math/src/SD59x18.sol"; +import { UD60x18, ud } from "@prb/math/src/UD60x18.sol"; import { LockupDynamic } from "../../src/types/DataTypes.sol"; diff --git a/test/utils/Constants.sol b/test/utils/Constants.sol index 65f0385b2..996dad865 100644 --- a/test/utils/Constants.sol +++ b/test/utils/Constants.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity >=0.8.19; -import { UD60x18 } from "@prb/math/UD60x18.sol"; +import { UD60x18 } from "@prb/math/src/UD60x18.sol"; abstract contract Constants { bytes32 internal constant FLASH_LOAN_CALLBACK_SUCCESS = keccak256("ERC3156FlashBorrower.onFlashLoan"); diff --git a/test/utils/Defaults.sol b/test/utils/Defaults.sol index 19de100ec..cfc5061a7 100644 --- a/test/utils/Defaults.sol +++ b/test/utils/Defaults.sol @@ -2,8 +2,8 @@ pragma solidity >=0.8.19; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { UD2x18, ud2x18 } from "@prb/math/UD2x18.sol"; -import { UD60x18 } from "@prb/math/UD60x18.sol"; +import { UD2x18, ud2x18 } from "@prb/math/src/UD2x18.sol"; +import { UD60x18 } from "@prb/math/src/UD60x18.sol"; import { Broker, Lockup, LockupDynamic, LockupLinear } from "../../src/types/DataTypes.sol"; diff --git a/test/utils/Events.sol b/test/utils/Events.sol index dc9884d5f..fccfbeed3 100644 --- a/test/utils/Events.sol +++ b/test/utils/Events.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import { UD60x18 } from "@prb/math/UD60x18.sol"; +import { UD60x18 } from "@prb/math/src/UD60x18.sol"; import { IERC3156FlashBorrower } from "../../src/interfaces/erc3156/IERC3156FlashBorrower.sol"; import { ISablierV2Comptroller } from "../../src/interfaces/ISablierV2Comptroller.sol"; diff --git a/test/utils/Fuzzers.sol b/test/utils/Fuzzers.sol index c20fd5152..b9a8f6a26 100644 --- a/test/utils/Fuzzers.sol +++ b/test/utils/Fuzzers.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later pragma solidity >=0.8.19; -import { PRBMathCastingUint128 as CastingUint128 } from "@prb/math/casting/Uint128.sol"; -import { UD60x18, ud, uUNIT } from "@prb/math/UD60x18.sol"; +import { PRBMathCastingUint128 as CastingUint128 } from "@prb/math/src/casting/Uint128.sol"; +import { UD60x18, ud, uUNIT } from "@prb/math/src/UD60x18.sol"; import { Lockup, LockupDynamic } from "../../src/types/DataTypes.sol"; diff --git a/test/utils/Utils.sol b/test/utils/Utils.sol index 3a9b08928..9748d2d3a 100644 --- a/test/utils/Utils.sol +++ b/test/utils/Utils.sol @@ -2,7 +2,7 @@ pragma solidity >=0.8.19; import { Strings } from "@openzeppelin/contracts/utils/Strings.sol"; -import { PRBMathUtils } from "@prb/math/test/Utils.sol"; +import { PRBMathUtils } from "@prb/math/src/test/Utils.sol"; import { Vm } from "@prb/test/PRBTest.sol"; import { StdUtils } from "forge-std/StdUtils.sol";