diff --git a/.forge-snapshots/simpleSwapEOAInitiated.snap b/.forge-snapshots/simpleSwapEOAInitiated.snap
index 87888e02c..165d11298 100644
--- a/.forge-snapshots/simpleSwapEOAInitiated.snap
+++ b/.forge-snapshots/simpleSwapEOAInitiated.snap
@@ -1 +1 @@
-172919
\ No newline at end of file
+173759
\ No newline at end of file
diff --git a/foundry.toml b/foundry.toml
index ee8fb19a7..c329f4627 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -3,6 +3,7 @@ optimizer_runs = 800
 via_ir = false
 ffi = true
 fs_permissions = [{ access = "read-write", path = ".forge-snapshots/"}, { access = "read", path = "./out"}]
+solc = "0.8.24"
 evm_version = "cancun"
 
 [profile.default.fuzz]
diff --git a/src/PoolManager.sol b/src/PoolManager.sol
index 4a4f4ed28..d18015b50 100644
--- a/src/PoolManager.sol
+++ b/src/PoolManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {Hooks} from "./libraries/Hooks.sol";
 import {Pool} from "./libraries/Pool.sol";
diff --git a/src/interfaces/IHooks.sol b/src/interfaces/IHooks.sol
index 31b20541b..c4cd55f56 100644
--- a/src/interfaces/IHooks.sol
+++ b/src/interfaces/IHooks.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {PoolKey} from "../types/PoolKey.sol";
 import {BalanceDelta} from "../types/BalanceDelta.sol";
diff --git a/src/interfaces/IPoolManager.sol b/src/interfaces/IPoolManager.sol
index a21ecfeb3..32e81ad5d 100644
--- a/src/interfaces/IPoolManager.sol
+++ b/src/interfaces/IPoolManager.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {Currency} from "../types/Currency.sol";
 import {PoolKey} from "../types/PoolKey.sol";
diff --git a/src/libraries/Hooks.sol b/src/libraries/Hooks.sol
index f1265b10a..3861424b0 100644
--- a/src/libraries/Hooks.sol
+++ b/src/libraries/Hooks.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {PoolKey} from "../types/PoolKey.sol";
 import {IHooks} from "../interfaces/IHooks.sol";
diff --git a/src/libraries/Lockers.sol b/src/libraries/Lockers.sol
index fff26695b..dd78d18b4 100644
--- a/src/libraries/Lockers.sol
+++ b/src/libraries/Lockers.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {IHooks} from "../interfaces/IHooks.sol";
 
diff --git a/src/test/AccessLockHook.sol b/src/test/AccessLockHook.sol
index 95a4644f6..c0461acbc 100644
--- a/src/test/AccessLockHook.sol
+++ b/src/test/AccessLockHook.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {BaseTestHooks} from "./BaseTestHooks.sol";
 import {PoolKey} from "../types/PoolKey.sol";
diff --git a/src/test/BaseTestHooks.sol b/src/test/BaseTestHooks.sol
index 60ed228c7..a57750158 100644
--- a/src/test/BaseTestHooks.sol
+++ b/src/test/BaseTestHooks.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {IHooks} from "../interfaces/IHooks.sol";
 import {PoolKey} from "../types/PoolKey.sol";
diff --git a/src/test/DynamicFeesTestHook.sol b/src/test/DynamicFeesTestHook.sol
index f350cc3af..b7811fee9 100644
--- a/src/test/DynamicFeesTestHook.sol
+++ b/src/test/DynamicFeesTestHook.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {BaseTestHooks} from "./BaseTestHooks.sol";
 import {IDynamicFeeManager} from "../interfaces/IDynamicFeeManager.sol";
diff --git a/src/test/EmptyTestHooks.sol b/src/test/EmptyTestHooks.sol
index b019c9e6c..631a98c53 100644
--- a/src/test/EmptyTestHooks.sol
+++ b/src/test/EmptyTestHooks.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {Hooks} from "../libraries/Hooks.sol";
 import {IHooks} from "../interfaces/IHooks.sol";
diff --git a/src/test/MockHooks.sol b/src/test/MockHooks.sol
index 73bf92c85..499eca30d 100644
--- a/src/test/MockHooks.sol
+++ b/src/test/MockHooks.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {Hooks} from "../libraries/Hooks.sol";
 import {IHooks} from "../interfaces/IHooks.sol";
