Add compilation restrictions

foundry.toml

@@ -8,6 +8,14 @@ evm_version = "cancun"
 gas_limit = "300000000"
 bytecode_hash = "none"
 
+additional_compiler_profiles = [
+  { name = "test", via_ir = false }
+]
+
+compilation_restrictions = [
+  { paths = "**/test/**", via_ir = false },
+]
+
 [profile.default.fuzz]
 runs = 1000
 seed = "0x4444"

snapshots/CustomAccountingTest.json

@@ -1,6 +1,6 @@
 {
-  "addLiquidity CA fee": "170695",
-  "removeLiquidity CA fee": "141199",
-  "swap CA custom curve + swap noop": "124402",
-  "swap CA fee on unspecified": "154572"
+  "addLiquidity CA fee": "173566",
+  "removeLiquidity CA fee": "143871",
+  "swap CA custom curve + swap noop": "127015",
+  "swap CA fee on unspecified": "157035"
 }

snapshots/ERC6909ClaimsTest.json

@@ -1,9 +1,9 @@
 {
-  "ERC6909Claims approve": "46323",
-  "ERC6909Claims burn": "29389",
-  "ERC6909Claims mint": "46603",
-  "ERC6909Claims transfer": "51756",
-  "ERC6909Claims transferFrom as operator": "54437",
-  "ERC6909Claims transferFrom with approval": "59939",
-  "ERC6909Claims transferFrom with infinite approval": "56770"
+  "ERC6909Claims approve": "46468",
+  "ERC6909Claims burn": "29404",
+  "ERC6909Claims mint": "46779",
+  "ERC6909Claims transfer": "52010",
+  "ERC6909Claims transferFrom as operator": "54615",
+  "ERC6909Claims transferFrom with approval": "60137",
+  "ERC6909Claims transferFrom with infinite approval": "56951"
 }

snapshots/ExtsloadTest.json

@@ -1,3 +1,3 @@
 {
-  "sparse external sload": "2164"
+  "sparse external sload": "2051"
 }

snapshots/ModifyLiquidityTest.json

@@ -1,4 +1,4 @@
 {
-  "add liquidity to already existing position with salt": "144401",
-  "create new liquidity to a position with salt": "292593"
+  "add liquidity to already existing position with salt": "146620",
+  "create new liquidity to a position with salt": "294812"
 }

snapshots/PoolManagerTest.json

@@ -1,24 +1,24 @@
 {
-  "addLiquidity with empty hook": "274012",
-  "addLiquidity with native token": "135001",
-  "donate gas with 1 token": "106214",
-  "donate gas with 2 tokens": "145510",
-  "erc20 collect protocol fees": "57500",
+  "addLiquidity with empty hook": "276767",
+  "addLiquidity with native token": "137147",
+  "donate gas with 1 token": "107761",
+  "donate gas with 2 tokens": "147192",
+  "erc20 collect protocol fees": "57572",
   "native collect protocol fees": "59643",
   "poolManager bytecode size": "24009",
-  "removeLiquidity with empty hook": "130613",
-  "removeLiquidity with native token": "112523",
-  "simple addLiquidity": "161276",
-  "simple addLiquidity second addition same range": "98731",
-  "simple removeLiquidity": "85099",
-  "simple removeLiquidity some liquidity remains": "92986",
-  "simple swap": "123144",
-  "simple swap with native": "108434",
-  "swap against liquidity": "116527",
-  "swap against liquidity with native token": "105569",
-  "swap burn 6909 for input": "129285",
-  "swap burn native 6909 for input": "118672",
-  "swap mint native output as 6909": "139620",
-  "swap mint output as 6909": "154985",
-  "swap with hooks": "132165"
+  "removeLiquidity with empty hook": "133378",
+  "removeLiquidity with native token": "114112",
+  "simple addLiquidity": "162479",
+  "simple addLiquidity second addition same range": "99934",
+  "simple removeLiquidity": "86182",
+  "simple removeLiquidity some liquidity remains": "94069",
+  "simple swap": "124307",
+  "simple swap with native": "109435",
+  "swap against liquidity": "118370",
+  "swap against liquidity with native token": "107379",
+  "swap burn 6909 for input": "130941",
+  "swap burn native 6909 for input": "120409",
+  "swap mint native output as 6909": "141471",
+  "swap mint output as 6909": "156740",
+  "swap with hooks": "134556"
 }

snapshots/ProtocolFeesTest.json

@@ -1,3 +1,3 @@
 {
-  "set protocol fee": "31730"
+  "set protocol fee": "32395"
 }

snapshots/SkipCallsTest.json

