Using a fork of the transpiler that supports transient storage

Compiler can be found here: ethereum/solidity#14957
Commit: Amxx/solidity@f2c760e

.forge-snapshots/addLiquidity with empty hook.snap

@@ -1 +1 @@
-309389
+262287

.forge-snapshots/addLiquidity with native token.snap

@@ -1 +1 @@
-184232
+138862

.forge-snapshots/addLiquidity.snap

@@ -1 +1 @@
-189549
+144179

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

@@ -1 +1 @@
-125296
+100096

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

@@ -1 +1 @@
-172155
+126977

.forge-snapshots/initialize.snap

@@ -1 +1 @@
-51816
+51331

.forge-snapshots/poolManager bytecode size.snap

@@ -1 +1 @@
-22909
+22632

.forge-snapshots/removeLiquidity with empty hook.snap

@@ -1 +1 @@
-96164
+54782

.forge-snapshots/removeLiquidity with native token.snap

@@ -1 +1 @@
-192350
+146968

.forge-snapshots/removeLiquidity.snap

@@ -1 +1 @@
-193814
+148432

.forge-snapshots/simple swap with native.snap

@@ -1 +1 @@
-176897
+131463

.forge-snapshots/simple swap.snap

@@ -1 +1 @@
-190773
+145339

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

@@ -1 +1 @@
-112356
+70922

.forge-snapshots/swap against liquidity.snap

@@ -1 +1 @@
-100359
+58925

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

@@ -1 +1 @@
-120473
+79039

.forge-snapshots/swap burn native 6909 for input.snap

@@ -1 +1 @@
-116428
+74994

.forge-snapshots/swap mint native output as 6909.snap

@@ -1 +1 @@
-182756
+137322

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

@@ -1 +1 @@
-199565
+154131

.forge-snapshots/swap with dynamic fee.snap

@@ -1 +1 @@
-133664
+88230

.forge-snapshots/swap with hooks.snap

@@ -1 +1 @@
-100337
+58903

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

@@ -1 +1 @@
-184666
+138404

foundry.toml

@@ -3,7 +3,8 @@ optimizer_runs = 800
 via_ir = false
 ffi = true
 fs_permissions = [{ access = "read-write", path = ".forge-snapshots/"}, { access = "read", path = "./out"}]
-solc = "0.8.24"
+#solc = "0.8.24"
+solc = "/home/amxx/Work/Repos/solidity/build/solc/solc"
 evm_version = "cancun"
 
 [profile.default.fuzz]

src/PoolManager.sol

@@ -18,8 +18,6 @@ import {ProtocolFees} from "./ProtocolFees.sol";
 import {ERC6909Claims} from "./ERC6909Claims.sol";
 import {PoolId, PoolIdLibrary} from "./types/PoolId.sol";
 import {BalanceDelta, BalanceDeltaLibrary} from "./types/BalanceDelta.sol";
-import {Lock} from "./libraries/Lock.sol";
-import {NonZeroDeltaCount} from "./libraries/NonZeroDeltaCount.sol";
 import {PoolGetters} from "./libraries/PoolGetters.sol";
 
 /// @notice Holds the state for all pools
@@ -28,11 +26,14 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
     using SafeCast for *;
     using Pool for *;
     using Hooks for IHooks;
-    using Position for mapping(bytes32 => Position.Info);
+    // using Position for mapping(bytes32 => Position.Info);
     using CurrencyLibrary for Currency;
     using SwapFeeLibrary for uint24;
     using PoolGetters for Pool.State;
 
+    bool transient private unlocked;
+    uint256 transient private nonZeroDeltaCount;
+
     /// @inheritdoc IPoolManager
     int24 public constant MAX_TICK_SPACING = TickMath.MAX_TICK_SPACING;
 
@@ -41,8 +42,7 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
 
     /// @dev Represents the currencies due/owed to each caller.
     /// Must all net to zero when manager gets locked again
-    /// TODO this needs to be transient
-    mapping(address caller => mapping(Currency currency => int256 currencyDelta)) public currencyDelta;
+    mapping(address caller => mapping(Currency currency => int256 currencyDelta)) transient public currencyDelta;
 
     /// @inheritdoc IPoolManager
     mapping(Currency currency => uint256) public override reservesOf;
@@ -75,7 +75,7 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
         override
         returns (uint128 liquidity)
     {
-        return pools[id].positions.get(_owner, tickLower, tickUpper).liquidity;
+        return Position.get(pools[id].positions, _owner, tickLower, tickUpper).liquidity;
     }
 
     function getPosition(PoolId id, address _owner, int24 tickLower, int24 tickUpper)
