Add solc binaries and transient storage lock library

.env

@@ -1 +1,7 @@
 FOUNDRY_FUZZ_SEED=0x4444
+
+if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+        FOUNDRY_SOLC="./bin/solc-static-linux"
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+        FOUNDRY_SOLC="./bin/solc"
+fi

.forge-snapshots/before swap hook, already cached dynamic fee.snap

@@ -1 +1 @@
-197447
+172021

.forge-snapshots/cached dynamic fee, no hooks.snap

@@ -1 +1 @@
-184082
+158656

.forge-snapshots/donate gas with 1 token.snap

@@ -1 +1 @@
-95906
+76947

.forge-snapshots/donate gas with 2 tokens.snap

@@ -1 +1 @@
-153271
+134745

.forge-snapshots/erc20 collect protocol fees.snap

@@ -1 +1 @@
-25011
+25033

.forge-snapshots/gas overhead of no-op lock.snap

@@ -1 +1 @@
-58439
+14918

.forge-snapshots/initialize.snap

@@ -1 +1 @@
-38079
+38101

.forge-snapshots/mint with empty hook.snap

@@ -1 +1 @@
-307014
+264055

.forge-snapshots/mint with native token.snap

@@ -1 +1 @@
-275044
+232085

.forge-snapshots/mint.snap

@@ -1 +1 @@
-293680
+250721

.forge-snapshots/native collect protocol fees.snap

@@ -1 +1 @@
-36677
+36699

.forge-snapshots/poolManager bytecode size.snap

@@ -1 +1 @@
-24366
+24630

.forge-snapshots/simple swap.snap

@@ -1 +1 @@
-151298
+129248

.forge-snapshots/swap against liquidity with native token.snap

@@ -1 +1 @@
-124939
+106413

.forge-snapshots/swap against liquidity.snap

@@ -1 +1 @@
-109627
+91101

.forge-snapshots/swap burn claim for input.snap

@@ -1 +1 @@
-126356
+107809

.forge-snapshots/swap mint output as claim.snap

@@ -1 +1 @@
-166380
+147831

.forge-snapshots/swap with dynamic fee.snap

@@ -1 +1 @@
-196682
+171256

.forge-snapshots/swap with hooks.snap

@@ -1 +1 @@
-109605
+91079

.forge-snapshots/update dynamic fee in before swap.snap

@@ -1 +1 @@
-203277
+177851

CONTRIBUTING.md

@@ -46,6 +46,8 @@ All contributions must follow the below standards. Maintainers will close out PR
 
 ## Setup
 
+Run `source .env` to set FOUNDRY_SOLC to the correct solc binary.
+
 `forge build` to get contract artifacts and dependencies for forge
 
 ## Tests

foundry.toml

@@ -4,7 +4,7 @@ optimizer_runs = 800
 via_ir = false
 ffi = true
 fs_permissions = [{ access = "read-write", path = ".forge-snapshots/"}, { access = "read", path = "./out"}]
-evm_version = 'paris'
+cancun = true
 
 [profile.default.fuzz]
 runs = 100
@@ -13,4 +13,8 @@ seed = "0x4444"
 [profile.ci.fuzz]
 runs = 1000
 
+[profile.ci]
+fuzz_runs = 100000
+solc = "./bin/solc-static-linux"
+
 # See more config options https://github.com/foundry-rs/foundry/tree/master/config

src/PoolManager.sol

@@ -8,7 +8,6 @@ import {Position} from "./libraries/Position.sol";
 import {FeeLibrary} from "./libraries/FeeLibrary.sol";
 import {Currency, CurrencyLibrary} from "./types/Currency.sol";
 import {PoolKey} from "./types/PoolKey.sol";
-import {LockDataLibrary} from "./libraries/LockDataLibrary.sol";
 import {NoDelegateCall} from "./NoDelegateCall.sol";
 import {Owned} from "./Owned.sol";
 import {IHooks} from "./interfaces/IHooks.sol";
@@ -20,6 +19,7 @@ import {Fees} from "./Fees.sol";
 import {Claims} from "./Claims.sol";
 import {PoolId, PoolIdLibrary} from "./types/PoolId.sol";
 import {BalanceDelta} from "./types/BalanceDelta.sol";
