From f9bd20c0bb7d36b2839b947138c80badbbd53336 Mon Sep 17 00:00:00 2001 From: oba Date: Mon, 14 Aug 2023 18:54:59 +0200 Subject: [PATCH 1/2] test: floating pragma Solc version is set in foundry.toml. With floating pragma, it will be easy to change the version. Also allows to import contracts from tests in projects using different solidity versions. --- src/test/Auth.t.sol | 2 +- src/test/Bytes32AddressLib.t.sol | 2 +- src/test/CREATE3.t.sol | 2 +- src/test/DSTestPlus.t.sol | 2 +- src/test/ERC1155.t.sol | 2 +- src/test/ERC20.t.sol | 2 +- src/test/ERC4626.t.sol | 2 +- src/test/ERC721.t.sol | 2 +- src/test/FixedPointMathLib.t.sol | 2 +- src/test/MultiRolesAuthority.t.sol | 2 +- src/test/Owned.t.sol | 2 +- src/test/ReentrancyGuard.t.sol | 2 +- src/test/RolesAuthority.t.sol | 2 +- src/test/SSTORE2.t.sol | 2 +- src/test/SafeCastLib.t.sol | 2 +- src/test/SafeTransferLib.t.sol | 2 +- src/test/WETH.t.sol | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/test/Auth.t.sol b/src/test/Auth.t.sol index 9e315288..47fb3aa7 100644 --- a/src/test/Auth.t.sol +++ b/src/test/Auth.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; import {MockAuthChild} from "./utils/mocks/MockAuthChild.sol"; diff --git a/src/test/Bytes32AddressLib.t.sol b/src/test/Bytes32AddressLib.t.sol index 6c0a3d8e..846063c7 100644 --- a/src/test/Bytes32AddressLib.t.sol +++ b/src/test/Bytes32AddressLib.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; diff --git a/src/test/CREATE3.t.sol b/src/test/CREATE3.t.sol index b279eeb2..f41b77eb 100644 --- a/src/test/CREATE3.t.sol +++ b/src/test/CREATE3.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {WETH} from "../tokens/WETH.sol"; import {DSTestPlus} from "./utils/DSTestPlus.sol"; diff --git a/src/test/DSTestPlus.t.sol b/src/test/DSTestPlus.t.sol index db108600..b529e043 100644 --- a/src/test/DSTestPlus.t.sol +++ b/src/test/DSTestPlus.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; diff --git a/src/test/ERC1155.t.sol b/src/test/ERC1155.t.sol index 9e32d88b..b6a5deba 100644 --- a/src/test/ERC1155.t.sol +++ b/src/test/ERC1155.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; import {DSInvariantTest} from "./utils/DSInvariantTest.sol"; diff --git a/src/test/ERC20.t.sol b/src/test/ERC20.t.sol index 1506d8cf..7a549f36 100644 --- a/src/test/ERC20.t.sol +++ b/src/test/ERC20.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; import {DSInvariantTest} from "./utils/DSInvariantTest.sol"; diff --git a/src/test/ERC4626.t.sol b/src/test/ERC4626.t.sol index 816c8e48..5cba9b64 100644 --- a/src/test/ERC4626.t.sol +++ b/src/test/ERC4626.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; diff --git a/src/test/ERC721.t.sol b/src/test/ERC721.t.sol index 81de0ff6..db968bf5 100644 --- a/src/test/ERC721.t.sol +++ b/src/test/ERC721.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; import {DSInvariantTest} from "./utils/DSInvariantTest.sol"; diff --git a/src/test/FixedPointMathLib.t.sol b/src/test/FixedPointMathLib.t.sol index 789f957a..d46133da 100644 --- a/src/test/FixedPointMathLib.t.sol +++ b/src/test/FixedPointMathLib.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; diff --git a/src/test/MultiRolesAuthority.t.sol b/src/test/MultiRolesAuthority.t.sol index eedf6a08..56998210 100644 --- a/src/test/MultiRolesAuthority.t.sol +++ b/src/test/MultiRolesAuthority.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; import {MockAuthority} from "./utils/mocks/MockAuthority.sol"; diff --git a/src/test/Owned.t.sol b/src/test/Owned.t.sol index 08a02392..bcc6eafd 100644 --- a/src/test/Owned.t.sol +++ b/src/test/Owned.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; import {MockOwned} from "./utils/mocks/MockOwned.sol"; diff --git a/src/test/ReentrancyGuard.t.sol b/src/test/ReentrancyGuard.t.sol index 842e3672..e34454b1 100644 --- a/src/test/ReentrancyGuard.t.sol +++ b/src/test/ReentrancyGuard.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; diff --git a/src/test/RolesAuthority.t.sol b/src/test/RolesAuthority.t.sol index e01db7e5..ae694509 100644 --- a/src/test/RolesAuthority.t.sol +++ b/src/test/RolesAuthority.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; import {MockAuthority} from "./utils/mocks/MockAuthority.sol"; diff --git a/src/test/SSTORE2.t.sol b/src/test/SSTORE2.t.sol index 5d97ed7f..2af553e3 100644 --- a/src/test/SSTORE2.t.sol +++ b/src/test/SSTORE2.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; diff --git a/src/test/SafeCastLib.t.sol b/src/test/SafeCastLib.t.sol index 52a6c070..a4f3d5f0 100644 --- a/src/test/SafeCastLib.t.sol +++ b/src/test/SafeCastLib.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; diff --git a/src/test/SafeTransferLib.t.sol b/src/test/SafeTransferLib.t.sol index b976e9f6..8d85799b 100644 --- a/src/test/SafeTransferLib.t.sol +++ b/src/test/SafeTransferLib.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {MockERC20} from "./utils/mocks/MockERC20.sol"; import {RevertingToken} from "./utils/weird-tokens/RevertingToken.sol"; diff --git a/src/test/WETH.t.sol b/src/test/WETH.t.sol index a13761ee..91cfc28b 100644 --- a/src/test/WETH.t.sol +++ b/src/test/WETH.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: AGPL-3.0-only -pragma solidity 0.8.15; +pragma solidity ^0.8.15; import {DSTestPlus} from "./utils/DSTestPlus.sol"; import {DSInvariantTest} from "./utils/DSInvariantTest.sol"; From 3d444cd852a3993995d2d015e693a9be83dc53ac Mon Sep 17 00:00:00 2001 From: oba Date: Wed, 16 Aug 2023 09:24:37 +0200 Subject: [PATCH 2/2] chore: update solc version variable name --- foundry.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/foundry.toml b/foundry.toml index ebdfa111..a2a4c9fb 100644 --- a/foundry.toml +++ b/foundry.toml @@ -1,5 +1,5 @@ [profile.default] -solc = "0.8.15" +solc_version = "0.8.15" bytecode_hash = "none" optimizer_runs = 1000000