@@ -1,3 +1,3 @@
 {
-  "swap skips hook call if hook is caller": "206030"
+  "swap skips hook call if hook is caller": "209529"
 }

snapshots/SqrtPriceMathTest.json

@@ -1,10 +1,10 @@
 {
-  "getAmount0Delta_gasCostForAmount0WhereRoundUpIsFalse": "243",
-  "getAmount0Delta_gasCostForAmount0WhereRoundUpIsTrue": "360",
-  "getAmount1Delta_gasCostForAmount1WhereRoundUpIsFalse": "229",
-  "getAmount1Delta_gasCostForAmount1WhereRoundUpIsTrue": "264",
-  "getNextSqrtPriceFromInput_zeroForOneEqualsFalseGas": "316",
-  "getNextSqrtPriceFromInput_zeroForOneEqualsTrueGas": "539",
-  "getNextSqrtPriceFromOutput_zeroForOneEqualsFalseGas": "544",
-  "getNextSqrtPriceFromOutput_zeroForOneEqualsTrueGas": "214"
+  "getAmount0Delta_gasCostForAmount0WhereRoundUpIsFalse": "345",
+  "getAmount0Delta_gasCostForAmount0WhereRoundUpIsTrue": "481",
+  "getAmount1Delta_gasCostForAmount1WhereRoundUpIsFalse": "281",
+  "getAmount1Delta_gasCostForAmount1WhereRoundUpIsTrue": "282",
+  "getNextSqrtPriceFromInput_zeroForOneEqualsFalseGas": "411",
+  "getNextSqrtPriceFromInput_zeroForOneEqualsTrueGas": "602",
+  "getNextSqrtPriceFromOutput_zeroForOneEqualsFalseGas": "650",
+  "getNextSqrtPriceFromOutput_zeroForOneEqualsTrueGas": "285"
 }

snapshots/SwapMathTest.json

@@ -1,10 +1,10 @@
 {
-  "SwapMath_oneForZero_exactInCapped": "1188",
-  "SwapMath_oneForZero_exactInPartial": "1274",
-  "SwapMath_oneForZero_exactOutCapped": "1001",
-  "SwapMath_oneForZero_exactOutPartial": "1565",
-  "SwapMath_zeroForOne_exactInCapped": "1126",
-  "SwapMath_zeroForOne_exactInPartial": "1439",
-  "SwapMath_zeroForOne_exactOutCapped": "919",
-  "SwapMath_zeroForOne_exactOutPartial": "1133"
+  "SwapMath_oneForZero_exactInCapped": "1499",
+  "SwapMath_oneForZero_exactInPartial": "1635",
+  "SwapMath_oneForZero_exactOutCapped": "1255",
+  "SwapMath_oneForZero_exactOutPartial": "1961",
+  "SwapMath_zeroForOne_exactInCapped": "1590",
+  "SwapMath_zeroForOne_exactInPartial": "1916",
+  "SwapMath_zeroForOne_exactOutCapped": "1346",
+  "SwapMath_zeroForOne_exactOutPartial": "1686"
 }

snapshots/SyncTest.json

@@ -1,3 +1,3 @@
 {
-  "getReserves": "3973"
+  "getReserves": "3891"
 }

snapshots/TestBitMath.json

@@ -1,8 +1,8 @@
 {
-  "BitMathLeastSignificantBitMaxUint128": "648",
-  "BitMathLeastSignificantBitMaxUint256": "648",
-  "BitMathLeastSignificantBitSmallNumber": "25",
-  "BitMathMostSignificantBitMaxUint128": "648",
-  "BitMathMostSignificantBitMaxUint256": "648",
-  "BitMathMostSignificantBitSmallNumber": "14"
+  "BitMathLeastSignificantBitMaxUint128": "718",
+  "BitMathLeastSignificantBitMaxUint256": "712",
+  "BitMathLeastSignificantBitSmallNumber": "99",
+  "BitMathMostSignificantBitMaxUint128": "757",
+  "BitMathMostSignificantBitMaxUint256": "751",
+  "BitMathMostSignificantBitSmallNumber": "138"
 }

snapshots/TestDelegateCall.json

@@ -1,3 +1,3 @@
 {
-  "NoDelegateCall": "51"
+  "NoDelegateCall": "41"
 }

snapshots/TestDynamicFees.json

@@ -1,4 +1,4 @@
 {
-  "swap with dynamic fee": "139153",
-  "update dynamic fee in before swap": "147743"
+  "swap with dynamic fee": "140996",
+  "update dynamic fee in before swap": "150033"
 }

snapshots/TestDynamicReturnFees.json

@@ -1,3 +1,3 @@
 {
-  "swap with return dynamic fee": "145475"
+  "swap with return dynamic fee": "147636"
 }

