diff --git a/foundry.toml b/foundry.toml index 4041e2a..a0a5c93 100644 --- a/foundry.toml +++ b/foundry.toml @@ -3,7 +3,7 @@ src = 'src' out = 'out' libs = ['lib'] evm_version = "cancun" -solc = "0.8.23" +solc = "0.8.26" ffi = true ast = true diff --git a/script/BaseDeployer.s.sol b/script/BaseDeployer.s.sol index 9abe059..49b3996 100644 --- a/script/BaseDeployer.s.sol +++ b/script/BaseDeployer.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.8.19; +pragma solidity 0.8.26; import {Script} from "forge-std/Script.sol"; diff --git a/script/CallBreaker.s.sol b/script/CallBreaker.s.sol index 2ebe48e..3b50ed5 100644 --- a/script/CallBreaker.s.sol +++ b/script/CallBreaker.s.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.8.19; +pragma solidity 0.8.26; import {Script} from "forge-std/Script.sol"; import {CallBreaker} from "../src/timetravel/CallBreaker.sol"; diff --git a/script/Laminator.s.sol b/script/Laminator.s.sol index 4ed768d..7c0c793 100644 --- a/script/Laminator.s.sol +++ b/script/Laminator.s.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.8.19; +pragma solidity 0.8.26; import {Script} from "forge-std/Script.sol"; import {BaseDeployer} from "./BaseDeployer.s.sol"; diff --git a/script/SmarterContract.s.sol b/script/SmarterContract.s.sol index 83bdb96..f25b108 100644 --- a/script/SmarterContract.s.sol +++ b/script/SmarterContract.s.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.8.19; +pragma solidity 0.8.26; import {Script} from "forge-std/Script.sol"; import {BaseDeployer} from "./BaseDeployer.s.sol"; diff --git a/script/test/CronCounter.s.sol b/script/test/CronCounter.s.sol index 5bb2fe7..f5e383d 100644 --- a/script/test/CronCounter.s.sol +++ b/script/test/CronCounter.s.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.8.19; +pragma solidity 0.8.26; import {Script} from "forge-std/Script.sol"; import {BaseDeployer} from "../BaseDeployer.s.sol"; diff --git a/script/test/SelfCheckout.s.sol b/script/test/SelfCheckout.s.sol index 772e80e..215cd04 100644 --- a/script/test/SelfCheckout.s.sol +++ b/script/test/SelfCheckout.s.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity ^0.8.19; +pragma solidity 0.8.26; import {Script} from "forge-std/Script.sol"; import {BaseDeployer} from "script/BaseDeployer.s.sol"; diff --git a/test/CallBreaker.t.sol b/test/CallBreaker.t.sol index a1c7c68..334f729 100644 --- a/test/CallBreaker.t.sol +++ b/test/CallBreaker.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "forge-std/Test.sol"; diff --git a/test/CronCounter.t.sol b/test/CronCounter.t.sol index 0dd702a..783679c 100644 --- a/test/CronCounter.t.sol +++ b/test/CronCounter.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "forge-std/Test.sol"; import "forge-std/Vm.sol"; diff --git a/test/FlashLiquidity.t.sol b/test/FlashLiquidity.t.sol index c174b9c..5f89b4d 100644 --- a/test/FlashLiquidity.t.sol +++ b/test/FlashLiquidity.t.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "forge-std/Test.sol"; import "../src/timetravel/CallBreaker.sol"; diff --git a/test/FlashPill.t.sol b/test/FlashPillTest.t.sol similarity index 93% rename from test/FlashPill.t.sol rename to test/FlashPillTest.t.sol index 2fd9214..b2a9801 100644 --- a/test/FlashPill.t.sol +++ b/test/FlashPillTest.t.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "forge-std/Test.sol"; import "../src/timetravel/CallBreaker.sol"; diff --git a/test/GasSnapshot.t.sol b/test/GasSnapshot.t.sol index d6eb954..89b3e0e 100644 --- a/test/GasSnapshot.t.sol +++ b/test/GasSnapshot.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import {Test} from "forge-std/Test.sol"; import {LaminatorHarness} from "./Laminator.t.sol"; diff --git a/test/Laminator.t.sol b/test/Laminator.t.sol index e20644c..5c154a7 100644 --- a/test/Laminator.t.sol +++ b/test/Laminator.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "forge-std/Test.sol"; diff --git a/test/LimitOrder.t.sol b/test/LimitOrder.t.sol index 89bec33..b725176 100644 --- a/test/LimitOrder.t.sol +++ b/test/LimitOrder.t.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "forge-std/Test.sol"; import "../src/timetravel/CallBreaker.sol"; diff --git a/test/MEVTimeCompute.t.sol b/test/MEVTimeCompute.t.sol index 12c9cb6..99dd23d 100644 --- a/test/MEVTimeCompute.t.sol +++ b/test/MEVTimeCompute.t.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity 0.8.23; +pragma solidity 0.8.26; import "forge-std/Test.sol"; import "src/timetravel/CallBreaker.sol"; diff --git a/test/NoopTurner.t.sol b/test/NoopTurnerTest.t.sol similarity index 98% rename from test/NoopTurner.t.sol rename to test/NoopTurnerTest.t.sol index e3b0adb..2fa7c7e 100644 --- a/test/NoopTurner.t.sol +++ b/test/NoopTurnerTest.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "forge-std/Test.sol"; import "../src/timetravel/CallBreaker.sol"; diff --git a/test/PnP.t.sol b/test/PnP.t.sol index d487e24..ef47df1 100644 --- a/test/PnP.t.sol +++ b/test/PnP.t.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "forge-std/Test.sol"; import "../src/timetravel/CallBreaker.sol"; diff --git a/test/SelfCheckout.t.sol b/test/SelfCheckout.t.sol index da47222..977abbf 100644 --- a/test/SelfCheckout.t.sol +++ b/test/SelfCheckout.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "forge-std/Test.sol"; import "forge-std/Vm.sol"; diff --git a/test/SmarterContract.t.sol b/test/SmarterContract.t.sol index b003560..9d10a83 100644 --- a/test/SmarterContract.t.sol +++ b/test/SmarterContract.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "forge-std/Test.sol"; diff --git a/test/TimeTypes.t.sol b/test/TimeTypes.t.sol index b67ba6e..17121c5 100644 --- a/test/TimeTypes.t.sol +++ b/test/TimeTypes.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import {Test} from "forge-std/Test.sol"; import {CallObject, CallObjectStorage} from "../src/TimeTypes.sol"; diff --git a/test/contracts/CallBreakerHarness.sol b/test/contracts/CallBreakerHarness.sol index a2c3b73..73a367e 100644 --- a/test/contracts/CallBreakerHarness.sol +++ b/test/contracts/CallBreakerHarness.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import {CallBreaker, CallObject, ReturnObject} from "src/timetravel/CallBreaker.sol"; diff --git a/test/contracts/SmarterContractHarness.sol b/test/contracts/SmarterContractHarness.sol index bd9b725..38d54c4 100644 --- a/test/contracts/SmarterContractHarness.sol +++ b/test/contracts/SmarterContractHarness.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import {SmarterContract, CallObject} from "src/timetravel/SmarterContract.sol"; diff --git a/test/examples/CronCounter.sol b/test/examples/CronCounter.sol index 5f67c95..c7374b8 100644 --- a/test/examples/CronCounter.sol +++ b/test/examples/CronCounter.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "../../src/timetravel/SmarterContract.sol"; diff --git a/test/examples/DeFi/SelfCheckout.sol b/test/examples/DeFi/SelfCheckout.sol index 9561aa5..8cd7a70 100644 --- a/test/examples/DeFi/SelfCheckout.sol +++ b/test/examples/DeFi/SelfCheckout.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "openzeppelin/token/ERC20/IERC20.sol"; import "src/TimeTypes.sol"; diff --git a/test/examples/FlashLiquidity.sol b/test/examples/FlashLiquidity.sol index 7789bcc..c36ca9c 100644 --- a/test/examples/FlashLiquidity.sol +++ b/test/examples/FlashLiquidity.sol @@ -1,15 +1,12 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; -import "forge-std/Test.sol"; -import "forge-std/console.sol"; - -import "../utils/interfaces/ISwapRouter.sol"; import "openzeppelin/token/ERC20/ERC20.sol"; -import "../utils/interfaces/IWeth.sol"; -import "../../src/timetravel/CallBreaker.sol"; -import "../../src/timetravel/SmarterContract.sol"; -import "../../src/TimeTypes.sol"; +import "src/timetravel/CallBreaker.sol"; +import "src/timetravel/SmarterContract.sol"; +import "src/TimeTypes.sol"; +import "test/utils/interfaces/ISwapRouter.sol"; +import "test/utils/interfaces/IWeth.sol"; address constant DAI = 0x6B175474E89094C44Da98b954EedeAC495271d0F; address constant WETH9 = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2; @@ -73,7 +70,6 @@ contract FlashLiquidity is SmarterContract { // The call to `exactInputSingle` executes the swap. uint256 amountOut = router.exactInputSingle(params); - console.log("WETH", amountOut); // check whether or not CallObject memory callObj = CallObject({ diff --git a/test/examples/FlashPill.sol b/test/examples/FlashPill.sol index 5f1d163..1665c13 100644 --- a/test/examples/FlashPill.sol +++ b/test/examples/FlashPill.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "openzeppelin/token/ERC20/IERC20.sol"; import "../../src/timetravel/CallBreaker.sol"; diff --git a/test/examples/LimitOrder.sol b/test/examples/LimitOrder.sol index ecdb81c..fc34359 100644 --- a/test/examples/LimitOrder.sol +++ b/test/examples/LimitOrder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity 0.8.23; +pragma solidity 0.8.26; import "../utils/interfaces/ISwapRouter.sol"; import "../../src/timetravel/CallBreaker.sol"; diff --git a/test/examples/MEVOracle/MEVTimeCompute.sol b/test/examples/MEVOracle/MEVTimeCompute.sol index 4626ed5..eab6f9f 100644 --- a/test/examples/MEVOracle/MEVTimeCompute.sol +++ b/test/examples/MEVOracle/MEVTimeCompute.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity 0.8.23; +pragma solidity 0.8.26; import "src/timetravel/CallBreaker.sol"; import "src/timetravel/SmarterContract.sol"; diff --git a/test/examples/MyErc20.sol b/test/examples/MyErc20.sol index 332b177..6153ec4 100644 --- a/test/examples/MyErc20.sol +++ b/test/examples/MyErc20.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "openzeppelin/token/ERC20/ERC20.sol"; diff --git a/test/examples/NoopTurner.sol b/test/examples/NoopTurner.sol index 86f01ca..17f4d3e 100644 --- a/test/examples/NoopTurner.sol +++ b/test/examples/NoopTurner.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "../../src/timetravel/CallBreaker.sol"; import "../../src/timetravel/SmarterContract.sol"; diff --git a/test/examples/PnP.sol b/test/examples/PnP.sol index 999d61d..9a1756f 100644 --- a/test/examples/PnP.sol +++ b/test/examples/PnP.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "../../src/timetravel/CallBreaker.sol"; diff --git a/test/solve-lib/CronCounterLib.sol b/test/solve-lib/CronCounterLib.sol index daec76e..ebf29a1 100644 --- a/test/solve-lib/CronCounterLib.sol +++ b/test/solve-lib/CronCounterLib.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "forge-std/Vm.sol"; diff --git a/test/solve-lib/DeFi/SelfCheckoutLib.sol b/test/solve-lib/DeFi/SelfCheckoutLib.sol index d19d9d0..8ae57de 100644 --- a/test/solve-lib/DeFi/SelfCheckoutLib.sol +++ b/test/solve-lib/DeFi/SelfCheckoutLib.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "forge-std/Vm.sol"; diff --git a/test/solve-lib/FlashLiquidityLib.sol b/test/solve-lib/FlashLiquidityLib.sol index e9eadfa..f76a7fb 100644 --- a/test/solve-lib/FlashLiquidityLib.sol +++ b/test/solve-lib/FlashLiquidityLib.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "../../src/lamination/Laminator.sol"; import "../../src/timetravel/CallBreaker.sol"; diff --git a/test/solve-lib/FlashPillLib.sol b/test/solve-lib/FlashPillLib.sol index 7fab939..960bd23 100644 --- a/test/solve-lib/FlashPillLib.sol +++ b/test/solve-lib/FlashPillLib.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "src/lamination/Laminator.sol"; import "src/timetravel/CallBreaker.sol"; diff --git a/test/solve-lib/LimitOrderLib.sol b/test/solve-lib/LimitOrderLib.sol index eb55211..effc6c0 100644 --- a/test/solve-lib/LimitOrderLib.sol +++ b/test/solve-lib/LimitOrderLib.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "src/lamination/Laminator.sol"; import "src/timetravel/CallBreaker.sol"; diff --git a/test/solve-lib/MEVTimeOracle/MEVTimeComputeLib.sol b/test/solve-lib/MEVTimeOracle/MEVTimeComputeLib.sol index c95a1c7..6510e22 100644 --- a/test/solve-lib/MEVTimeOracle/MEVTimeComputeLib.sol +++ b/test/solve-lib/MEVTimeOracle/MEVTimeComputeLib.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity 0.8.23; +pragma solidity 0.8.26; import "src/lamination/Laminator.sol"; import "src/timetravel/CallBreaker.sol"; diff --git a/test/solve-lib/PnPLib.sol b/test/solve-lib/PnPLib.sol index 67ddbaf..2cea968 100644 --- a/test/solve-lib/PnPLib.sol +++ b/test/solve-lib/PnPLib.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity >=0.6.2 <0.9.0; +pragma solidity 0.8.26; import "forge-std/Vm.sol"; diff --git a/test/utils/MockSwapRouter.sol b/test/utils/MockSwapRouter.sol index 8ca7b97..c8949f6 100644 --- a/test/utils/MockSwapRouter.sol +++ b/test/utils/MockSwapRouter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0 -pragma solidity 0.8.23; +pragma solidity 0.8.26; import {IWETH, IERC20} from "../utils/interfaces/IWeth.sol"; import {ISwapRouter} from "../utils/interfaces/ISwapRouter.sol";