@@ -84,16 +84,16 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
         override
         returns (Position.Info memory position)
     {
-        return pools[id].positions.get(_owner, tickLower, tickUpper);
+        return Position.get(pools[id].positions, _owner, tickLower, tickUpper);
     }
 
-    function isUnlocked() external view override returns (bool) {
-        return Lock.isUnlocked();
+    function isUnlocked() public view override returns (bool) {
+        return unlocked;
     }
 
     /// @notice This will revert if the contract is locked
     modifier onlyWhenUnlocked() {
-        if (!Lock.isUnlocked()) revert ManagerLocked();
+        if (!isUnlocked()) revert ManagerLocked();
         _;
     }
 
@@ -126,15 +126,16 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
 
     /// @inheritdoc IPoolManager
     function unlock(bytes calldata data) external override returns (bytes memory result) {
-        if (Lock.isUnlocked()) revert AlreadyUnlocked();
+        if (isUnlocked()) revert AlreadyUnlocked();
 
-        Lock.unlock();
+        unlocked = true;
 
         // the caller does everything in this callback, including paying what they owe via calls to settle
         result = IUnlockCallback(msg.sender).unlockCallback(data);
 
-        if (NonZeroDeltaCount.read() != 0) revert CurrencyNotSettled();
-        Lock.lock();
+        if (nonZeroDeltaCount != 0) revert CurrencyNotSettled();
+
+        unlocked = false;
     }
 
     function _accountDelta(Currency currency, int128 delta) internal {
@@ -145,9 +146,9 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
 
         unchecked {
             if (next == 0) {
-                NonZeroDeltaCount.decrement();
+                nonZeroDeltaCount -= 1;
             } else if (current == 0) {
-                NonZeroDeltaCount.increment();
+                nonZeroDeltaCount += 1;
             }
         }
 
@@ -330,7 +331,7 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
     }
 
     function getNonzeroDeltaCount() external view returns (uint256 _nonzeroDeltaCount) {
-        return NonZeroDeltaCount.read();
+        return nonZeroDeltaCount;
     }
 
     function getPoolTickInfo(PoolId id, int24 tick) external view returns (Pool.TickInfo memory) {

src/libraries/Pool.sol

@@ -13,8 +13,8 @@ import {BalanceDelta, toBalanceDelta} from "../types/BalanceDelta.sol";
 
 library Pool {
     using SafeCast for *;
-    using TickBitmap for mapping(int16 => uint256);
-    using Position for mapping(bytes32 => Position.Info);
+    // using TickBitmap for mapping(int16 => uint256);
+    // using Position for mapping(bytes32 => Position.Info);
     using Position for Position.Info;
     using Pool for State;
 
@@ -180,17 +180,17 @@ library Pool {
                 }
 
                 if (state.flippedLower) {
-                    self.tickBitmap.flipTick(params.tickLower, params.tickSpacing);
+                    TickBitmap.flipTick(self.tickBitmap, params.tickLower, params.tickSpacing);
                 }
                 if (state.flippedUpper) {
-                    self.tickBitmap.flipTick(params.tickUpper, params.tickSpacing);
+                    TickBitmap.flipTick(self.tickBitmap, params.tickUpper, params.tickSpacing);
                 }
             }
 
             (state.feeGrowthInside0X128, state.feeGrowthInside1X128) =
                 getFeeGrowthInside(self, params.tickLower, params.tickUpper);
 
-            (feesOwed0, feesOwed1) = self.positions.get(params.owner, params.tickLower, params.tickUpper).update(
+            (feesOwed0, feesOwed1) = Position.get(self.positions, params.owner, params.tickLower, params.tickUpper).update(
                 params.liquidityDelta, state.feeGrowthInside0X128, state.feeGrowthInside1X128
             );
 
@@ -343,7 +343,7 @@ library Pool {
             step.sqrtPriceStartX96 = state.sqrtPriceX96;
 
             (step.tickNext, step.initialized) =
-                self.tickBitmap.nextInitializedTickWithinOneWord(state.tick, params.tickSpacing, params.zeroForOne);
+                TickBitmap.nextInitializedTickWithinOneWord(self.tickBitmap, state.tick, params.tickSpacing, params.zeroForOne);
 
             // ensure that we do not overshoot the min/max tick, as the tick bitmap is not aware of these bounds
             if (step.tickNext < TickMath.MIN_TICK) {

src/test/MockERC6909Claims.sol

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.20;
 
-import {Test} from "forge-std/Test.sol";
 import {ERC6909Claims} from "../ERC6909Claims.sol";
 import {CurrencyLibrary, Currency} from "../types/Currency.sol";