snapshots/TickBitmapTest.json

@@ -1,11 +1,11 @@
 {
-  "flipTick_flippingATickThatResultsInDeletingAWord": "5109",
-  "flipTick_flippingFirstTickInWordToInitialized": "22209",
-  "flipTick_flippingSecondTickInWordToInitialized": "5178",
-  "nextInitializedTickWithinOneWord_lteFalse_forEntireWord": "2263",
-  "nextInitializedTickWithinOneWord_lteFalse_justBelowBoundary": "2252",
-  "nextInitializedTickWithinOneWord_lteFalse_onBoundary": "2281",
-  "nextInitializedTickWithinOneWord_lteTrue_forEntireWord": "2258",
-  "nextInitializedTickWithinOneWord_lteTrue_justBelowBoundary": "2242",
-  "nextInitializedTickWithinOneWord_lteTrue_onBoundary_gas": "2287"
+  "flipTick_flippingATickThatResultsInDeletingAWord": "5168",
+  "flipTick_flippingFirstTickInWordToInitialized": "22268",
+  "flipTick_flippingSecondTickInWordToInitialized": "5280",
+  "nextInitializedTickWithinOneWord_lteFalse_forEntireWord": "2436",
+  "nextInitializedTickWithinOneWord_lteFalse_justBelowBoundary": "2436",
+  "nextInitializedTickWithinOneWord_lteFalse_onBoundary": "2436",
+  "nextInitializedTickWithinOneWord_lteTrue_forEntireWord": "2441",
+  "nextInitializedTickWithinOneWord_lteTrue_justBelowBoundary": "2632",
+  "nextInitializedTickWithinOneWord_lteTrue_onBoundary_gas": "2441"
 }

snapshots/TickMathTestTest.json

@@ -1,4 +1,4 @@
 {
-  "TickMathGetSqrtPriceAtTick": "72349",
-  "TickMathGetTickAtSqrtPrice": "195022"
+  "TickMathGetSqrtPriceAtTick": "74639",
+  "TickMathGetTickAtSqrtPrice": "211308"
 }

snapshots/TickTest.json

@@ -1,5 +1,5 @@
 {
-  "tickSpacingToMaxLiquidityPerTick_gasCost60TickSpacing": "25",
-  "tickSpacingToMaxLiquidityPerTick_gasCostMaxTickSpacing": "25",
-  "tickSpacingToMaxLiquidityPerTick_gasCostMinTickSpacing": "25"
+  "tickSpacingToMaxLiquidityPerTick_gasCost60TickSpacing": "65",
+  "tickSpacingToMaxLiquidityPerTick_gasCostMaxTickSpacing": "73",
+  "tickSpacingToMaxLiquidityPerTick_gasCostMinTickSpacing": "65"
 }

test/DynamicFees.t.sol

@@ -10,6 +10,8 @@ import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
 import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
 import {IHooks} from "../src/interfaces/IHooks.sol";
 import {PoolKey} from "../src/types/PoolKey.sol";
+// keeping one more pool manager import here so PoolManager is built with both, the default and test profile. Removing this unused import here breaks compilation due to a solc bug right now. This line can be deleted once the solc bug is fixed.
+// https://github.com/ethereum/solidity/issues/15582
 import {PoolManager} from "../src/PoolManager.sol";
 import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
 import {Deployers} from "./utils/Deployers.sol";

test/DynamicReturnFees.t.sol

@@ -10,7 +10,6 @@ import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
 import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
 import {IHooks} from "../src/interfaces/IHooks.sol";
 import {PoolKey} from "../src/types/PoolKey.sol";
-import {PoolManager} from "../src/PoolManager.sol";
 import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
 import {Deployers} from "./utils/Deployers.sol";
 import {DynamicReturnFeeTestHook} from "../src/test/DynamicReturnFeeTestHook.sol";

test/NoDelegateCall.t.sol

@@ -6,15 +6,15 @@ import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
 import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
 import {ProxyPoolManager} from "../src/test/ProxyPoolManager.sol";
 import {NoDelegateCallTest} from "../src/test/NoDelegateCallTest.sol";
