Fix error when importing @prb/math packages when installed via npm (#648

)

* fix: address #646

* chore: update remapping in slither config

---------

Co-authored-by: Paul Razvan Berg <paul.razvan.berg@gmail.com>

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/

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/",

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";

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";

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";

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";

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";

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";

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";
 

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.

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";

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
 //

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";

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";

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";

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";
 

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";
 

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";
 

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";

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";

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";

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";

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";
 

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";
 

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";
 

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";

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";

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";

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";
 

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";

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";
 

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";
 

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";
 

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";
 

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";
 

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";

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";
 

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");

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";
 

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";

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";
 

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";