+import {Lockers} from "./libraries/Lockers.sol";
 
 /// @notice Holds the state for all pools
 contract PoolManager is IPoolManager, Fees, NoDelegateCall, Claims {
@@ -29,7 +29,6 @@ contract PoolManager is IPoolManager, Fees, NoDelegateCall, Claims {
     using Hooks for IHooks;
     using Position for mapping(bytes32 => Position.Info);
     using CurrencyLibrary for Currency;
-    using LockDataLibrary for IPoolManager.LockData;
     using FeeLibrary for uint24;
 
     /// @inheritdoc IPoolManager
@@ -38,9 +37,6 @@ contract PoolManager is IPoolManager, Fees, NoDelegateCall, Claims {
     /// @inheritdoc IPoolManager
     int24 public constant override MIN_TICK_SPACING = 1;
 
-    /// @inheritdoc IPoolManager
-    IPoolManager.LockData public override lockData;
-
     /// @dev Represents the currencies due/owed to each locker.
     /// Must all net to zero when the last lock is released.
     mapping(address locker => mapping(Currency currency => int256 currencyDelta)) public currencyDelta;
@@ -94,7 +90,7 @@ contract PoolManager is IPoolManager, Fees, NoDelegateCall, Claims {
 
     /// @inheritdoc IPoolManager
     function getLock(uint256 i) external view override returns (address locker) {
-        return LockDataLibrary.getLock(i);
+        return Lockers.getLocker(i);
     }
 
     /// @inheritdoc IPoolManager
@@ -139,31 +135,31 @@ contract PoolManager is IPoolManager, Fees, NoDelegateCall, Claims {
 
     /// @inheritdoc IPoolManager
     function lock(bytes calldata data) external override returns (bytes memory result) {
-        lockData.push(msg.sender);
+        Lockers.push(msg.sender);
 
         // the caller does everything in this callback, including paying what they owe via calls to settle
         result = ILockCallback(msg.sender).lockAcquired(data);
 
-        if (lockData.length == 1) {
-            if (lockData.nonzeroDeltaCount != 0) revert CurrencyNotSettled();
-            delete lockData;
+        if (Lockers.length() == 1) {
+            if (Lockers.nonzeroDeltaCount() != 0) revert CurrencyNotSettled();
+            Lockers.clear();
         } else {
-            lockData.pop();
+            Lockers.pop();
         }
     }
 
     function _accountDelta(Currency currency, int128 delta) internal {
         if (delta == 0) return;
 
-        address locker = lockData.getActiveLock();
+        address locker = Lockers.getCurrentLocker();
         int256 current = currencyDelta[locker][currency];
         int256 next = current + delta;
 
         unchecked {
             if (next == 0) {
-                lockData.nonzeroDeltaCount--;
+                Lockers.decrementNonzeroDeltaCount();
             } else if (current == 0) {
-                lockData.nonzeroDeltaCount++;
+                Lockers.incrementNonzeroDeltaCount();
             }
         }
 
@@ -177,7 +173,7 @@ contract PoolManager is IPoolManager, Fees, NoDelegateCall, Claims {
     }
 
     modifier onlyByLocker() {
-        address locker = lockData.getActiveLock();
+        address locker = Lockers.getCurrentLocker();
         if (msg.sender != locker) revert LockedBy(locker);
         _;
     }
@@ -388,6 +384,14 @@ contract PoolManager is IPoolManager, Fees, NoDelegateCall, Claims {
         return value;
     }
 
+    function getLockLength() external view returns (uint256 _length) {
+        return Lockers.length();
+    }
+
+    function getLockNonzeroDeltaCount() external view returns (uint256 _nonzeroDeltaCount) {
+        return Lockers.nonzeroDeltaCount();
+    }
+
     /// @notice receive native tokens for native pools
     receive() external payable {}
 }

src/interfaces/IPoolManager.sol

@@ -114,19 +114,14 @@ interface IPoolManager is IFees, IClaims {
     /// @notice Returns the reserves for a given ERC20 currency
     function reservesOf(Currency currency) external view returns (uint256);
 
-    /// @notice Contains data about pool lockers.
-    struct LockData {
-        /// @notice The current number of active lockers
-        uint128 length;
-        /// @notice The total number of nonzero deltas over all active + completed lockers
-        uint128 nonzeroDeltaCount;
-    }
-
     /// @notice Returns the locker in the ith position of the locker queue.
     function getLock(uint256 i) external view returns (address locker);
 
-    /// @notice Returns lock data
-    function lockData() external view returns (uint128 length, uint128 nonzeroDeltaCount);
+    /// @notice Returns the length of the lockers array, which is the number of locks open on the PoolManager.
+    function getLockLength() external view returns (uint256 _length);
+
+    /// @notice Returns the number of nonzero deltas open on the PoolManager that must be zerod by the close of the initial lock.
+    function getLockNonzeroDeltaCount() external view returns (uint256 _nonzeroDeltaCount);
 
     /// @notice Initialize the state for a given pool ID
     function initialize(PoolKey memory key, uint160 sqrtPriceX96, bytes calldata hookData)