do abi.encodePacked with inline assembly in Position.get (#279)

* do `abi.encodePacked` with inline assembly * Update gas snapshots * Add test for `Position.get` * Update gas snapshots * Update gas snapshots
Uniswap · Apr 8, 2024 · 126ec86 · 126ec86
1 parent 9f50d5d
commit 126ec86
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 8 deletions.
diff --git a/.forge-snapshots/addLiquidity with empty hook.snap b/.forge-snapshots/addLiquidity with empty hook.snap
@@ -1 +1 @@
-264715
+264566
diff --git a/.forge-snapshots/addLiquidity with native token.snap b/.forge-snapshots/addLiquidity with native token.snap
@@ -1 +1 @@
-139575
+139426
diff --git a/.forge-snapshots/addLiquidity.snap b/.forge-snapshots/addLiquidity.snap
@@ -1 +1 @@
-144892
+144743
diff --git a/.forge-snapshots/poolManager bytecode size.snap b/.forge-snapshots/poolManager bytecode size.snap
@@ -1 +1 @@
-22769
+22598
diff --git a/.forge-snapshots/removeLiquidity with empty hook.snap b/.forge-snapshots/removeLiquidity with empty hook.snap
@@ -1 +1 @@
-55375
+55226
diff --git a/.forge-snapshots/removeLiquidity with native token.snap b/.forge-snapshots/removeLiquidity with native token.snap
@@ -1 +1 @@
-147561
+147412
diff --git a/.forge-snapshots/removeLiquidity.snap b/.forge-snapshots/removeLiquidity.snap
@@ -1 +1 @@
-149025
+148876
diff --git a/src/libraries/Position.sol b/src/libraries/Position.sol
@@ -31,7 +31,16 @@ library Position {
         view
         returns (Info storage position)
     {
-        position = self[keccak256(abi.encodePacked(owner, tickLower, tickUpper))];
+        // positionKey = keccak256(abi.encodePacked(owner, tickLower, tickUpper))
+        bytes32 positionKey;
+        /// @solidity memory-safe-assembly
+        assembly {
+            mstore(0x06, tickUpper) // [0x23, 0x26)
+            mstore(0x03, tickLower) // [0x20, 0x23)
+            mstore(0, owner) // [0x0c, 0x20)
+            positionKey := keccak256(0x0c, 0x1a)
+        }
+        position = self[positionKey];
     }
 
     /// @notice Credits accumulated fees to a user's position

diff --git a/test/libraries/Position.t.sol b/test/libraries/Position.t.sol
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.20;
+
+import {Test} from "forge-std/Test.sol";
+import {Position} from "src/libraries/Position.sol";
+
+contract PositionTest is Test {
+    using Position for mapping(bytes32 => Position.Info);
+
+    mapping(bytes32 => Position.Info) internal positions;
+
+    function test_get_fuzz(address owner, int24 tickLower, int24 tickUpper) public {
+        bytes32 positionKey = keccak256(abi.encodePacked(owner, tickLower, tickUpper));
+        Position.Info storage expectedPosition = positions[positionKey];
+        Position.Info storage position = positions.get(owner, tickLower, tickUpper);
+        bytes32 expectedPositionSlot;
+        bytes32 positionSlot;
+        assembly ("memory-safe") {
+            expectedPositionSlot := expectedPosition.slot
+            positionSlot := position.slot
+        }
+        assertEq(positionSlot, expectedPositionSlot, "slots not equal");
+    }
+}