Position Manager w/ UR-invokable delta resolving

.forge-snapshots/FullRangeAddInitialLiquidity.snap

@@ -1 +1 @@
-311181
+354477

.forge-snapshots/FullRangeAddLiquidity.snap

@@ -1 +1 @@
-122990
+161786

.forge-snapshots/FullRangeFirstSwap.snap

@@ -1 +1 @@
-80220
+146400

.forge-snapshots/FullRangeInitialize.snap

@@ -1 +1 @@
-1015181
+1039616

.forge-snapshots/FullRangeRemoveLiquidity.snap

@@ -1 +1 @@
-110566
+146394

.forge-snapshots/FullRangeRemoveLiquidityAndRebalance.snap

@@ -1 +1 @@
-240044
+281672

.forge-snapshots/FullRangeSecondSwap.snap

@@ -1 +1 @@
-45930
+116110

.forge-snapshots/FullRangeSwap.snap

@@ -1 +1 @@
-79351
+145819

.forge-snapshots/OracleGrow10Slots.snap

@@ -1 +1 @@
-232960
+254164

.forge-snapshots/OracleGrow10SlotsCardinalityGreater.snap

@@ -1 +1 @@
-223649
+249653

.forge-snapshots/OracleGrow1Slot.snap

@@ -1 +1 @@
-32845
+54049

.forge-snapshots/OracleGrow1SlotCardinalityGreater.snap

@@ -1 +1 @@
-23545
+49549

.forge-snapshots/OracleInitialize.snap

@@ -1 +1 @@
-51310
+72794

.forge-snapshots/TWAMMSubmitOrder.snap

@@ -1 +1 @@
-122336
+156828

.forge-snapshots/autocompound_exactUnclaimedFees.snap

@@ -0,0 +1 @@
+258575

.forge-snapshots/autocompound_exactUnclaimedFees_exactCustodiedFees.snap

@@ -0,0 +1 @@
+190948

.forge-snapshots/autocompound_excessFeesCredit.snap

@@ -0,0 +1 @@
+279114

.forge-snapshots/decreaseLiquidity_erc20.snap

@@ -0,0 +1 @@
+177014

.forge-snapshots/decreaseLiquidity_erc6909.snap

@@ -0,0 +1 @@
+177026

.forge-snapshots/increaseLiquidity_erc20.snap

@@ -0,0 +1 @@
+171339

.forge-snapshots/increaseLiquidity_erc6909.snap

@@ -0,0 +1 @@
+146921

.forge-snapshots/mint.snap

@@ -0,0 +1 @@
+422785

.forge-snapshots/mintWithLiquidity.snap

@@ -0,0 +1 @@
+466628

.gitmodules

@@ -1,15 +1,3 @@
-[submodule "lib/forge-std"]
-	path = lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "lib/forge-gas-snapshot"]
-	path = lib/forge-gas-snapshot
-	url = https://github.com/marktoda/forge-gas-snapshot
 [submodule "lib/v4-core"]
 	path = lib/v4-core
 	url = https://github.com/Uniswap/v4-core
-[submodule "lib/solmate"]
-	path = lib/solmate
-	url = https://github.com/transmissions11/solmate

README.md

@@ -46,7 +46,7 @@ contract CoolHook is BaseHook {
         address,
         IPoolManager.PoolKey calldata key,
         IPoolManager.ModifyLiquidityParams calldata params
-    ) external override poolManagerOnly returns (bytes4) {
+    ) external override onlyByManager returns (bytes4) {
         // hook logic
         return BaseHook.beforeAddLiquidity.selector;
     }

contracts/NonfungiblePositionManager.sol