diff --git a/src/test/NoOpTestHooks.sol b/src/test/NoOpTestHooks.sol
index 4da97766e..7007ef990 100644
--- a/src/test/NoOpTestHooks.sol
+++ b/src/test/NoOpTestHooks.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.24;
 
 import {BaseTestHooks} from "./BaseTestHooks.sol";
 import {Hooks} from "../libraries/Hooks.sol";
diff --git a/src/test/PoolClaimsTest.sol b/src/test/PoolClaimsTest.sol
index e560c4c4d..cf42041a6 100644
--- a/src/test/PoolClaimsTest.sol
+++ b/src/test/PoolClaimsTest.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {Currency, CurrencyLibrary} from "../types/Currency.sol";
 import {BalanceDelta, toBalanceDelta} from "../types/BalanceDelta.sol";
diff --git a/src/test/PoolDonateTest.sol b/src/test/PoolDonateTest.sol
index efbbd6176..164f58085 100644
--- a/src/test/PoolDonateTest.sol
+++ b/src/test/PoolDonateTest.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {Currency, CurrencyLibrary} from "../types/Currency.sol";
 import {IPoolManager} from "../interfaces/IPoolManager.sol";
diff --git a/src/test/PoolInitializeTest.sol b/src/test/PoolInitializeTest.sol
index 772ae5a85..6a0a03857 100644
--- a/src/test/PoolInitializeTest.sol
+++ b/src/test/PoolInitializeTest.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {Currency, CurrencyLibrary} from "../types/Currency.sol";
 import {IPoolManager} from "../interfaces/IPoolManager.sol";
diff --git a/src/test/PoolLockTest.sol b/src/test/PoolLockTest.sol
index a312fcf2f..b3dbc8cde 100644
--- a/src/test/PoolLockTest.sol
+++ b/src/test/PoolLockTest.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {IPoolManager} from "../interfaces/IPoolManager.sol";
 import {ILockCallback} from "../interfaces/callback/ILockCallback.sol";
diff --git a/src/test/PoolModifyLiquidityTest.sol b/src/test/PoolModifyLiquidityTest.sol
index 39dc5a66a..21412ef87 100644
--- a/src/test/PoolModifyLiquidityTest.sol
+++ b/src/test/PoolModifyLiquidityTest.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {CurrencyLibrary, Currency} from "../types/Currency.sol";
 import {IPoolManager} from "../interfaces/IPoolManager.sol";
diff --git a/src/test/PoolSwapTest.sol b/src/test/PoolSwapTest.sol
index 872720be3..a4e1e5742 100644
--- a/src/test/PoolSwapTest.sol
+++ b/src/test/PoolSwapTest.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {CurrencyLibrary, Currency} from "../types/Currency.sol";
 import {IPoolManager} from "../interfaces/IPoolManager.sol";
diff --git a/src/test/PoolTakeTest.sol b/src/test/PoolTakeTest.sol
index 40b763891..4f5e9e0cc 100644
--- a/src/test/PoolTakeTest.sol
+++ b/src/test/PoolTakeTest.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {Currency, CurrencyLibrary} from "../types/Currency.sol";
 import {IPoolManager} from "../interfaces/IPoolManager.sol";
diff --git a/src/test/PoolTestBase.sol b/src/test/PoolTestBase.sol
index 4e3ccbc11..bbab3bef0 100644
--- a/src/test/PoolTestBase.sol
+++ b/src/test/PoolTestBase.sol
@@ -1,4 +1,5 @@
-pragma solidity ^0.8.20;
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.24;
 
 import {CurrencyLibrary, Currency} from "../types/Currency.sol";
 import {IERC20Minimal} from "../interfaces/external/IERC20Minimal.sol";
diff --git a/test/CurrentHookAddress.t.sol b/test/CurrentHookAddress.t.sol
index 591027474..a23c49ec4 100644
--- a/test/CurrentHookAddress.t.sol
+++ b/test/CurrentHookAddress.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
+pragma solidity ^0.8.24;
 
 import {Test} from "forge-std/Test.sol";
 import {Lockers} from "../src/libraries/Lockers.sol";
diff --git a/test/LockersLibrary.t.sol b/test/LockersLibrary.t.sol
index a2d73cf09..587fad603 100644
--- a/test/LockersLibrary.t.sol
+++ b/test/LockersLibrary.t.sol
@@ -1,4 +1,5 @@
-pragma solidity ^0.8.20;
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.24;
 
 import {Test} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";