-import {PoolManager} from "../src/PoolManager.sol";
 import {NoDelegateCall} from "../src/NoDelegateCall.sol";
 import {Deployers} from "./utils/Deployers.sol";
 
 contract TestDelegateCall is Test, Deployers {
     // override to use ProxyPoolManager
-    function deployFreshManager() internal virtual override {
-        IPoolManager delegateManager = new PoolManager(address(this));
+    function deployFreshManager() internal virtual override returns (IPoolManager manager_) {
+        IPoolManager delegateManager = super.deployFreshManager();
         manager = new ProxyPoolManager(address(delegateManager));
+        return manager;
     }
 
     NoDelegateCallTest noDelegateCallTest;

test/PoolManager.t.sol

@@ -6,7 +6,6 @@ import {IHooks} from "../src/interfaces/IHooks.sol";
 import {Hooks} from "../src/libraries/Hooks.sol";
 import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
 import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
-import {PoolManager} from "../src/PoolManager.sol";
 import {TickMath} from "../src/libraries/TickMath.sol";
 import {Pool} from "../src/libraries/Pool.sol";
 import {Deployers} from "./utils/Deployers.sol";

test/PoolManagerInitialize.t.sol

@@ -6,7 +6,6 @@ import {IHooks} from "../src/interfaces/IHooks.sol";
 import {Hooks} from "../src/libraries/Hooks.sol";
 import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
 import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
-import {PoolManager} from "../src/PoolManager.sol";
 import {TickMath} from "../src/libraries/TickMath.sol";
 import {Pool} from "../src/libraries/Pool.sol";
 import {Deployers} from "./utils/Deployers.sol";

test/SkipCallsTestHook.t.sol

@@ -9,7 +9,6 @@ import {IPoolManager} from "../src/interfaces/IPoolManager.sol";
 import {IProtocolFees} from "../src/interfaces/IProtocolFees.sol";
 import {IHooks} from "../src/interfaces/IHooks.sol";
 import {PoolKey} from "../src/types/PoolKey.sol";
-import {PoolManager} from "../src/PoolManager.sol";
 import {PoolSwapTest} from "../src/test/PoolSwapTest.sol";
 import {Deployers} from "./utils/Deployers.sol";
 import {Currency} from "../src/types/Currency.sol";

test/libraries/Hooks.t.sol

@@ -10,7 +10,6 @@ import {IPoolManager} from "../../src/interfaces/IPoolManager.sol";
 import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
 import {IHooks} from "../../src/interfaces/IHooks.sol";
 import {Currency} from "../../src/types/Currency.sol";
-import {PoolManager} from "../../src/PoolManager.sol";
 import {PoolSwapTest} from "../../src/test/PoolSwapTest.sol";
 import {PoolDonateTest} from "../../src/test/PoolDonateTest.sol";
 import {Deployers} from "test/utils/Deployers.sol";

test/libraries/Pool.t.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.20;
 import {Test} from "forge-std/Test.sol";
 import {Vm} from "forge-std/Vm.sol";
 import {Pool} from "../../src/libraries/Pool.sol";
-import {PoolManager} from "../../src/PoolManager.sol";
 import {Position} from "../../src/libraries/Position.sol";
 import {TickMath} from "../../src/libraries/TickMath.sol";
 import {TickBitmap} from "../../src/libraries/TickBitmap.sol";

test/utils/Deployers.sol

@@ -7,7 +7,6 @@ import {Hooks} from "../../src/libraries/Hooks.sol";
 import {Currency, CurrencyLibrary} from "../../src/types/Currency.sol";
 import {IHooks} from "../../src/interfaces/IHooks.sol";
 import {IPoolManager} from "../../src/interfaces/IPoolManager.sol";
-import {PoolManager} from "../../src/PoolManager.sol";
 import {PoolId} from "../../src/types/PoolId.sol";
 import {LPFeeLibrary} from "../../src/libraries/LPFeeLibrary.sol";
 import {PoolKey} from "../../src/types/PoolKey.sol";
@@ -83,8 +82,13 @@ contract Deployers is Test {
         }
     }
 
-    function deployFreshManager() internal virtual {
-        manager = new PoolManager(address(this));
+    function deployFreshManager() internal virtual returns (IPoolManager manager_) {
+        bytes memory bytecode =
+            abi.encodePacked(vm.getCode("out/PoolManager.sol/PoolManager.default.json"), abi.encode(address(this)));
+        assembly {
+            manager_ := create(0, add(bytecode, 0x20), mload(bytecode))
+        }
+        manager = manager_;
     }
 
     function deployFreshManagerAndRouters() internal {

test/utils/SwapHelper.t.sol

@@ -9,7 +9,6 @@ import {IPoolManager} from "../../src/interfaces/IPoolManager.sol";
 import {MockERC20} from "solmate/src/test/utils/mocks/MockERC20.sol";
 import {IHooks} from "../../src/interfaces/IHooks.sol";
 import {Currency} from "../../src/types/Currency.sol";
-import {PoolManager} from "../../src/PoolManager.sol";
 import {PoolSwapTest} from "../../src/test/PoolSwapTest.sol";
 import {PoolDonateTest} from "../../src/test/PoolDonateTest.sol";
 import {Deployers} from "./Deployers.sol";