use CurrencyDelta library (#539)

Uniswap · Mar 27, 2024 · e4d9d90 · e4d9d90
1 parent bc7b94e
commit e4d9d90
Show file tree

Hide file tree

Showing 22 changed files with 26 additions and 25 deletions.
diff --git a/.forge-snapshots/addLiquidity with empty hook.snap b/.forge-snapshots/addLiquidity with empty hook.snap
@@ -1 +1 @@
-265619
+265799
diff --git a/.forge-snapshots/addLiquidity with native token.snap b/.forge-snapshots/addLiquidity with native token.snap
@@ -1 +1 @@
-140462
+140642
diff --git a/.forge-snapshots/addLiquidity.snap b/.forge-snapshots/addLiquidity.snap
@@ -1 +1 @@
-145779
+145959
diff --git a/.forge-snapshots/donate gas with 1 token.snap b/.forge-snapshots/donate gas with 1 token.snap
@@ -1 +1 @@
-101510
+101654
diff --git a/.forge-snapshots/donate gas with 2 tokens.snap b/.forge-snapshots/donate gas with 2 tokens.snap
@@ -1 +1 @@
-128451
+128667
diff --git a/.forge-snapshots/poolManager bytecode size.snap b/.forge-snapshots/poolManager bytecode size.snap
@@ -1 +1 @@
-22999
+23026
diff --git a/.forge-snapshots/removeLiquidity with empty hook.snap b/.forge-snapshots/removeLiquidity with empty hook.snap
@@ -1 +1 @@
-56394
+56574
diff --git a/.forge-snapshots/removeLiquidity with native token.snap b/.forge-snapshots/removeLiquidity with native token.snap
@@ -1 +1 @@
-148580
+148760
diff --git a/.forge-snapshots/removeLiquidity.snap b/.forge-snapshots/removeLiquidity.snap
@@ -1 +1 @@
-150044
+150224
diff --git a/.forge-snapshots/simple swap with native.snap b/.forge-snapshots/simple swap with native.snap
@@ -1 +1 @@
-133193
+133409
diff --git a/.forge-snapshots/simple swap.snap b/.forge-snapshots/simple swap.snap
@@ -1 +1 @@
-147069
+147285
diff --git a/.forge-snapshots/swap against liquidity with native token.snap b/.forge-snapshots/swap against liquidity with native token.snap
@@ -1 +1 @@
-72652
+72868
diff --git a/.forge-snapshots/swap against liquidity.snap b/.forge-snapshots/swap against liquidity.snap
@@ -1 +1 @@
-60655
+60871
diff --git a/.forge-snapshots/swap burn 6909 for input.snap b/.forge-snapshots/swap burn 6909 for input.snap
@@ -1 +1 @@
-80769
+80985
diff --git a/.forge-snapshots/swap burn native 6909 for input.snap b/.forge-snapshots/swap burn native 6909 for input.snap
@@ -1 +1 @@
-76724
+76940
diff --git a/.forge-snapshots/swap mint native output as 6909.snap b/.forge-snapshots/swap mint native output as 6909.snap
@@ -1 +1 @@
-139052
+139268
diff --git a/.forge-snapshots/swap mint output as 6909.snap b/.forge-snapshots/swap mint output as 6909.snap
@@ -1 +1 @@
-155861
+156077
diff --git a/.forge-snapshots/swap with dynamic fee.snap b/.forge-snapshots/swap with dynamic fee.snap
@@ -1 +1 @@
-89960
+90176
diff --git a/.forge-snapshots/swap with hooks.snap b/.forge-snapshots/swap with hooks.snap
@@ -1 +1 @@
-60633
+60849
diff --git a/.forge-snapshots/update dynamic fee in before swap.snap b/.forge-snapshots/update dynamic fee in before swap.snap
@@ -1 +1 @@
-140965
+141181
diff --git a/src/PoolManager.sol b/src/PoolManager.sol
@@ -31,6 +31,7 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
     using Hooks for IHooks;
     using Position for mapping(bytes32 => Position.Info);
     using CurrencyLibrary for Currency;
+    using CurrencyDelta for Currency;
     using SwapFeeLibrary for uint24;
     using PoolGetters for Pool.State;
 
@@ -85,7 +86,7 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
 
     /// @inheritdoc IPoolManager
     function currencyDelta(address caller, Currency currency) external view returns (int256) {
-        return CurrencyDelta.get(caller, currency);
+        return currency.getDelta(caller);
     }
 
     /// @inheritdoc IPoolManager
@@ -142,7 +143,7 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
     function _accountDelta(Currency currency, int128 delta) internal {
         if (delta == 0) return;
 
-        int256 current = CurrencyDelta.get(msg.sender, currency);
+        int256 current = currency.getDelta(msg.sender);
         int256 next = current + delta;
 
         unchecked {
@@ -153,7 +154,7 @@ contract PoolManager is IPoolManager, ProtocolFees, NoDelegateCall, ERC6909Claim
             }
         }
 
-        CurrencyDelta.set(msg.sender, currency, next);
+        currency.setDelta(msg.sender, next);
     }
 
     /// @dev Accumulates a balance change to a map of currency to balance changes

diff --git a/src/libraries/CurrencyDelta.sol b/src/libraries/CurrencyDelta.sol
@@ -21,15 +21,15 @@ library CurrencyDelta {
         }
     }
 
-    function set(address caller, Currency currency, int256 delta) internal {
+    function setDelta(Currency currency, address caller, int256 delta) internal {
         bytes32 hashSlot = _computeSlot(caller, currency);
 
         assembly {
             tstore(hashSlot, delta)
         }
     }
 
-    function get(address caller, Currency currency) internal view returns (int256 delta) {
+    function getDelta(Currency currency, address caller) internal view returns (int256 delta) {
         bytes32 hashSlot = _computeSlot(caller, currency);
 
         assembly {