add getPosition (Uniswap#277)

* add getPosition * linting * add snapshots * snapshots
Anzarax · Jun 21, 2023 · 86b3f65 · 86b3f65
1 parent a70cc40
commit 86b3f65
Show file tree

Hide file tree

Showing 19 changed files with 86 additions and 52 deletions.
diff --git a/.forge-snapshots/donate gas with 1 token.snap b/.forge-snapshots/donate gas with 1 token.snap
@@ -1 +1 @@
-131232
+131234
diff --git a/.forge-snapshots/donate gas with 2 tokens.snap b/.forge-snapshots/donate gas with 2 tokens.snap
@@ -1 +1 @@
-185897
+185921
diff --git a/.forge-snapshots/gas overhead of no-op lock.snap b/.forge-snapshots/gas overhead of no-op lock.snap
@@ -1 +1 @@
-61078
+61036
diff --git a/.forge-snapshots/initialize.snap b/.forge-snapshots/initialize.snap
@@ -1 +1 @@
-37658
+37613
diff --git a/.forge-snapshots/mint with empty hook.snap b/.forge-snapshots/mint with empty hook.snap
@@ -1 +1 @@
-320430
+320432
diff --git a/.forge-snapshots/mint with native token.snap b/.forge-snapshots/mint with native token.snap
@@ -1 +1 @@
-294443
+294445
diff --git a/.forge-snapshots/mint.snap b/.forge-snapshots/mint.snap
@@ -1 +1 @@
-313107
+313109
diff --git a/.forge-snapshots/poolExtsloadSlot0.snap b/.forge-snapshots/poolExtsloadSlot0.snap
@@ -1 +1 @@
-1129
+1151
diff --git a/.forge-snapshots/poolExtsloadTickInfoStruct.snap b/.forge-snapshots/poolExtsloadTickInfoStruct.snap
@@ -1 +1 @@
-2763
+2785
diff --git a/.forge-snapshots/simple swap.snap b/.forge-snapshots/simple swap.snap
@@ -1 +1 @@
-67802
+67737
diff --git a/.forge-snapshots/swap against liquidity with native token.snap b/.forge-snapshots/swap against liquidity with native token.snap
@@ -1 +1 @@
-161636
+161615
diff --git a/.forge-snapshots/swap against liquidity.snap b/.forge-snapshots/swap against liquidity.snap
@@ -1 +1 @@
-146343
+146322
diff --git a/.forge-snapshots/swap with hooks.snap b/.forge-snapshots/swap with hooks.snap
@@ -1 +1 @@
-67777
+67712
diff --git a/.forge-snapshots/swap with native.snap b/.forge-snapshots/swap with native.snap
@@ -1 +1 @@
-67802
+67737
diff --git a/contracts/PoolManager.sol b/contracts/PoolManager.sol
@@ -117,6 +117,15 @@ contract PoolManager is IPoolManager, Owned, NoDelegateCall, ERC1155, IERC1155Re
         return pools[id].positions.get(owner, tickLower, tickUpper).liquidity;
     }
 
+    function getPosition(PoolId id, address owner, int24 tickLower, int24 tickUpper)
+        external
+        view
+        override
+        returns (Position.Info memory position)
+    {
+        return pools[id].positions.get(owner, tickLower, tickUpper);
+    }
+
     /// @inheritdoc IPoolManager
     function initialize(PoolKey memory key, uint160 sqrtPriceX96) external override returns (int24 tick) {
         if (key.fee & Fees.STATIC_FEE_MASK >= 1000000) revert FeeTooLarge();

diff --git a/contracts/interfaces/IPoolManager.sol b/contracts/interfaces/IPoolManager.sol
@@ -7,6 +7,7 @@ import {IERC1155} from "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
 import {IHooks} from "./IHooks.sol";
 import {BalanceDelta} from "../types/BalanceDelta.sol";
 import {PoolId} from "../libraries/PoolId.sol";
+import {Position} from "../libraries/Position.sol";
 
 interface IPoolManager is IERC1155 {
     /// @notice Thrown when currencies touched has exceeded max of 256
@@ -129,6 +130,12 @@ interface IPoolManager is IERC1155 {
         view
         returns (uint128 liquidity);
 
+    /// @notice Get the position struct for a specified pool and position
+    function getPosition(PoolId id, address owner, int24 tickLower, int24 tickUpper)
+        external
+        view
+        returns (Position.Info memory position);
+
     /// @notice Given a currency address, returns the protocol fees accrued in that currency
     function protocolFeesAccrued(Currency) external view returns (uint256);