From ee81d5b1f5e4059127ff71109416106cf09003a2 Mon Sep 17 00:00:00 2001 From: Paul Razvan Berg Date: Sat, 4 Feb 2023 21:56:05 +0200 Subject: [PATCH 1/6] build: upgrade to solc v0.8.18 refactor: name mapping parameters --- .prettierrc.yml | 2 +- foundry.toml | 4 +++- src/SablierV2Comptroller.sol | 4 ++-- src/SablierV2LockupLinear.sol | 2 +- src/SablierV2LockupPro.sol | 4 ++-- src/abstracts/SablierV2Config.sol | 2 +- test/invariant/handlers/BaseHandler.t.sol | 2 +- test/invariant/handlers/LockupHandler.t.sol | 4 ++-- test/invariant/handlers/LockupHandlerStorage.t.sol | 10 +++++----- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.prettierrc.yml b/.prettierrc.yml index bd56d83e7..d914a78e1 100644 --- a/.prettierrc.yml +++ b/.prettierrc.yml @@ -9,5 +9,5 @@ useTabs: false overrides: - files: "*.sol" options: - compiler: "0.8.17" + compiler: "0.8.18" tabWidth: 4 diff --git a/foundry.toml b/foundry.toml index a12685364..9c3ec838d 100644 --- a/foundry.toml +++ b/foundry.toml @@ -1,5 +1,7 @@ [profile.default] auto_detect_solc = false + bytecode_hash = "none" + cbor_metadata = false fs_permissions = [{ access = "read", path = "./optimized-out" }] libs = ["lib"] gas_reports = [ @@ -11,7 +13,7 @@ optimizer_runs = 10_000 out = "out" script = "script" - solc = "0.8.17" + solc = "0.8.18" src = "src" test = "test" diff --git a/src/SablierV2Comptroller.sol b/src/SablierV2Comptroller.sol index 696e4096a..9f2681b29 100644 --- a/src/SablierV2Comptroller.sol +++ b/src/SablierV2Comptroller.sol @@ -44,10 +44,10 @@ contract SablierV2Comptroller is //////////////////////////////////////////////////////////////////////////*/ /// @dev ERC-20 assets that can be flash loaned. - mapping(IERC20 => bool) internal _flashAssets; + mapping(IERC20 asset => bool supported) internal _flashAssets; /// @dev Global fees mapped by ERC-20 asset addresses. - mapping(IERC20 => UD60x18) internal _protocolFees; + mapping(IERC20 asset => UD60x18) internal _protocolFees; /*////////////////////////////////////////////////////////////////////////// CONSTRUCTOR diff --git a/src/SablierV2LockupLinear.sol b/src/SablierV2LockupLinear.sol index d228e87f0..037407059 100644 --- a/src/SablierV2LockupLinear.sol +++ b/src/SablierV2LockupLinear.sol @@ -51,7 +51,7 @@ contract SablierV2LockupLinear is //////////////////////////////////////////////////////////////////////////*/ /// @dev Sablier V2 linear lockup streams mapped by unsigned integers. - mapping(uint256 => LockupLinear.Stream) internal _streams; + mapping(uint256 id => LockupLinear.Stream) internal _streams; /*////////////////////////////////////////////////////////////////////////// CONSTRUCTOR diff --git a/src/SablierV2LockupPro.sol b/src/SablierV2LockupPro.sol index 87ee3e6c4..add4808bb 100644 --- a/src/SablierV2LockupPro.sol +++ b/src/SablierV2LockupPro.sol @@ -61,8 +61,8 @@ contract SablierV2LockupPro is INTERNAL STORAGE //////////////////////////////////////////////////////////////////////////*/ - /// @dev Sablier V2 pro streams mapped by unsigned integers. - mapping(uint256 => LockupPro.Stream) internal _streams; + /// @dev Sablier V2 pro streams mapped by unsigned integers ids. + mapping(uint256 id => LockupPro.Stream) internal _streams; /*////////////////////////////////////////////////////////////////////////// CONSTRUCTOR diff --git a/src/abstracts/SablierV2Config.sol b/src/abstracts/SablierV2Config.sol index 84f500f1f..ae500d517 100644 --- a/src/abstracts/SablierV2Config.sol +++ b/src/abstracts/SablierV2Config.sol @@ -38,7 +38,7 @@ abstract contract SablierV2Config is //////////////////////////////////////////////////////////////////////////*/ /// @dev Protocol revenues mapped by ERC-20 asset addresses. - mapping(IERC20 => uint128) internal _protocolRevenues; + mapping(IERC20 asset => uint128) internal _protocolRevenues; /*////////////////////////////////////////////////////////////////////////// CONSTRUCTOR diff --git a/test/invariant/handlers/BaseHandler.t.sol b/test/invariant/handlers/BaseHandler.t.sol index 93b5aa203..584932b9d 100644 --- a/test/invariant/handlers/BaseHandler.t.sol +++ b/test/invariant/handlers/BaseHandler.t.sol @@ -11,7 +11,7 @@ abstract contract BaseHandler is Base_Test { //////////////////////////////////////////////////////////////////////////*/ /// @dev Maps function names to the number of times they have been called. - mapping(string => uint256) public calls; + mapping(string func => uint256) public calls; /// @dev The total number of calls made to this contract. uint256 public totalCalls; diff --git a/test/invariant/handlers/LockupHandler.t.sol b/test/invariant/handlers/LockupHandler.t.sol index 5b2b2ca74..488225726 100644 --- a/test/invariant/handlers/LockupHandler.t.sol +++ b/test/invariant/handlers/LockupHandler.t.sol @@ -55,7 +55,7 @@ abstract contract LockupHandler is BaseHandler { return; } currentStreamId = store.streamIds(bound(streamIndexSeed, 0, lastStreamId - 1)); - currentRecipient = store.streamIdsToRecipients(currentStreamId); + currentRecipient = store.recipients(currentStreamId); vm.startPrank(currentRecipient); _; vm.stopPrank(); @@ -67,7 +67,7 @@ abstract contract LockupHandler is BaseHandler { return; } currentStreamId = store.streamIds(bound(streamIndexSeed, 0, lastStreamId - 1)); - currentSender = store.streamIdsToSenders(currentStreamId); + currentSender = store.senders(currentStreamId); vm.startPrank(currentSender); _; vm.stopPrank(); diff --git a/test/invariant/handlers/LockupHandlerStorage.t.sol b/test/invariant/handlers/LockupHandlerStorage.t.sol index ec462f3c7..21d21429d 100644 --- a/test/invariant/handlers/LockupHandlerStorage.t.sol +++ b/test/invariant/handlers/LockupHandlerStorage.t.sol @@ -10,8 +10,8 @@ contract LockupHandlerStorage { uint256 public lastStreamId; uint128 public returnedAmountsSum; - mapping(uint256 => address) public streamIdsToRecipients; - mapping(uint256 => address) public streamIdsToSenders; + mapping(uint256 streamId => address) public recipients; + mapping(uint256 streamId => address) public senders; uint256[] public streamIds; /*////////////////////////////////////////////////////////////////////////// @@ -25,14 +25,14 @@ contract LockupHandlerStorage { function pushStreamId(uint256 streamId, address sender, address recipient) external { // Store the stream id in the ids array and the reverse mappings. streamIds.push(streamId); - streamIdsToSenders[streamId] = sender; - streamIdsToRecipients[streamId] = recipient; + senders[streamId] = sender; + recipients[streamId] = recipient; // Update the last stream id. lastStreamId = streamId; } function updateRecipient(uint256 streamId, address newRecipient) external { - streamIdsToRecipients[streamId] = newRecipient; + recipients[streamId] = newRecipient; } } From 36c108465812a0fa39d05cd998c83dfdcdb496ac Mon Sep 17 00:00:00 2001 From: Paul Razvan Berg Date: Sat, 4 Feb 2023 23:07:31 +0200 Subject: [PATCH 2/6] build: set optimizer runs to 5,000 --- foundry.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry.toml b/foundry.toml index 9c3ec838d..2499ec133 100644 --- a/foundry.toml +++ b/foundry.toml @@ -10,7 +10,7 @@ "SablierV2LockupPro", ] optimizer = true - optimizer_runs = 10_000 + optimizer_runs = 5_000 out = "out" script = "script" solc = "0.8.18" From 6d004dadde73a30655b307759f1d2be9e9d47a67 Mon Sep 17 00:00:00 2001 From: Paul Razvan Berg Date: Sun, 5 Feb 2023 11:32:55 +0200 Subject: [PATCH 3/6] refactor: change pragma to ">=0.8.18" --- .solhint.json | 2 +- script/DeployComptroller.s.sol | 2 +- script/DeployDeterministicComptroller.s.sol | 2 +- script/DeployDeterministicLockupLinear.s.sol | 2 +- script/DeployDeterministicLockupPro.s.sol | 2 +- script/DeployDeterministicProtocol.s.sol | 2 +- script/DeployLockupLinear.s.sol | 2 +- script/DeployLockupPro.s.sol | 2 +- script/DeployProtocol.s.sol | 2 +- script/DeployTestAsset.s.sol | 2 +- script/helpers/Common.s.sol | 2 +- src/SablierV2Comptroller.sol | 2 +- src/SablierV2LockupLinear.sol | 2 +- src/SablierV2LockupPro.sol | 2 +- src/abstracts/SablierV2Adminable.sol | 2 +- src/abstracts/SablierV2Config.sol | 2 +- src/abstracts/SablierV2FlashLoan.sol | 2 +- src/abstracts/SablierV2Lockup.sol | 2 +- src/interfaces/ISablierV2Adminable.sol | 2 +- src/interfaces/ISablierV2Comptroller.sol | 2 +- src/interfaces/ISablierV2Config.sol | 2 +- src/interfaces/ISablierV2Lockup.sol | 2 +- src/interfaces/ISablierV2LockupLinear.sol | 2 +- src/interfaces/ISablierV2LockupPro.sol | 2 +- src/interfaces/hooks/ISablierV2LockupRecipient.sol | 2 +- src/interfaces/hooks/ISablierV2LockupSender.sol | 2 +- src/libraries/Errors.sol | 2 +- src/libraries/Events.sol | 2 +- src/libraries/Helpers.sol | 2 +- src/types/DataTypes.sol | 2 +- src/types/Math.sol | 2 +- src/types/Tokens.sol | 2 +- test/Base.t.sol | 2 +- test/e2e/E2eTest.t.sol | 2 +- test/e2e/lockup/linear/Linear.t.sol | 2 +- test/e2e/lockup/pro/Pro.t.sol | 2 +- test/e2e/tokens/DAI.t.sol | 2 +- test/e2e/tokens/SHIB.t.sol | 2 +- test/e2e/tokens/USDC.t.sol | 2 +- test/e2e/tokens/USDT.t.sol | 2 +- test/fuzz/Fuzz.t.sol | 2 +- test/fuzz/adminable/Adminable.t.sol | 2 +- test/fuzz/adminable/transfer-admin/transferAdmin.t.sol | 2 +- test/fuzz/comptroller/Comptroller.t.sol | 2 +- test/fuzz/comptroller/set-flash-fee/setFlashFee.t.sol | 2 +- test/fuzz/comptroller/set-protocol-fee/setProtocolFee.t.sol | 2 +- test/fuzz/flash-loan/FlashLoan.t.sol | 2 +- test/fuzz/flash-loan/flash-fee/flashFee.t.sol | 2 +- test/fuzz/flash-loan/flash-loan/flashLoan.t.sol | 2 +- test/fuzz/flash-loan/max-flash-loan/maxFlashLoan.t.sol | 2 +- test/fuzz/lockup/linear/Linear.t.sol | 2 +- .../linear/create-with-durations/createWithDurations.t.sol | 2 +- test/fuzz/lockup/linear/create-with-range/createWithRange.t.sol | 2 +- test/fuzz/lockup/linear/streamed-amount-of/streamedAmountOf.sol | 2 +- .../linear/withdrawable-amount-of/withdrawableAmountOf.t.sol | 2 +- test/fuzz/lockup/pro/Pro.t.sol | 2 +- test/fuzz/lockup/pro/create-with-deltas/createWithDeltas.t.sol | 2 +- .../pro/create-with-milestones/createWithMilestones.t.sol | 2 +- test/fuzz/lockup/pro/streamed-amount-of/streamedAmountOf.sol | 2 +- test/fuzz/lockup/pro/withdraw/withdraw.t.sol | 2 +- .../pro/withdrawable-amount-of/withdrawableAmountOf.t.sol | 2 +- test/fuzz/lockup/shared/cancel-multiple/cancelMultiple.t.sol | 2 +- test/fuzz/lockup/shared/cancel/cancel.t.sol | 2 +- .../lockup/shared/get-withdrawn-amount/getWithdrawnAmount.t.sol | 2 +- .../lockup/shared/returnable-amount-of/returnableAmountOf.t.sol | 2 +- test/fuzz/lockup/shared/withdraw-max/withdrawMax.t.sol | 2 +- .../fuzz/lockup/shared/withdraw-multiple/withdrawMultiple.t.sol | 2 +- test/fuzz/lockup/shared/withdraw/withdraw.t.sol | 2 +- test/invariant/Invariant.t.sol | 2 +- test/invariant/handlers/BaseHandler.t.sol | 2 +- test/invariant/handlers/ComptrollerHandler.t.sol | 2 +- test/invariant/handlers/FlashLoanHandler.t.sol | 2 +- test/invariant/handlers/LockupHandler.t.sol | 2 +- test/invariant/handlers/LockupHandlerStorage.t.sol | 2 +- test/invariant/handlers/LockupLinearCreateHandler.t.sol | 2 +- test/invariant/handlers/LockupLinearHandler.t.sol | 2 +- test/invariant/handlers/LockupProCreateHandler.t.sol | 2 +- test/invariant/handlers/LockupProHandler.t.sol | 2 +- test/invariant/lockup/Lockup.t.sol | 2 +- test/invariant/lockup/linear/Linear.t.sol | 2 +- test/invariant/lockup/pro/Pro.t.sol | 2 +- test/shared/helpers/Assertions.t.sol | 2 +- test/shared/helpers/Calculations.t.sol | 2 +- test/shared/helpers/Constants.t.sol | 2 +- test/shared/helpers/Utils.t.sol | 2 +- test/shared/lockup/Lockup.t.sol | 2 +- test/shared/lockup/linear/Linear.t.sol | 2 +- test/shared/lockup/pro/Pro.t.sol | 2 +- test/shared/mockups/flash-loan/FaultyFlashLoanReceiver.t.sol | 2 +- test/shared/mockups/flash-loan/GoodFlashLoanReceiver.t.sol | 2 +- test/shared/mockups/flash-loan/ReentrantFlashLoanReceiver.t.sol | 2 +- test/shared/mockups/hooks/Empty.t.sol | 2 +- test/shared/mockups/hooks/GoodRecipient.t.sol | 2 +- test/shared/mockups/hooks/GoodSender.t.sol | 2 +- test/shared/mockups/hooks/ReentrantRecipient.t.sol | 2 +- test/shared/mockups/hooks/ReentrantSender.t.sol | 2 +- test/shared/mockups/hooks/RevertingRecipient.t.sol | 2 +- test/shared/mockups/hooks/RevertingSender.t.sol | 2 +- test/unit/Unit.t.sol | 2 +- test/unit/adminable/Adminable.t.sol | 2 +- test/unit/adminable/transfer-admin/transferAdmin.t.sol | 2 +- test/unit/comptroller/Comptroller.t.sol | 2 +- test/unit/comptroller/constructor/constructor.t.sol | 2 +- test/unit/comptroller/flash-fee/flashFee.t.sol | 2 +- test/unit/comptroller/get-protocol-fee/getProtocolFee.t.sol | 2 +- test/unit/comptroller/set-flash-fee/setFlashFee.t.sol | 2 +- test/unit/comptroller/set-protocol-fee/setProtocolFee.t.sol | 2 +- test/unit/comptroller/toggle-flash-asset/toggleFlashAsset.t.sol | 2 +- test/unit/flash-loan/FlashLoan.t.sol | 2 +- test/unit/flash-loan/flash-fee/flashFee.t.sol | 2 +- test/unit/flash-loan/flash-loan/flashLoan.t.sol | 2 +- test/unit/flash-loan/max-flash-loan/maxFlashLoan.t.sol | 2 +- test/unit/lockup/linear/Linear.t.sol | 2 +- test/unit/lockup/linear/constructor/constructor.t.sol | 2 +- .../linear/create-with-durations/createWithDurations.t.sol | 2 +- test/unit/lockup/linear/create-with-range/createWithRange.t.sol | 2 +- test/unit/lockup/linear/get-cliff-time/getCliffTime.t.sol | 2 +- test/unit/lockup/linear/get-range/getRange.t.sol | 2 +- test/unit/lockup/linear/get-stream/getStream.t.sol | 2 +- .../lockup/linear/streamed-amount-of/streamedAmountOf.t.sol | 2 +- .../linear/withdrawable-amount-of/withdrawableAmountOf.t.sol | 2 +- test/unit/lockup/pro/Pro.t.sol | 2 +- test/unit/lockup/pro/constructor/constructor.t.sol | 2 +- test/unit/lockup/pro/create-with-deltas/createWithDeltas.t.sol | 2 +- .../pro/create-with-milestones/createWithMilestones.t.sol | 2 +- test/unit/lockup/pro/get-range/getRange.t.sol | 2 +- test/unit/lockup/pro/get-segments/getSegments.t.sol | 2 +- test/unit/lockup/pro/get-stream/getStream.t.sol | 2 +- test/unit/lockup/pro/streamed-amount-of/streamedAmountOf.t.sol | 2 +- .../pro/withdrawable-amount-of/withdrawableAmountOf.t.sol | 2 +- test/unit/lockup/shared/burn/burn.t.sol | 2 +- test/unit/lockup/shared/cancel-multiple/cancelMultiple.t.sol | 2 +- test/unit/lockup/shared/cancel/cancel.t.sol | 2 +- .../shared/claim-protocol-revenues/claimProtocolRevenues.t.sol | 2 +- test/unit/lockup/shared/get-asset/getAsset.t.sol | 2 +- .../lockup/shared/get-deposit-amount/getDepositAmount.t.sol | 2 +- test/unit/lockup/shared/get-end-time/getEndTime.t.sol | 2 +- .../shared/get-protocol-revenues/getProtocolRevenues.t.sol | 2 +- test/unit/lockup/shared/get-recipient/getRecipient.t.sol | 2 +- test/unit/lockup/shared/get-sender/getSender.t.sol | 2 +- test/unit/lockup/shared/get-start-time/getStartTime.t.sol | 2 +- test/unit/lockup/shared/get-status/getStatus.t.sol | 2 +- .../lockup/shared/get-withdrawn-amount/getWithdrawnAmount.t.sol | 2 +- test/unit/lockup/shared/is-cancelable/isCancelable.t.sol | 2 +- test/unit/lockup/shared/renounce/renounce.t.sol | 2 +- .../lockup/shared/returnable-amount-of/returnableAmountOf.t.sol | 2 +- test/unit/lockup/shared/set-comptroller/setComptroller.t.sol | 2 +- test/unit/lockup/shared/token-uri/tokenURI.t.sol | 2 +- test/unit/lockup/shared/withdraw-max/withdrawMax.t.sol | 2 +- .../unit/lockup/shared/withdraw-multiple/withdrawMultiple.t.sol | 2 +- test/unit/lockup/shared/withdraw/withdraw.t.sol | 2 +- 151 files changed, 151 insertions(+), 151 deletions(-) diff --git a/.solhint.json b/.solhint.json index e8f5c3d5b..93aacbd25 100644 --- a/.solhint.json +++ b/.solhint.json @@ -4,7 +4,7 @@ "rules": { "avoid-low-level-calls": "off", "code-complexity": ["error", 8], - "compiler-version": ["error", ">=0.8.13"], + "compiler-version": ["error", ">=0.8.18"], "contract-name-camelcase": "off", "const-name-snakecase": "off", "func-name-mixedcase": "off", diff --git a/script/DeployComptroller.s.sol b/script/DeployComptroller.s.sol index 39e6374f1..117d8a6d6 100644 --- a/script/DeployComptroller.s.sol +++ b/script/DeployComptroller.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Script } from "forge-std/Script.sol"; diff --git a/script/DeployDeterministicComptroller.s.sol b/script/DeployDeterministicComptroller.s.sol index 63e864701..d69763744 100644 --- a/script/DeployDeterministicComptroller.s.sol +++ b/script/DeployDeterministicComptroller.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Script } from "forge-std/Script.sol"; diff --git a/script/DeployDeterministicLockupLinear.s.sol b/script/DeployDeterministicLockupLinear.s.sol index 19c283162..cb587d418 100644 --- a/script/DeployDeterministicLockupLinear.s.sol +++ b/script/DeployDeterministicLockupLinear.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Script } from "forge-std/Script.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/script/DeployDeterministicLockupPro.s.sol b/script/DeployDeterministicLockupPro.s.sol index 0a97656f3..1d0a17f8a 100644 --- a/script/DeployDeterministicLockupPro.s.sol +++ b/script/DeployDeterministicLockupPro.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Script } from "forge-std/Script.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/script/DeployDeterministicProtocol.s.sol b/script/DeployDeterministicProtocol.s.sol index c22b3aecf..ce7c7a694 100644 --- a/script/DeployDeterministicProtocol.s.sol +++ b/script/DeployDeterministicProtocol.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Script } from "forge-std/Script.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/script/DeployLockupLinear.s.sol b/script/DeployLockupLinear.s.sol index dc0a8ec51..45c23b997 100644 --- a/script/DeployLockupLinear.s.sol +++ b/script/DeployLockupLinear.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Script } from "forge-std/Script.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/script/DeployLockupPro.s.sol b/script/DeployLockupPro.s.sol index f0127d519..0f8f97d0f 100644 --- a/script/DeployLockupPro.s.sol +++ b/script/DeployLockupPro.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Script } from "forge-std/Script.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/script/DeployProtocol.s.sol b/script/DeployProtocol.s.sol index 949383842..2e6b7b62b 100644 --- a/script/DeployProtocol.s.sol +++ b/script/DeployProtocol.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Script } from "forge-std/Script.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/script/DeployTestAsset.s.sol b/script/DeployTestAsset.s.sol index b8bb7b281..a4c6a53e4 100644 --- a/script/DeployTestAsset.s.sol +++ b/script/DeployTestAsset.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { ERC20GodMode } from "@prb/contracts/token/erc20/ERC20GodMode.sol"; diff --git a/script/helpers/Common.s.sol b/script/helpers/Common.s.sol index f8b1e0377..8440030c9 100644 --- a/script/helpers/Common.s.sol +++ b/script/helpers/Common.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Script } from "forge-std/Script.sol"; diff --git a/src/SablierV2Comptroller.sol b/src/SablierV2Comptroller.sol index 9f2681b29..4de30c0e1 100644 --- a/src/SablierV2Comptroller.sol +++ b/src/SablierV2Comptroller.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/src/SablierV2LockupLinear.sol b/src/SablierV2LockupLinear.sol index 037407059..fd1f12fbb 100644 --- a/src/SablierV2LockupLinear.sol +++ b/src/SablierV2LockupLinear.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { SafeERC20 } from "@openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/src/SablierV2LockupPro.sol b/src/SablierV2LockupPro.sol index add4808bb..06ac99efc 100644 --- a/src/SablierV2LockupPro.sol +++ b/src/SablierV2LockupPro.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { SafeERC20 } from "@openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/src/abstracts/SablierV2Adminable.sol b/src/abstracts/SablierV2Adminable.sol index 1195bd9b9..ddafceed1 100644 --- a/src/abstracts/SablierV2Adminable.sol +++ b/src/abstracts/SablierV2Adminable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { ISablierV2Adminable } from "../interfaces/ISablierV2Adminable.sol"; import { Errors } from "../libraries/Errors.sol"; diff --git a/src/abstracts/SablierV2Config.sol b/src/abstracts/SablierV2Config.sol index ae500d517..f8e8a1464 100644 --- a/src/abstracts/SablierV2Config.sol +++ b/src/abstracts/SablierV2Config.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { SafeERC20 } from "@openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/src/abstracts/SablierV2FlashLoan.sol b/src/abstracts/SablierV2FlashLoan.sol index dfba8ad4f..140f92080 100644 --- a/src/abstracts/SablierV2FlashLoan.sol +++ b/src/abstracts/SablierV2FlashLoan.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { SafeERC20 } from "@openzeppelin/token/ERC20/utils/SafeERC20.sol"; diff --git a/src/abstracts/SablierV2Lockup.sol b/src/abstracts/SablierV2Lockup.sol index 150939c8e..289189a70 100644 --- a/src/abstracts/SablierV2Lockup.sol +++ b/src/abstracts/SablierV2Lockup.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/src/interfaces/ISablierV2Adminable.sol b/src/interfaces/ISablierV2Adminable.sol index 699f8f95b..796810473 100644 --- a/src/interfaces/ISablierV2Adminable.sol +++ b/src/interfaces/ISablierV2Adminable.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; /// @title ISablierV2Adminable /// @notice Contract module that provides a basic access control mechanism, with an admin that can be diff --git a/src/interfaces/ISablierV2Comptroller.sol b/src/interfaces/ISablierV2Comptroller.sol index 700cbb119..d5f358efb 100644 --- a/src/interfaces/ISablierV2Comptroller.sol +++ b/src/interfaces/ISablierV2Comptroller.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/src/interfaces/ISablierV2Config.sol b/src/interfaces/ISablierV2Config.sol index 1654331e1..b88a94abc 100644 --- a/src/interfaces/ISablierV2Config.sol +++ b/src/interfaces/ISablierV2Config.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/src/interfaces/ISablierV2Lockup.sol b/src/interfaces/ISablierV2Lockup.sol index 32c7cbf42..4bef98905 100644 --- a/src/interfaces/ISablierV2Lockup.sol +++ b/src/interfaces/ISablierV2Lockup.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { IERC721Metadata } from "@openzeppelin/token/ERC721/extensions/IERC721Metadata.sol"; diff --git a/src/interfaces/ISablierV2LockupLinear.sol b/src/interfaces/ISablierV2LockupLinear.sol index 7ce4ee143..53a0a58fd 100644 --- a/src/interfaces/ISablierV2LockupLinear.sol +++ b/src/interfaces/ISablierV2LockupLinear.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/src/interfaces/ISablierV2LockupPro.sol b/src/interfaces/ISablierV2LockupPro.sol index b40409e41..9ed6df15e 100644 --- a/src/interfaces/ISablierV2LockupPro.sol +++ b/src/interfaces/ISablierV2LockupPro.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD2x18 } from "@prb/math/UD2x18.sol"; diff --git a/src/interfaces/hooks/ISablierV2LockupRecipient.sol b/src/interfaces/hooks/ISablierV2LockupRecipient.sol index 3e040d5b7..ef420432c 100644 --- a/src/interfaces/hooks/ISablierV2LockupRecipient.sol +++ b/src/interfaces/hooks/ISablierV2LockupRecipient.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; /// @title ISablierV2LockupRecipient /// @notice Interface for Sablier V2 recipient contracts that can react to cancellations and withdrawals. diff --git a/src/interfaces/hooks/ISablierV2LockupSender.sol b/src/interfaces/hooks/ISablierV2LockupSender.sol index 176532811..4f87733bc 100644 --- a/src/interfaces/hooks/ISablierV2LockupSender.sol +++ b/src/interfaces/hooks/ISablierV2LockupSender.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; /// @title ISablierV2LockupSender /// @notice Interface for Sablier V2 sender contracts that can react to cancellations. diff --git a/src/libraries/Errors.sol b/src/libraries/Errors.sol index 366a21e51..b5514f5e7 100644 --- a/src/libraries/Errors.sol +++ b/src/libraries/Errors.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/src/libraries/Events.sol b/src/libraries/Events.sol index a1072fb77..d75bd80d8 100644 --- a/src/libraries/Events.sol +++ b/src/libraries/Events.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/src/libraries/Helpers.sol b/src/libraries/Helpers.sol index 114e5ac41..373785110 100644 --- a/src/libraries/Helpers.sol +++ b/src/libraries/Helpers.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { UD60x18, ud } from "@prb/math/UD60x18.sol"; diff --git a/src/types/DataTypes.sol b/src/types/DataTypes.sol index db9982256..2d1f9d31b 100644 --- a/src/types/DataTypes.sol +++ b/src/types/DataTypes.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD2x18 } from "@prb/math/UD2x18.sol"; diff --git a/src/types/Math.sol b/src/types/Math.sol index 7dec259a1..34a012be9 100644 --- a/src/types/Math.sol +++ b/src/types/Math.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; /// This file simply re-exports all PRBMath types needed in v2-core. It is provided for convenience to /// users so that they don't have to install PRBMath separately. diff --git a/src/types/Tokens.sol b/src/types/Tokens.sol index 92961a3d2..835a7fd0c 100644 --- a/src/types/Tokens.sol +++ b/src/types/Tokens.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: LGPL-3.0 -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; /// This file simply re-exports all token interfaces needed in v2-core. It is provided for convenience to /// users so that they don't have to install openzeppelin-contracts and prb-contracts separately. diff --git a/test/Base.t.sol b/test/Base.t.sol index 80e049007..881066150 100644 --- a/test/Base.t.sol +++ b/test/Base.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { ERC20 } from "@openzeppelin/token/ERC20/ERC20.sol"; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/e2e/E2eTest.t.sol b/test/e2e/E2eTest.t.sol index f6d52bf6e..a76fe1004 100644 --- a/test/e2e/E2eTest.t.sol +++ b/test/e2e/E2eTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/e2e/lockup/linear/Linear.t.sol b/test/e2e/lockup/linear/Linear.t.sol index ca0877f9a..a6916e226 100644 --- a/test/e2e/lockup/linear/Linear.t.sol +++ b/test/e2e/lockup/linear/Linear.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18, ud } from "@prb/math/UD60x18.sol"; diff --git a/test/e2e/lockup/pro/Pro.t.sol b/test/e2e/lockup/pro/Pro.t.sol index 17d704b49..e94c607c0 100644 --- a/test/e2e/lockup/pro/Pro.t.sol +++ b/test/e2e/lockup/pro/Pro.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18, ud } from "@prb/math/UD60x18.sol"; diff --git a/test/e2e/tokens/DAI.t.sol b/test/e2e/tokens/DAI.t.sol index 88cd13956..bb2e6c086 100644 --- a/test/e2e/tokens/DAI.t.sol +++ b/test/e2e/tokens/DAI.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/e2e/tokens/SHIB.t.sol b/test/e2e/tokens/SHIB.t.sol index 0d8bbdd6a..939777d06 100644 --- a/test/e2e/tokens/SHIB.t.sol +++ b/test/e2e/tokens/SHIB.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/e2e/tokens/USDC.t.sol b/test/e2e/tokens/USDC.t.sol index 43997cbd2..8eb76a475 100644 --- a/test/e2e/tokens/USDC.t.sol +++ b/test/e2e/tokens/USDC.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/e2e/tokens/USDT.t.sol b/test/e2e/tokens/USDT.t.sol index f096a47c8..5ea7f5ea2 100644 --- a/test/e2e/tokens/USDT.t.sol +++ b/test/e2e/tokens/USDT.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/fuzz/Fuzz.t.sol b/test/fuzz/Fuzz.t.sol index 9025bd573..3bdacfd79 100644 --- a/test/fuzz/Fuzz.t.sol +++ b/test/fuzz/Fuzz.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Base_Test } from "../Base.t.sol"; diff --git a/test/fuzz/adminable/Adminable.t.sol b/test/fuzz/adminable/Adminable.t.sol index 97781a4f8..db76881ae 100644 --- a/test/fuzz/adminable/Adminable.t.sol +++ b/test/fuzz/adminable/Adminable.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { ISablierV2Adminable } from "src/interfaces/ISablierV2Adminable.sol"; diff --git a/test/fuzz/adminable/transfer-admin/transferAdmin.t.sol b/test/fuzz/adminable/transfer-admin/transferAdmin.t.sol index 9bf248f05..065a5d018 100644 --- a/test/fuzz/adminable/transfer-admin/transferAdmin.t.sol +++ b/test/fuzz/adminable/transfer-admin/transferAdmin.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Errors } from "src/libraries/Errors.sol"; import { Events } from "src/libraries/Events.sol"; diff --git a/test/fuzz/comptroller/Comptroller.t.sol b/test/fuzz/comptroller/Comptroller.t.sol index a3341c7e4..b9fb54fe5 100644 --- a/test/fuzz/comptroller/Comptroller.t.sol +++ b/test/fuzz/comptroller/Comptroller.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Fuzz_Test } from "../Fuzz.t.sol"; diff --git a/test/fuzz/comptroller/set-flash-fee/setFlashFee.t.sol b/test/fuzz/comptroller/set-flash-fee/setFlashFee.t.sol index f87c76606..030df88be 100644 --- a/test/fuzz/comptroller/set-flash-fee/setFlashFee.t.sol +++ b/test/fuzz/comptroller/set-flash-fee/setFlashFee.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; diff --git a/test/fuzz/comptroller/set-protocol-fee/setProtocolFee.t.sol b/test/fuzz/comptroller/set-protocol-fee/setProtocolFee.t.sol index 3a96f14ae..f0b6ac81e 100644 --- a/test/fuzz/comptroller/set-protocol-fee/setProtocolFee.t.sol +++ b/test/fuzz/comptroller/set-protocol-fee/setProtocolFee.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; diff --git a/test/fuzz/flash-loan/FlashLoan.t.sol b/test/fuzz/flash-loan/FlashLoan.t.sol index 0f84a8d37..031e57071 100644 --- a/test/fuzz/flash-loan/FlashLoan.t.sol +++ b/test/fuzz/flash-loan/FlashLoan.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { SablierV2FlashLoan } from "src/abstracts/SablierV2FlashLoan.sol"; diff --git a/test/fuzz/flash-loan/flash-fee/flashFee.t.sol b/test/fuzz/flash-loan/flash-fee/flashFee.t.sol index 5f17c947f..bc1f2bb56 100644 --- a/test/fuzz/flash-loan/flash-fee/flashFee.t.sol +++ b/test/fuzz/flash-loan/flash-fee/flashFee.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { UD60x18, ud } from "@prb/math/UD60x18.sol"; diff --git a/test/fuzz/flash-loan/flash-loan/flashLoan.t.sol b/test/fuzz/flash-loan/flash-loan/flashLoan.t.sol index f34100895..04bb9dda7 100644 --- a/test/fuzz/flash-loan/flash-loan/flashLoan.t.sol +++ b/test/fuzz/flash-loan/flash-loan/flashLoan.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { MAX_UD60x18, UD60x18, ud } from "@prb/math/UD60x18.sol"; diff --git a/test/fuzz/flash-loan/max-flash-loan/maxFlashLoan.t.sol b/test/fuzz/flash-loan/max-flash-loan/maxFlashLoan.t.sol index 749d339f3..8caff0359 100644 --- a/test/fuzz/flash-loan/max-flash-loan/maxFlashLoan.t.sol +++ b/test/fuzz/flash-loan/max-flash-loan/maxFlashLoan.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18, ud, ZERO } from "@prb/math/UD60x18.sol"; diff --git a/test/fuzz/lockup/linear/Linear.t.sol b/test/fuzz/lockup/linear/Linear.t.sol index 5c9142e0a..c288a143b 100644 --- a/test/fuzz/lockup/linear/Linear.t.sol +++ b/test/fuzz/lockup/linear/Linear.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/fuzz/lockup/linear/create-with-durations/createWithDurations.t.sol b/test/fuzz/lockup/linear/create-with-durations/createWithDurations.t.sol index 35787c14b..af2743402 100644 --- a/test/fuzz/lockup/linear/create-with-durations/createWithDurations.t.sol +++ b/test/fuzz/lockup/linear/create-with-durations/createWithDurations.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/fuzz/lockup/linear/create-with-range/createWithRange.t.sol b/test/fuzz/lockup/linear/create-with-range/createWithRange.t.sol index bcae52ca1..9ebf18561 100644 --- a/test/fuzz/lockup/linear/create-with-range/createWithRange.t.sol +++ b/test/fuzz/lockup/linear/create-with-range/createWithRange.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { MAX_UD60x18, UD60x18, ud } from "@prb/math/UD60x18.sol"; diff --git a/test/fuzz/lockup/linear/streamed-amount-of/streamedAmountOf.sol b/test/fuzz/lockup/linear/streamed-amount-of/streamedAmountOf.sol index 6e6a2c40e..26062330f 100644 --- a/test/fuzz/lockup/linear/streamed-amount-of/streamedAmountOf.sol +++ b/test/fuzz/lockup/linear/streamed-amount-of/streamedAmountOf.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; diff --git a/test/fuzz/lockup/linear/withdrawable-amount-of/withdrawableAmountOf.t.sol b/test/fuzz/lockup/linear/withdrawable-amount-of/withdrawableAmountOf.t.sol index cc23322bc..85cc1709f 100644 --- a/test/fuzz/lockup/linear/withdrawable-amount-of/withdrawableAmountOf.t.sol +++ b/test/fuzz/lockup/linear/withdrawable-amount-of/withdrawableAmountOf.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; diff --git a/test/fuzz/lockup/pro/Pro.t.sol b/test/fuzz/lockup/pro/Pro.t.sol index 600ba5206..af17767aa 100644 --- a/test/fuzz/lockup/pro/Pro.t.sol +++ b/test/fuzz/lockup/pro/Pro.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/fuzz/lockup/pro/create-with-deltas/createWithDeltas.t.sol b/test/fuzz/lockup/pro/create-with-deltas/createWithDeltas.t.sol index bb4821d4b..735866399 100644 --- a/test/fuzz/lockup/pro/create-with-deltas/createWithDeltas.t.sol +++ b/test/fuzz/lockup/pro/create-with-deltas/createWithDeltas.t.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: UNLICENSED // solhint-disable max-line-length -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { Solarray } from "solarray/Solarray.sol"; diff --git a/test/fuzz/lockup/pro/create-with-milestones/createWithMilestones.t.sol b/test/fuzz/lockup/pro/create-with-milestones/createWithMilestones.t.sol index a359975ff..a05586af5 100644 --- a/test/fuzz/lockup/pro/create-with-milestones/createWithMilestones.t.sol +++ b/test/fuzz/lockup/pro/create-with-milestones/createWithMilestones.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { MAX_UD60x18, UD60x18, ud, ZERO } from "@prb/math/UD60x18.sol"; diff --git a/test/fuzz/lockup/pro/streamed-amount-of/streamedAmountOf.sol b/test/fuzz/lockup/pro/streamed-amount-of/streamedAmountOf.sol index 2dd5b7101..b24192161 100644 --- a/test/fuzz/lockup/pro/streamed-amount-of/streamedAmountOf.sol +++ b/test/fuzz/lockup/pro/streamed-amount-of/streamedAmountOf.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { LockupPro } from "src/types/DataTypes.sol"; diff --git a/test/fuzz/lockup/pro/withdraw/withdraw.t.sol b/test/fuzz/lockup/pro/withdraw/withdraw.t.sol index fd6f144d7..9825af55d 100644 --- a/test/fuzz/lockup/pro/withdraw/withdraw.t.sol +++ b/test/fuzz/lockup/pro/withdraw/withdraw.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.17; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/fuzz/lockup/pro/withdrawable-amount-of/withdrawableAmountOf.t.sol b/test/fuzz/lockup/pro/withdrawable-amount-of/withdrawableAmountOf.t.sol index 0a8b492f4..fdb6bd001 100644 --- a/test/fuzz/lockup/pro/withdrawable-amount-of/withdrawableAmountOf.t.sol +++ b/test/fuzz/lockup/pro/withdrawable-amount-of/withdrawableAmountOf.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { ZERO } from "@prb/math/UD60x18.sol"; diff --git a/test/fuzz/lockup/shared/cancel-multiple/cancelMultiple.t.sol b/test/fuzz/lockup/shared/cancel-multiple/cancelMultiple.t.sol index a5c355fb9..a613bfbeb 100644 --- a/test/fuzz/lockup/shared/cancel-multiple/cancelMultiple.t.sol +++ b/test/fuzz/lockup/shared/cancel-multiple/cancelMultiple.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { Solarray } from "solarray/Solarray.sol"; diff --git a/test/fuzz/lockup/shared/cancel/cancel.t.sol b/test/fuzz/lockup/shared/cancel/cancel.t.sol index fce0d37c9..23d6fa726 100644 --- a/test/fuzz/lockup/shared/cancel/cancel.t.sol +++ b/test/fuzz/lockup/shared/cancel/cancel.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/fuzz/lockup/shared/get-withdrawn-amount/getWithdrawnAmount.t.sol b/test/fuzz/lockup/shared/get-withdrawn-amount/getWithdrawnAmount.t.sol index b6be566a8..c77504277 100644 --- a/test/fuzz/lockup/shared/get-withdrawn-amount/getWithdrawnAmount.t.sol +++ b/test/fuzz/lockup/shared/get-withdrawn-amount/getWithdrawnAmount.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Lockup_Shared_Test } from "../../../../shared/lockup/Lockup.t.sol"; import { Fuzz_Test } from "../../../Fuzz.t.sol"; diff --git a/test/fuzz/lockup/shared/returnable-amount-of/returnableAmountOf.t.sol b/test/fuzz/lockup/shared/returnable-amount-of/returnableAmountOf.t.sol index 55b31ac0e..9ef93a32d 100644 --- a/test/fuzz/lockup/shared/returnable-amount-of/returnableAmountOf.t.sol +++ b/test/fuzz/lockup/shared/returnable-amount-of/returnableAmountOf.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Lockup_Shared_Test } from "../../../../shared/lockup/Lockup.t.sol"; import { Fuzz_Test } from "../../../Fuzz.t.sol"; diff --git a/test/fuzz/lockup/shared/withdraw-max/withdrawMax.t.sol b/test/fuzz/lockup/shared/withdraw-max/withdrawMax.t.sol index 5ced1b57c..7fbf48a93 100644 --- a/test/fuzz/lockup/shared/withdraw-max/withdrawMax.t.sol +++ b/test/fuzz/lockup/shared/withdraw-max/withdrawMax.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/fuzz/lockup/shared/withdraw-multiple/withdrawMultiple.t.sol b/test/fuzz/lockup/shared/withdraw-multiple/withdrawMultiple.t.sol index aaa29c864..5b2d75c13 100644 --- a/test/fuzz/lockup/shared/withdraw-multiple/withdrawMultiple.t.sol +++ b/test/fuzz/lockup/shared/withdraw-multiple/withdrawMultiple.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { Solarray } from "solarray/Solarray.sol"; diff --git a/test/fuzz/lockup/shared/withdraw/withdraw.t.sol b/test/fuzz/lockup/shared/withdraw/withdraw.t.sol index 4cbe77aeb..d663d45ba 100644 --- a/test/fuzz/lockup/shared/withdraw/withdraw.t.sol +++ b/test/fuzz/lockup/shared/withdraw/withdraw.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/invariant/Invariant.t.sol b/test/invariant/Invariant.t.sol index 45b0fb464..a60a626cb 100644 --- a/test/invariant/Invariant.t.sol +++ b/test/invariant/Invariant.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { InvariantTest as ForgeInvariantTest } from "forge-std/InvariantTest.sol"; diff --git a/test/invariant/handlers/BaseHandler.t.sol b/test/invariant/handlers/BaseHandler.t.sol index 584932b9d..785966f27 100644 --- a/test/invariant/handlers/BaseHandler.t.sol +++ b/test/invariant/handlers/BaseHandler.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Base_Test } from "../../Base.t.sol"; diff --git a/test/invariant/handlers/ComptrollerHandler.t.sol b/test/invariant/handlers/ComptrollerHandler.t.sol index 9a0ff5de0..e2270e435 100644 --- a/test/invariant/handlers/ComptrollerHandler.t.sol +++ b/test/invariant/handlers/ComptrollerHandler.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18, UNIT } from "@prb/math/UD60x18.sol"; diff --git a/test/invariant/handlers/FlashLoanHandler.t.sol b/test/invariant/handlers/FlashLoanHandler.t.sol index b41294b5b..2318fec98 100644 --- a/test/invariant/handlers/FlashLoanHandler.t.sol +++ b/test/invariant/handlers/FlashLoanHandler.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { IERC3156FlashBorrower } from "erc3156/interfaces/IERC3156FlashBorrower.sol"; diff --git a/test/invariant/handlers/LockupHandler.t.sol b/test/invariant/handlers/LockupHandler.t.sol index 488225726..5e60dbb23 100644 --- a/test/invariant/handlers/LockupHandler.t.sol +++ b/test/invariant/handlers/LockupHandler.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/invariant/handlers/LockupHandlerStorage.t.sol b/test/invariant/handlers/LockupHandlerStorage.t.sol index 21d21429d..49eecc961 100644 --- a/test/invariant/handlers/LockupHandlerStorage.t.sol +++ b/test/invariant/handlers/LockupHandlerStorage.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; /// @title LockupHandlerStorage /// @dev Storage contract for the lockup handler streams. diff --git a/test/invariant/handlers/LockupLinearCreateHandler.t.sol b/test/invariant/handlers/LockupLinearCreateHandler.t.sol index 58a24e0ff..2bf0a5a97 100644 --- a/test/invariant/handlers/LockupLinearCreateHandler.t.sol +++ b/test/invariant/handlers/LockupLinearCreateHandler.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/invariant/handlers/LockupLinearHandler.t.sol b/test/invariant/handlers/LockupLinearHandler.t.sol index a6cc29017..660ee0bb6 100644 --- a/test/invariant/handlers/LockupLinearHandler.t.sol +++ b/test/invariant/handlers/LockupLinearHandler.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/invariant/handlers/LockupProCreateHandler.t.sol b/test/invariant/handlers/LockupProCreateHandler.t.sol index 84a2c2826..93b21e509 100644 --- a/test/invariant/handlers/LockupProCreateHandler.t.sol +++ b/test/invariant/handlers/LockupProCreateHandler.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/test/invariant/handlers/LockupProHandler.t.sol b/test/invariant/handlers/LockupProHandler.t.sol index 797ce006c..411aed3a3 100644 --- a/test/invariant/handlers/LockupProHandler.t.sol +++ b/test/invariant/handlers/LockupProHandler.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/invariant/lockup/Lockup.t.sol b/test/invariant/lockup/Lockup.t.sol index 509bae273..e9e4429e1 100644 --- a/test/invariant/lockup/Lockup.t.sol +++ b/test/invariant/lockup/Lockup.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { ISablierV2Lockup } from "src/interfaces/ISablierV2Lockup.sol"; diff --git a/test/invariant/lockup/linear/Linear.t.sol b/test/invariant/lockup/linear/Linear.t.sol index ae2b09dca..e95311a71 100644 --- a/test/invariant/lockup/linear/Linear.t.sol +++ b/test/invariant/lockup/linear/Linear.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { console2 } from "forge-std/console2.sol"; diff --git a/test/invariant/lockup/pro/Pro.t.sol b/test/invariant/lockup/pro/Pro.t.sol index 243e232ad..570fe136b 100644 --- a/test/invariant/lockup/pro/Pro.t.sol +++ b/test/invariant/lockup/pro/Pro.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { console2 } from "forge-std/console2.sol"; diff --git a/test/shared/helpers/Assertions.t.sol b/test/shared/helpers/Assertions.t.sol index 44f9fd010..f97464ba2 100644 --- a/test/shared/helpers/Assertions.t.sol +++ b/test/shared/helpers/Assertions.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { PRBMathAssertions } from "@prb/math/test/Assertions.sol"; diff --git a/test/shared/helpers/Calculations.t.sol b/test/shared/helpers/Calculations.t.sol index 1564ba9e1..8f304e623 100644 --- a/test/shared/helpers/Calculations.t.sol +++ b/test/shared/helpers/Calculations.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { PRBMathCastingUint128 as CastingUint128 } from "@prb/math/casting/Uint128.sol"; import { PRBMathCastingUint40 as CastingUint40 } from "@prb/math/casting/Uint40.sol"; diff --git a/test/shared/helpers/Constants.t.sol b/test/shared/helpers/Constants.t.sol index 198319627..cf7351745 100644 --- a/test/shared/helpers/Constants.t.sol +++ b/test/shared/helpers/Constants.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { UD2x18, ud2x18 } from "@prb/math/UD2x18.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/test/shared/helpers/Utils.t.sol b/test/shared/helpers/Utils.t.sol index fa6a8b7a3..e43a70e6a 100644 --- a/test/shared/helpers/Utils.t.sol +++ b/test/shared/helpers/Utils.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { SD59x18 } from "@prb/math/SD59x18.sol"; import { PRBMathUtils } from "@prb/math/test/Utils.sol"; diff --git a/test/shared/lockup/Lockup.t.sol b/test/shared/lockup/Lockup.t.sol index f5e849c69..d025621cd 100644 --- a/test/shared/lockup/Lockup.t.sol +++ b/test/shared/lockup/Lockup.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { ISablierV2Config } from "src/interfaces/ISablierV2Config.sol"; import { ISablierV2Lockup } from "src/interfaces/ISablierV2Lockup.sol"; diff --git a/test/shared/lockup/linear/Linear.t.sol b/test/shared/lockup/linear/Linear.t.sol index c9fcc2951..a9edd405f 100644 --- a/test/shared/lockup/linear/Linear.t.sol +++ b/test/shared/lockup/linear/Linear.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/shared/lockup/pro/Pro.t.sol b/test/shared/lockup/pro/Pro.t.sol index d6694806f..0f1355b19 100644 --- a/test/shared/lockup/pro/Pro.t.sol +++ b/test/shared/lockup/pro/Pro.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/shared/mockups/flash-loan/FaultyFlashLoanReceiver.t.sol b/test/shared/mockups/flash-loan/FaultyFlashLoanReceiver.t.sol index fea612239..114a5115d 100644 --- a/test/shared/mockups/flash-loan/FaultyFlashLoanReceiver.t.sol +++ b/test/shared/mockups/flash-loan/FaultyFlashLoanReceiver.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { IERC3156FlashBorrower } from "erc3156/interfaces/IERC3156FlashBorrower.sol"; diff --git a/test/shared/mockups/flash-loan/GoodFlashLoanReceiver.t.sol b/test/shared/mockups/flash-loan/GoodFlashLoanReceiver.t.sol index 1c6a724b6..4c6f70058 100644 --- a/test/shared/mockups/flash-loan/GoodFlashLoanReceiver.t.sol +++ b/test/shared/mockups/flash-loan/GoodFlashLoanReceiver.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { IERC3156FlashBorrower } from "erc3156/interfaces/IERC3156FlashBorrower.sol"; diff --git a/test/shared/mockups/flash-loan/ReentrantFlashLoanReceiver.t.sol b/test/shared/mockups/flash-loan/ReentrantFlashLoanReceiver.t.sol index 290ee15e2..f34fd5e5e 100644 --- a/test/shared/mockups/flash-loan/ReentrantFlashLoanReceiver.t.sol +++ b/test/shared/mockups/flash-loan/ReentrantFlashLoanReceiver.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { IERC3156FlashBorrower } from "erc3156/interfaces/IERC3156FlashBorrower.sol"; diff --git a/test/shared/mockups/hooks/Empty.t.sol b/test/shared/mockups/hooks/Empty.t.sol index f592e0245..f23f8d254 100644 --- a/test/shared/mockups/hooks/Empty.t.sol +++ b/test/shared/mockups/hooks/Empty.t.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: UNLICENSED // solhint-disable reason-string -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; /// @dev This contract does nothing. contract Empty { diff --git a/test/shared/mockups/hooks/GoodRecipient.t.sol b/test/shared/mockups/hooks/GoodRecipient.t.sol index 7b16b31bc..9d0920a6f 100644 --- a/test/shared/mockups/hooks/GoodRecipient.t.sol +++ b/test/shared/mockups/hooks/GoodRecipient.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { ISablierV2LockupRecipient } from "src/interfaces/hooks/ISablierV2LockupRecipient.sol"; diff --git a/test/shared/mockups/hooks/GoodSender.t.sol b/test/shared/mockups/hooks/GoodSender.t.sol index 771e3deb1..1820820e0 100644 --- a/test/shared/mockups/hooks/GoodSender.t.sol +++ b/test/shared/mockups/hooks/GoodSender.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { ISablierV2LockupSender } from "src/interfaces/hooks/ISablierV2LockupSender.sol"; diff --git a/test/shared/mockups/hooks/ReentrantRecipient.t.sol b/test/shared/mockups/hooks/ReentrantRecipient.t.sol index 4fe6b665d..622a8dbe5 100644 --- a/test/shared/mockups/hooks/ReentrantRecipient.t.sol +++ b/test/shared/mockups/hooks/ReentrantRecipient.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { ISablierV2Lockup } from "src/interfaces/ISablierV2Lockup.sol"; import { ISablierV2LockupRecipient } from "src/interfaces/hooks/ISablierV2LockupRecipient.sol"; diff --git a/test/shared/mockups/hooks/ReentrantSender.t.sol b/test/shared/mockups/hooks/ReentrantSender.t.sol index f419204f9..e8004f1b3 100644 --- a/test/shared/mockups/hooks/ReentrantSender.t.sol +++ b/test/shared/mockups/hooks/ReentrantSender.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { ISablierV2LockupSender } from "src/interfaces/hooks/ISablierV2LockupSender.sol"; import { ISablierV2Lockup } from "src/interfaces/ISablierV2Lockup.sol"; diff --git a/test/shared/mockups/hooks/RevertingRecipient.t.sol b/test/shared/mockups/hooks/RevertingRecipient.t.sol index 9dd9c7a34..254f2f329 100644 --- a/test/shared/mockups/hooks/RevertingRecipient.t.sol +++ b/test/shared/mockups/hooks/RevertingRecipient.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { ISablierV2LockupRecipient } from "src/interfaces/hooks/ISablierV2LockupRecipient.sol"; diff --git a/test/shared/mockups/hooks/RevertingSender.t.sol b/test/shared/mockups/hooks/RevertingSender.t.sol index fb2c9ff7f..8ecbf84d1 100644 --- a/test/shared/mockups/hooks/RevertingSender.t.sol +++ b/test/shared/mockups/hooks/RevertingSender.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { ISablierV2LockupSender } from "src/interfaces/hooks/ISablierV2LockupSender.sol"; diff --git a/test/unit/Unit.t.sol b/test/unit/Unit.t.sol index 5f0422ccc..2aecea5d9 100644 --- a/test/unit/Unit.t.sol +++ b/test/unit/Unit.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Base_Test } from "../Base.t.sol"; import { Empty } from "../shared/mockups/hooks/Empty.t.sol"; diff --git a/test/unit/adminable/Adminable.t.sol b/test/unit/adminable/Adminable.t.sol index d3ca481fc..ced6cb14e 100644 --- a/test/unit/adminable/Adminable.t.sol +++ b/test/unit/adminable/Adminable.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { ISablierV2Adminable } from "src/interfaces/ISablierV2Adminable.sol"; diff --git a/test/unit/adminable/transfer-admin/transferAdmin.t.sol b/test/unit/adminable/transfer-admin/transferAdmin.t.sol index 3f8557fab..955b3009a 100644 --- a/test/unit/adminable/transfer-admin/transferAdmin.t.sol +++ b/test/unit/adminable/transfer-admin/transferAdmin.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Errors } from "src/libraries/Errors.sol"; import { Events } from "src/libraries/Events.sol"; diff --git a/test/unit/comptroller/Comptroller.t.sol b/test/unit/comptroller/Comptroller.t.sol index 64b86ba1b..bcdafd030 100644 --- a/test/unit/comptroller/Comptroller.t.sol +++ b/test/unit/comptroller/Comptroller.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Unit_Test } from "../Unit.t.sol"; diff --git a/test/unit/comptroller/constructor/constructor.t.sol b/test/unit/comptroller/constructor/constructor.t.sol index c9576980a..9c53367b4 100644 --- a/test/unit/comptroller/constructor/constructor.t.sol +++ b/test/unit/comptroller/constructor/constructor.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { DeployComptroller } from "script/DeployComptroller.s.sol"; import { SablierV2Comptroller } from "src/SablierV2Comptroller.sol"; diff --git a/test/unit/comptroller/flash-fee/flashFee.t.sol b/test/unit/comptroller/flash-fee/flashFee.t.sol index 3f1a4ead1..b4350c795 100644 --- a/test/unit/comptroller/flash-fee/flashFee.t.sol +++ b/test/unit/comptroller/flash-fee/flashFee.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; diff --git a/test/unit/comptroller/get-protocol-fee/getProtocolFee.t.sol b/test/unit/comptroller/get-protocol-fee/getProtocolFee.t.sol index 43c221204..043debce0 100644 --- a/test/unit/comptroller/get-protocol-fee/getProtocolFee.t.sol +++ b/test/unit/comptroller/get-protocol-fee/getProtocolFee.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; diff --git a/test/unit/comptroller/set-flash-fee/setFlashFee.t.sol b/test/unit/comptroller/set-flash-fee/setFlashFee.t.sol index ea7d0f6a4..2c320a32f 100644 --- a/test/unit/comptroller/set-flash-fee/setFlashFee.t.sol +++ b/test/unit/comptroller/set-flash-fee/setFlashFee.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; diff --git a/test/unit/comptroller/set-protocol-fee/setProtocolFee.t.sol b/test/unit/comptroller/set-protocol-fee/setProtocolFee.t.sol index 99fecd223..fdbb406a9 100644 --- a/test/unit/comptroller/set-protocol-fee/setProtocolFee.t.sol +++ b/test/unit/comptroller/set-protocol-fee/setProtocolFee.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; diff --git a/test/unit/comptroller/toggle-flash-asset/toggleFlashAsset.t.sol b/test/unit/comptroller/toggle-flash-asset/toggleFlashAsset.t.sol index 482c14d5a..3ebbeee84 100644 --- a/test/unit/comptroller/toggle-flash-asset/toggleFlashAsset.t.sol +++ b/test/unit/comptroller/toggle-flash-asset/toggleFlashAsset.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { UD60x18, ZERO } from "@prb/math/UD60x18.sol"; diff --git a/test/unit/flash-loan/FlashLoan.t.sol b/test/unit/flash-loan/FlashLoan.t.sol index 5195cc175..d225db476 100644 --- a/test/unit/flash-loan/FlashLoan.t.sol +++ b/test/unit/flash-loan/FlashLoan.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { SablierV2FlashLoan } from "src/abstracts/SablierV2FlashLoan.sol"; diff --git a/test/unit/flash-loan/flash-fee/flashFee.t.sol b/test/unit/flash-loan/flash-fee/flashFee.t.sol index 9fd395179..844c4121a 100644 --- a/test/unit/flash-loan/flash-fee/flashFee.t.sol +++ b/test/unit/flash-loan/flash-fee/flashFee.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18, ud } from "@prb/math/UD60x18.sol"; diff --git a/test/unit/flash-loan/flash-loan/flashLoan.t.sol b/test/unit/flash-loan/flash-loan/flashLoan.t.sol index 9e2e12ed9..fd07fd4ca 100644 --- a/test/unit/flash-loan/flash-loan/flashLoan.t.sol +++ b/test/unit/flash-loan/flash-loan/flashLoan.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13; +pragma solidity >=0.8.18; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18, ud } from "@prb/math/UD60x18.sol"; diff --git a/test/unit/flash-loan/max-flash-loan/maxFlashLoan.t.sol b/test/unit/flash-loan/max-flash-loan/maxFlashLoan.t.sol index 8c3ca1155..544ac4238 100644 --- a/test/unit/flash-loan/max-flash-loan/maxFlashLoan.t.sol +++ b/test/unit/flash-loan/max-flash-loan/maxFlashLoan.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18, ud, ZERO } from "@prb/math/UD60x18.sol"; diff --git a/test/unit/lockup/linear/Linear.t.sol b/test/unit/lockup/linear/Linear.t.sol index f9bae6900..8d2a0ef89 100644 --- a/test/unit/lockup/linear/Linear.t.sol +++ b/test/unit/lockup/linear/Linear.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/unit/lockup/linear/constructor/constructor.t.sol b/test/unit/lockup/linear/constructor/constructor.t.sol index 89b91a82c..db06bc0f7 100644 --- a/test/unit/lockup/linear/constructor/constructor.t.sol +++ b/test/unit/lockup/linear/constructor/constructor.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/test/unit/lockup/linear/create-with-durations/createWithDurations.t.sol b/test/unit/lockup/linear/create-with-durations/createWithDurations.t.sol index 5b493c3e5..153cdd177 100644 --- a/test/unit/lockup/linear/create-with-durations/createWithDurations.t.sol +++ b/test/unit/lockup/linear/create-with-durations/createWithDurations.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/test/unit/lockup/linear/create-with-range/createWithRange.t.sol b/test/unit/lockup/linear/create-with-range/createWithRange.t.sol index 75e1768e2..bdb37c3f9 100644 --- a/test/unit/lockup/linear/create-with-range/createWithRange.t.sol +++ b/test/unit/lockup/linear/create-with-range/createWithRange.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { UD60x18, ud } from "@prb/math/UD60x18.sol"; diff --git a/test/unit/lockup/linear/get-cliff-time/getCliffTime.t.sol b/test/unit/lockup/linear/get-cliff-time/getCliffTime.t.sol index 6282a3ec2..f1d9b271a 100644 --- a/test/unit/lockup/linear/get-cliff-time/getCliffTime.t.sol +++ b/test/unit/lockup/linear/get-cliff-time/getCliffTime.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Linear_Unit_Test } from "../Linear.t.sol"; diff --git a/test/unit/lockup/linear/get-range/getRange.t.sol b/test/unit/lockup/linear/get-range/getRange.t.sol index d9f6a562a..67b0ffbee 100644 --- a/test/unit/lockup/linear/get-range/getRange.t.sol +++ b/test/unit/lockup/linear/get-range/getRange.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { LockupLinear } from "src/types/DataTypes.sol"; diff --git a/test/unit/lockup/linear/get-stream/getStream.t.sol b/test/unit/lockup/linear/get-stream/getStream.t.sol index a268223ce..d64f3bb45 100644 --- a/test/unit/lockup/linear/get-stream/getStream.t.sol +++ b/test/unit/lockup/linear/get-stream/getStream.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { LockupLinear } from "src/types/DataTypes.sol"; diff --git a/test/unit/lockup/linear/streamed-amount-of/streamedAmountOf.t.sol b/test/unit/lockup/linear/streamed-amount-of/streamedAmountOf.t.sol index 9313bf2d7..4c56a98ba 100644 --- a/test/unit/lockup/linear/streamed-amount-of/streamedAmountOf.t.sol +++ b/test/unit/lockup/linear/streamed-amount-of/streamedAmountOf.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Linear_Unit_Test } from "../Linear.t.sol"; diff --git a/test/unit/lockup/linear/withdrawable-amount-of/withdrawableAmountOf.t.sol b/test/unit/lockup/linear/withdrawable-amount-of/withdrawableAmountOf.t.sol index 5dbe22749..f72956496 100644 --- a/test/unit/lockup/linear/withdrawable-amount-of/withdrawableAmountOf.t.sol +++ b/test/unit/lockup/linear/withdrawable-amount-of/withdrawableAmountOf.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Linear_Unit_Test } from "../Linear.t.sol"; diff --git a/test/unit/lockup/pro/Pro.t.sol b/test/unit/lockup/pro/Pro.t.sol index ab4cfb84d..a07562734 100644 --- a/test/unit/lockup/pro/Pro.t.sol +++ b/test/unit/lockup/pro/Pro.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/unit/lockup/pro/constructor/constructor.t.sol b/test/unit/lockup/pro/constructor/constructor.t.sol index 34b905aa4..83182e648 100644 --- a/test/unit/lockup/pro/constructor/constructor.t.sol +++ b/test/unit/lockup/pro/constructor/constructor.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { UD60x18 } from "@prb/math/UD60x18.sol"; diff --git a/test/unit/lockup/pro/create-with-deltas/createWithDeltas.t.sol b/test/unit/lockup/pro/create-with-deltas/createWithDeltas.t.sol index 8ecd4f4de..cc68cbc22 100644 --- a/test/unit/lockup/pro/create-with-deltas/createWithDeltas.t.sol +++ b/test/unit/lockup/pro/create-with-deltas/createWithDeltas.t.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: UNLICENSED // solhint-disable max-line-length -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { ud2x18 } from "@prb/math/UD2x18.sol"; diff --git a/test/unit/lockup/pro/create-with-milestones/createWithMilestones.t.sol b/test/unit/lockup/pro/create-with-milestones/createWithMilestones.t.sol index 6245c3f3a..98524754d 100644 --- a/test/unit/lockup/pro/create-with-milestones/createWithMilestones.t.sol +++ b/test/unit/lockup/pro/create-with-milestones/createWithMilestones.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { MAX_UD60x18, UD60x18, ud, ZERO } from "@prb/math/UD60x18.sol"; diff --git a/test/unit/lockup/pro/get-range/getRange.t.sol b/test/unit/lockup/pro/get-range/getRange.t.sol index c485d36b9..2cacef2d7 100644 --- a/test/unit/lockup/pro/get-range/getRange.t.sol +++ b/test/unit/lockup/pro/get-range/getRange.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { LockupPro } from "src/types/DataTypes.sol"; diff --git a/test/unit/lockup/pro/get-segments/getSegments.t.sol b/test/unit/lockup/pro/get-segments/getSegments.t.sol index 6b1cd0895..5360bbd10 100644 --- a/test/unit/lockup/pro/get-segments/getSegments.t.sol +++ b/test/unit/lockup/pro/get-segments/getSegments.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { LockupPro } from "src/types/DataTypes.sol"; diff --git a/test/unit/lockup/pro/get-stream/getStream.t.sol b/test/unit/lockup/pro/get-stream/getStream.t.sol index 10831a524..497ecff49 100644 --- a/test/unit/lockup/pro/get-stream/getStream.t.sol +++ b/test/unit/lockup/pro/get-stream/getStream.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { LockupPro } from "src/types/DataTypes.sol"; diff --git a/test/unit/lockup/pro/streamed-amount-of/streamedAmountOf.t.sol b/test/unit/lockup/pro/streamed-amount-of/streamedAmountOf.t.sol index 8864a71bc..94d38805e 100644 --- a/test/unit/lockup/pro/streamed-amount-of/streamedAmountOf.t.sol +++ b/test/unit/lockup/pro/streamed-amount-of/streamedAmountOf.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { LockupPro } from "src/types/DataTypes.sol"; diff --git a/test/unit/lockup/pro/withdrawable-amount-of/withdrawableAmountOf.t.sol b/test/unit/lockup/pro/withdrawable-amount-of/withdrawableAmountOf.t.sol index 8ed99a742..3495e2184 100644 --- a/test/unit/lockup/pro/withdrawable-amount-of/withdrawableAmountOf.t.sol +++ b/test/unit/lockup/pro/withdrawable-amount-of/withdrawableAmountOf.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Pro_Unit_Test } from "../Pro.t.sol"; diff --git a/test/unit/lockup/shared/burn/burn.t.sol b/test/unit/lockup/shared/burn/burn.t.sol index aadd1604a..348a6c5b2 100644 --- a/test/unit/lockup/shared/burn/burn.t.sol +++ b/test/unit/lockup/shared/burn/burn.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Errors } from "src/libraries/Errors.sol"; diff --git a/test/unit/lockup/shared/cancel-multiple/cancelMultiple.t.sol b/test/unit/lockup/shared/cancel-multiple/cancelMultiple.t.sol index 66769e016..df4561410 100644 --- a/test/unit/lockup/shared/cancel-multiple/cancelMultiple.t.sol +++ b/test/unit/lockup/shared/cancel-multiple/cancelMultiple.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { Solarray } from "solarray/Solarray.sol"; diff --git a/test/unit/lockup/shared/cancel/cancel.t.sol b/test/unit/lockup/shared/cancel/cancel.t.sol index 84495dcfe..dad16881c 100644 --- a/test/unit/lockup/shared/cancel/cancel.t.sol +++ b/test/unit/lockup/shared/cancel/cancel.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/unit/lockup/shared/claim-protocol-revenues/claimProtocolRevenues.t.sol b/test/unit/lockup/shared/claim-protocol-revenues/claimProtocolRevenues.t.sol index 73536bf00..d597f3e01 100644 --- a/test/unit/lockup/shared/claim-protocol-revenues/claimProtocolRevenues.t.sol +++ b/test/unit/lockup/shared/claim-protocol-revenues/claimProtocolRevenues.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/unit/lockup/shared/get-asset/getAsset.t.sol b/test/unit/lockup/shared/get-asset/getAsset.t.sol index 5d1d2fe64..750ee5c66 100644 --- a/test/unit/lockup/shared/get-asset/getAsset.t.sol +++ b/test/unit/lockup/shared/get-asset/getAsset.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/unit/lockup/shared/get-deposit-amount/getDepositAmount.t.sol b/test/unit/lockup/shared/get-deposit-amount/getDepositAmount.t.sol index 55d8e3c92..2eeb7489f 100644 --- a/test/unit/lockup/shared/get-deposit-amount/getDepositAmount.t.sol +++ b/test/unit/lockup/shared/get-deposit-amount/getDepositAmount.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Lockup_Shared_Test } from "../../../../shared/lockup/Lockup.t.sol"; import { Unit_Test } from "../../../Unit.t.sol"; diff --git a/test/unit/lockup/shared/get-end-time/getEndTime.t.sol b/test/unit/lockup/shared/get-end-time/getEndTime.t.sol index 3350de824..b56da1292 100644 --- a/test/unit/lockup/shared/get-end-time/getEndTime.t.sol +++ b/test/unit/lockup/shared/get-end-time/getEndTime.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Lockup_Shared_Test } from "../../../../shared/lockup/Lockup.t.sol"; import { Unit_Test } from "../../../Unit.t.sol"; diff --git a/test/unit/lockup/shared/get-protocol-revenues/getProtocolRevenues.t.sol b/test/unit/lockup/shared/get-protocol-revenues/getProtocolRevenues.t.sol index ae9b2f255..8b66eca6a 100644 --- a/test/unit/lockup/shared/get-protocol-revenues/getProtocolRevenues.t.sol +++ b/test/unit/lockup/shared/get-protocol-revenues/getProtocolRevenues.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Lockup_Shared_Test } from "../../../../shared/lockup/Lockup.t.sol"; import { Unit_Test } from "../../../Unit.t.sol"; diff --git a/test/unit/lockup/shared/get-recipient/getRecipient.t.sol b/test/unit/lockup/shared/get-recipient/getRecipient.t.sol index 62889e0d2..e9d254450 100644 --- a/test/unit/lockup/shared/get-recipient/getRecipient.t.sol +++ b/test/unit/lockup/shared/get-recipient/getRecipient.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Lockup_Shared_Test } from "../../../../shared/lockup/Lockup.t.sol"; import { Unit_Test } from "../../../Unit.t.sol"; diff --git a/test/unit/lockup/shared/get-sender/getSender.t.sol b/test/unit/lockup/shared/get-sender/getSender.t.sol index 3eebb7a3e..1819c28f3 100644 --- a/test/unit/lockup/shared/get-sender/getSender.t.sol +++ b/test/unit/lockup/shared/get-sender/getSender.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Lockup_Shared_Test } from "../../../../shared/lockup/Lockup.t.sol"; import { Unit_Test } from "../../../Unit.t.sol"; diff --git a/test/unit/lockup/shared/get-start-time/getStartTime.t.sol b/test/unit/lockup/shared/get-start-time/getStartTime.t.sol index 90a92f691..073be6a52 100644 --- a/test/unit/lockup/shared/get-start-time/getStartTime.t.sol +++ b/test/unit/lockup/shared/get-start-time/getStartTime.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Lockup_Shared_Test } from "../../../../shared/lockup/Lockup.t.sol"; import { Unit_Test } from "../../../Unit.t.sol"; diff --git a/test/unit/lockup/shared/get-status/getStatus.t.sol b/test/unit/lockup/shared/get-status/getStatus.t.sol index cec374db1..6aa2306eb 100644 --- a/test/unit/lockup/shared/get-status/getStatus.t.sol +++ b/test/unit/lockup/shared/get-status/getStatus.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Lockup } from "src/types/DataTypes.sol"; diff --git a/test/unit/lockup/shared/get-withdrawn-amount/getWithdrawnAmount.t.sol b/test/unit/lockup/shared/get-withdrawn-amount/getWithdrawnAmount.t.sol index 15ae406a6..c46f69ab0 100644 --- a/test/unit/lockup/shared/get-withdrawn-amount/getWithdrawnAmount.t.sol +++ b/test/unit/lockup/shared/get-withdrawn-amount/getWithdrawnAmount.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Lockup_Shared_Test } from "../../../../shared/lockup/Lockup.t.sol"; import { Unit_Test } from "../../../Unit.t.sol"; diff --git a/test/unit/lockup/shared/is-cancelable/isCancelable.t.sol b/test/unit/lockup/shared/is-cancelable/isCancelable.t.sol index cea84fa48..2f138d044 100644 --- a/test/unit/lockup/shared/is-cancelable/isCancelable.t.sol +++ b/test/unit/lockup/shared/is-cancelable/isCancelable.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Lockup_Shared_Test } from "../../../../shared/lockup/Lockup.t.sol"; import { Unit_Test } from "../../../Unit.t.sol"; diff --git a/test/unit/lockup/shared/renounce/renounce.t.sol b/test/unit/lockup/shared/renounce/renounce.t.sol index 5d020b0e4..b76e44869 100644 --- a/test/unit/lockup/shared/renounce/renounce.t.sol +++ b/test/unit/lockup/shared/renounce/renounce.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { ISablierV2LockupRecipient } from "src/interfaces/hooks/ISablierV2LockupRecipient.sol"; import { Errors } from "src/libraries/Errors.sol"; diff --git a/test/unit/lockup/shared/returnable-amount-of/returnableAmountOf.t.sol b/test/unit/lockup/shared/returnable-amount-of/returnableAmountOf.t.sol index 3e83b852e..03f0a4ce6 100644 --- a/test/unit/lockup/shared/returnable-amount-of/returnableAmountOf.t.sol +++ b/test/unit/lockup/shared/returnable-amount-of/returnableAmountOf.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Lockup_Shared_Test } from "../../../../shared/lockup/Lockup.t.sol"; import { Unit_Test } from "../../../Unit.t.sol"; diff --git a/test/unit/lockup/shared/set-comptroller/setComptroller.t.sol b/test/unit/lockup/shared/set-comptroller/setComptroller.t.sol index 0d9c123b9..2ac2bf1d0 100644 --- a/test/unit/lockup/shared/set-comptroller/setComptroller.t.sol +++ b/test/unit/lockup/shared/set-comptroller/setComptroller.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { ISablierV2Comptroller } from "src/interfaces/ISablierV2Comptroller.sol"; import { Errors } from "src/libraries/Errors.sol"; diff --git a/test/unit/lockup/shared/token-uri/tokenURI.t.sol b/test/unit/lockup/shared/token-uri/tokenURI.t.sol index fe9975ba2..e5884881e 100644 --- a/test/unit/lockup/shared/token-uri/tokenURI.t.sol +++ b/test/unit/lockup/shared/token-uri/tokenURI.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { Lockup_Shared_Test } from "../../../../shared/lockup/Lockup.t.sol"; import { Unit_Test } from "../../../Unit.t.sol"; diff --git a/test/unit/lockup/shared/withdraw-max/withdrawMax.t.sol b/test/unit/lockup/shared/withdraw-max/withdrawMax.t.sol index e01f4d472..01231d967 100644 --- a/test/unit/lockup/shared/withdraw-max/withdrawMax.t.sol +++ b/test/unit/lockup/shared/withdraw-max/withdrawMax.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; diff --git a/test/unit/lockup/shared/withdraw-multiple/withdrawMultiple.t.sol b/test/unit/lockup/shared/withdraw-multiple/withdrawMultiple.t.sol index 16a35fb65..457f19a80 100644 --- a/test/unit/lockup/shared/withdraw-multiple/withdrawMultiple.t.sol +++ b/test/unit/lockup/shared/withdraw-multiple/withdrawMultiple.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; import { Solarray } from "solarray/Solarray.sol"; diff --git a/test/unit/lockup/shared/withdraw/withdraw.t.sol b/test/unit/lockup/shared/withdraw/withdraw.t.sol index 9c9ed96a4..e55f280ee 100644 --- a/test/unit/lockup/shared/withdraw/withdraw.t.sol +++ b/test/unit/lockup/shared/withdraw/withdraw.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.13 <0.9.0; +pragma solidity >=0.8.18 <0.9.0; import { IERC20 } from "@openzeppelin/token/ERC20/IERC20.sol"; From ed362b393d858f14f9e397bb052fcbaa384342bc Mon Sep 17 00:00:00 2001 From: Paul Razvan Berg Date: Mon, 6 Feb 2023 16:00:09 +0200 Subject: [PATCH 4/6] build: upgrade to prettier-plugin-solidity v1.1.2 --- package.json | 2 +- yarn.lock | 39 +++++++++++---------------------------- 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 697755249..a2d55ae26 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "husky": "^8.0.2", "lint-staged": "^12.5.0", "prettier": "^2.8.1", - "prettier-plugin-solidity": "^1.1.0", + "prettier-plugin-solidity": "^1.1.2", "rimraf": "^3.0.2", "solhint": "^3.3.7", "solhint-plugin-prettier": "^0.0.5" diff --git a/yarn.lock b/yarn.lock index 35be5fb19..c934781b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -348,7 +348,7 @@ __metadata: husky: ^8.0.2 lint-staged: ^12.5.0 prettier: ^2.8.1 - prettier-plugin-solidity: ^1.1.0 + prettier-plugin-solidity: ^1.1.2 rimraf: ^3.0.2 solhint: ^3.3.7 solhint-plugin-prettier: ^0.0.5 @@ -364,12 +364,12 @@ __metadata: languageName: node linkType: hard -"@solidity-parser/parser@npm:^0.14.5": - version: 0.14.5 - resolution: "@solidity-parser/parser@npm:0.14.5" +"@solidity-parser/parser@npm:^0.15.0": + version: 0.15.0 + resolution: "@solidity-parser/parser@npm:0.15.0" dependencies: antlr4ts: ^0.5.0-alpha.4 - checksum: 9e85a0d4f8a05a11db6022444b70b2f353e2358467b1cce44cdda703ae1e3c7337e1b8cbc2eec8e14a8f34f9c60b42f325e5fe9b3c934cc980e35091e292d7ee + checksum: 19c3a4b0778020c2b73893d19844258dc15eddf2c4959f21ac583fa101a159a859b749b58a4a7af52ccc0daa0eb6fb2b51fdb6e6b4c5d9082e4f06d53c49d04b languageName: node linkType: hard @@ -1295,13 +1295,6 @@ __metadata: languageName: node linkType: hard -"emoji-regex@npm:^10.2.1": - version: 10.2.1 - resolution: "emoji-regex@npm:10.2.1" - checksum: 1aa2d16881c56531fdfc03d0b36f5c2b6221cc4097499a5665b88b711dc3fb4d5b8804f0ca6f00c56e5dcf89bac75f0487eee85da1da77df3a33accc6ecbe426 - languageName: node - linkType: hard - "emoji-regex@npm:^7.0.1": version: 7.0.3 resolution: "emoji-regex@npm:7.0.3" @@ -1346,13 +1339,6 @@ __metadata: languageName: node linkType: hard -"escape-string-regexp@npm:^4.0.0": - version: 4.0.0 - resolution: "escape-string-regexp@npm:4.0.0" - checksum: 98b48897d93060f2322108bf29db0feba7dd774be96cd069458d1453347b25ce8682ecc39859d4bca2203cc0ab19c237bcc71755eff49a0f8d90beadeeba5cc5 - languageName: node - linkType: hard - "eslint-scope@npm:^4.0.3": version: 4.0.3 resolution: "eslint-scope@npm:4.0.3" @@ -2920,19 +2906,16 @@ __metadata: languageName: node linkType: hard -"prettier-plugin-solidity@npm:^1.1.0": - version: 1.1.0 - resolution: "prettier-plugin-solidity@npm:1.1.0" +"prettier-plugin-solidity@npm:^1.1.2": + version: 1.1.2 + resolution: "prettier-plugin-solidity@npm:1.1.2" dependencies: - "@solidity-parser/parser": ^0.14.5 - emoji-regex: ^10.2.1 - escape-string-regexp: ^4.0.0 + "@solidity-parser/parser": ^0.15.0 semver: ^7.3.8 solidity-comments-extractor: ^0.0.7 - string-width: ^4.2.3 peerDependencies: - prettier: ^2.3.0 - checksum: 85ac145e7deffe9749e05270e0271d7028fd36dd04c255d7709182845e2a7dfe54ac5bc90beea18c1879c2c30c1a01a1df0e63040a3a548cef1549a8339c841e + prettier: ">=2.3.0 || >=3.0.0-alpha.0" + checksum: 1aabeb4876f64eb083f2dcb3f7c0c13702cddd960fcc64395a8f5fa00f32d7432b265a68ca1f8207a1a023d26c3e2b7402179d68f85802694442a06fdc744b5b languageName: node linkType: hard From 2b947e3c329527dbbdb60199783c7b111f737985 Mon Sep 17 00:00:00 2001 From: Paul Razvan Berg Date: Thu, 9 Feb 2023 20:21:58 +0200 Subject: [PATCH 5/6] chore: add compiler version in vscode settings --- .vscode/settings.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index 9686f2b28..4be968d6e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,6 +5,7 @@ "[toml]": { "editor.defaultFormatter": "tamasfe.even-better-toml" }, + "solidity.compileUsingRemoteVersion": "v0.8.18+commit.87f61d96", "solidity.formatter": "prettier", "solidity.packageDefaultDependenciesContractsDirectory": "src", "solidity.packageDefaultDependenciesDirectory": "lib" From 9968b053ec9796c1cff1add2f882bced73e807ac Mon Sep 17 00:00:00 2001 From: Paul Razvan Berg Date: Sat, 11 Feb 2023 16:29:10 +0200 Subject: [PATCH 6/6] chore: temporarily disable Solhint --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a2d55ae26..4232c12f5 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "gas:report": "forge test --gas-report --no-match-path \"./test/e2e/**/*.sol\" --no-match-test \"test(Fork)?(Fuzz)?_RevertWhen_\\w{1,}?\"", "gas:snapshot": "forge snapshot --desc --no-match-path \"./test/e2e/**/*.sol\" --no-match-test \"test(Fork)?(Fuzz)?_RevertWhen_\\w{1,}?\"", "gas:snapshot:optimized": "yarn build:optimized && FOUNDRY_PROFILE=test-optimized forge snapshot --desc --no-match-path \"./test/e2e/**/*.sol\" --no-match-test \"test(Fork)?(Fuzz)?_RevertWhen_\\w{1,}?\"", - "lint": "yarn lint:sol && yarn prettier:check", + "lint": "yarn prettier:check", "lint:sol": "yarn solhint \"{script,src,test}/**/*.sol\"", "postinstall": "husky install", "prettier:write": "prettier --write \"**/*.{json,md,sol,yml}\"",