@@ -0,0 +1,156 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.24;
+
+import {ERC721Permit} from "./base/ERC721Permit.sol";
+import {INonfungiblePositionManager} from "./interfaces/INonfungiblePositionManager.sol";
+import {BaseLiquidityManagement} from "./base/BaseLiquidityManagement.sol";
+
+import {IPoolManager} from "@uniswap/v4-core/src/interfaces/IPoolManager.sol";
+import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";
+import {PoolIdLibrary} from "@uniswap/v4-core/src/types/PoolId.sol";
+import {Currency, CurrencyLibrary} from "@uniswap/v4-core/src/types/Currency.sol";
+import {CurrencySettleTake} from "./libraries/CurrencySettleTake.sol";
+import {LiquidityRange, LiquidityRangeId, LiquidityRangeIdLibrary} from "./types/LiquidityRange.sol";
+import {BalanceDelta, toBalanceDelta} from "@uniswap/v4-core/src/types/BalanceDelta.sol";
+
+import {LiquidityAmounts} from "./libraries/LiquidityAmounts.sol";
+import {TickMath} from "@uniswap/v4-core/src/libraries/TickMath.sol";
+import {StateLibrary} from "@uniswap/v4-core/src/libraries/StateLibrary.sol";
+import {SafeCast} from "@uniswap/v4-core/src/libraries/SafeCast.sol";
+
+contract NonfungiblePositionManager is INonfungiblePositionManager, BaseLiquidityManagement, ERC721Permit {
+    using CurrencyLibrary for Currency;
+    using CurrencySettleTake for Currency;
+    using PoolIdLibrary for PoolKey;
+    using LiquidityRangeIdLibrary for LiquidityRange;
+    using StateLibrary for IPoolManager;
+    using SafeCast for uint256;
+
+    /// @dev The ID of the next token that will be minted. Skips 0
+    uint256 private _nextId = 1;
+
+    // maps the ERC721 tokenId to the keys that uniquely identify a liquidity position (owner, range)
+    mapping(uint256 tokenId => TokenPosition position) public tokenPositions;
+
+    constructor(IPoolManager _manager)
+        BaseLiquidityManagement(_manager)
+        ERC721Permit("Uniswap V4 Positions NFT-V1", "UNI-V4-POS", "1")
+    {}
+
+    // NOTE: more gas efficient as LiquidityAmounts is used offchain
+    // TODO: deadline check
+    function mint(
+        LiquidityRange calldata range,
+        uint256 liquidity,
+        uint256 deadline,
+        address recipient,
+        bytes calldata hookData
+    ) public payable returns (uint256 tokenId, BalanceDelta delta) {
+        // delta = modifyLiquidity(range, liquidity.toInt256(), hookData, false);
+        delta = _lockAndIncreaseLiquidity(msg.sender, range, liquidity, hookData, false);
+
+        // mint receipt token
+        _mint(recipient, (tokenId = _nextId++));
+        tokenPositions[tokenId] = TokenPosition({owner: msg.sender, range: range});
+    }
+
+    // NOTE: more expensive since LiquidityAmounts is used onchain
+    // function mint(MintParams calldata params) external payable returns (uint256 tokenId, BalanceDelta delta) {
+    //     (uint160 sqrtPriceX96,,,) = manager.getSlot0(params.range.poolKey.toId());
+    //     (tokenId, delta) = mint(
+    //         params.range,
+    //         LiquidityAmounts.getLiquidityForAmounts(
+    //             sqrtPriceX96,
+    //             TickMath.getSqrtPriceAtTick(params.range.tickLower),
+    //             TickMath.getSqrtPriceAtTick(params.range.tickUpper),
+    //             params.amount0Desired,
+    //             params.amount1Desired
+    //         ),
+    //         params.deadline,
+    //         params.recipient,
+    //         params.hookData
+    //     );
+    //     require(params.amount0Min <= uint256(uint128(delta.amount0())), "INSUFFICIENT_AMOUNT0");
+    //     require(params.amount1Min <= uint256(uint128(delta.amount1())), "INSUFFICIENT_AMOUNT1");
+    // }
+
+    function increaseLiquidity(uint256 tokenId, uint256 liquidity, bytes calldata hookData, bool claims)
+        external
+        isAuthorizedForToken(tokenId)
+        returns (BalanceDelta delta)
+    {
+        TokenPosition memory tokenPos = tokenPositions[tokenId];
+        delta = _lockAndIncreaseLiquidity(tokenPos.owner, tokenPos.range, liquidity, hookData, claims);
+    }
+
+    function decreaseLiquidity(uint256 tokenId, uint256 liquidity, bytes calldata hookData, bool claims)
+        public
+        isAuthorizedForToken(tokenId)
+        returns (BalanceDelta delta, BalanceDelta thisDelta)
+    {
+        TokenPosition memory tokenPos = tokenPositions[tokenId];
+        (delta, thisDelta) = _lockAndDecreaseLiquidity(tokenPos.owner, tokenPos.range, liquidity, hookData, claims);
+    }
+
+    function burn(uint256 tokenId, address recipient, bytes calldata hookData, bool claims)
+        external
+        isAuthorizedForToken(tokenId)
+        returns (BalanceDelta delta)
+    {
+        // TODO: Burn currently decreases and collects. However its done under different locks.
+        // Replace once we have the execute multicall.
+        // remove liquidity
+        TokenPosition storage tokenPosition = tokenPositions[tokenId];
+        LiquidityRangeId rangeId = tokenPosition.range.toId();
+        Position storage position = positions[msg.sender][rangeId];
+        if (position.liquidity > 0) {
+            (delta,) = decreaseLiquidity(tokenId, position.liquidity, hookData, claims);
+        }
+
+        collect(tokenId, recipient, hookData, claims);
+        require(position.tokensOwed0 == 0 && position.tokensOwed1 == 0, "NOT_EMPTY");
+        delete positions[msg.sender][rangeId];
+        delete tokenPositions[tokenId];
+
+        // burn the token
+        _burn(tokenId);
+    }
+
+    // TODO: in v3, we can partially collect fees, but what was the usecase here?
+    function collect(uint256 tokenId, address recipient, bytes calldata hookData, bool claims)
+        public
+        returns (BalanceDelta delta)
+    {
+        TokenPosition memory tokenPos = tokenPositions[tokenId];
+        delta = _lockAndCollect(tokenPos.owner, tokenPos.range, hookData, claims);
+    }
+
+    function feesOwed(uint256 tokenId) external view returns (uint256 token0Owed, uint256 token1Owed) {
+        TokenPosition memory tokenPosition = tokenPositions[tokenId];
+        return feesOwed(tokenPosition.owner, tokenPosition.range);
+    }
+
+    function _beforeTokenTransfer(address from, address to, uint256 tokenId) internal override {
+        TokenPosition storage tokenPosition = tokenPositions[tokenId];
+        LiquidityRangeId rangeId = tokenPosition.range.toId();
+        Position storage position = positions[from][rangeId];
+        position.operator = address(0x0);
+
+        // transfer position data to destination
+        positions[to][rangeId] = position;
+        delete positions[from][rangeId];
+
+        // update token position
+        tokenPositions[tokenId] = TokenPosition({owner: to, range: tokenPosition.range});
+    }
+
+    function _getAndIncrementNonce(uint256 tokenId) internal override returns (uint256) {
+        TokenPosition memory tokenPosition = tokenPositions[tokenId];
+        return uint256(positions[tokenPosition.owner][tokenPosition.range.toId()].nonce++);
+    }
+
+    modifier isAuthorizedForToken(uint256 tokenId) {
+        require(_isApprovedOrOwner(msg.sender, tokenId), "Not approved");
+        _;
+    }
+}