being supporting batched ops on vanilla functions

Uniswap · Jun 26, 2024 · 1e52f82 · 1e52f82
1 parent e21e847
commit 1e52f82
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 16 deletions.
diff --git a/.forge-snapshots/autocompound_exactUnclaimedFees.snap b/.forge-snapshots/autocompound_exactUnclaimedFees.snap
@@ -1 +1 @@
-260688
+261455
diff --git a/.forge-snapshots/autocompound_exactUnclaimedFees_exactCustodiedFees.snap b/.forge-snapshots/autocompound_exactUnclaimedFees_exactCustodiedFees.snap
@@ -1 +1 @@
-193061
+193828
diff --git a/.forge-snapshots/autocompound_excessFeesCredit.snap b/.forge-snapshots/autocompound_excessFeesCredit.snap
@@ -1 +1 @@
-281227
+281994
diff --git a/.forge-snapshots/decreaseLiquidity_erc20.snap b/.forge-snapshots/decreaseLiquidity_erc20.snap
@@ -1 +1 @@
-191813
+191784
diff --git a/.forge-snapshots/decreaseLiquidity_erc6909.snap b/.forge-snapshots/decreaseLiquidity_erc6909.snap
@@ -1 +1 @@
-170680
+170651
diff --git a/.forge-snapshots/increaseLiquidity_erc20.snap b/.forge-snapshots/increaseLiquidity_erc20.snap
@@ -1 +1 @@
-173452
+174219
diff --git a/.forge-snapshots/increaseLiquidity_erc6909.snap b/.forge-snapshots/increaseLiquidity_erc6909.snap
@@ -1 +1 @@
-149034
+149801
diff --git a/.forge-snapshots/mintWithLiquidity.snap b/.forge-snapshots/mintWithLiquidity.snap
@@ -1 +1 @@
-468881
+469640
diff --git a/contracts/NonfungiblePositionManager.sol b/contracts/NonfungiblePositionManager.sol
@@ -16,6 +16,7 @@ import {BalanceDelta, toBalanceDelta} from "@uniswap/v4-core/src/types/BalanceDe
 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 {TransientStateLibrary} from "@uniswap/v4-core/src/libraries/TransientStateLibrary.sol";
 import {SafeCast} from "@uniswap/v4-core/src/libraries/SafeCast.sol";
 
 contract NonfungiblePositionManager is INonfungiblePositionManager, BaseLiquidityManagement, ERC721Permit {
@@ -24,6 +25,7 @@ contract NonfungiblePositionManager is INonfungiblePositionManager, BaseLiquidit
     using PoolIdLibrary for PoolKey;
     using LiquidityRangeIdLibrary for LiquidityRange;
     using StateLibrary for IPoolManager;
+    using TransientStateLibrary for IPoolManager;
     using SafeCast for uint256;
 
     /// @dev The ID of the next token that will be minted. Skips 0
@@ -66,8 +68,17 @@ contract NonfungiblePositionManager is INonfungiblePositionManager, BaseLiquidit
         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);
+        // TODO: optimization, read/write manager.isUnlocked to avoid repeated external calls for batched execution
+        if (manager.isUnlocked()) {
+            BalanceDelta thisDelta;
+            (delta, thisDelta) = _increaseLiquidity(recipient, range, liquidity, hookData);
+
+            // TODO: should be triggered by zeroOut in _execute...
+            _closeCallerDeltas(delta, range.poolKey.currency0, range.poolKey.currency1, recipient, false);
+            _closeThisDeltas(thisDelta, range.poolKey.currency0, range.poolKey.currency1);
+        } else {
+            delta = _unlockAndIncreaseLiquidity(msg.sender, range, liquidity, hookData, false);
+        }
 
         // mint receipt token
         _mint(recipient, (tokenId = _nextId++));
@@ -100,7 +111,19 @@ contract NonfungiblePositionManager is INonfungiblePositionManager, BaseLiquidit
         returns (BalanceDelta delta)
     {
         TokenPosition memory tokenPos = tokenPositions[tokenId];
-        delta = _lockAndIncreaseLiquidity(tokenPos.owner, tokenPos.range, liquidity, hookData, claims);
+
+        if (manager.isUnlocked()) {
+            BalanceDelta thisDelta;
+            (delta, thisDelta) = _increaseLiquidity(tokenPos.owner, tokenPos.range, liquidity, hookData);
+
+            // TODO: should be triggered by zeroOut in _execute...
+            _closeCallerDeltas(
+                delta, tokenPos.range.poolKey.currency0, tokenPos.range.poolKey.currency1, tokenPos.owner, claims
+            );
+            _closeThisDeltas(thisDelta, tokenPos.range.poolKey.currency0, tokenPos.range.poolKey.currency1);
+        } else {
+            delta = _unlockAndIncreaseLiquidity(tokenPos.owner, tokenPos.range, liquidity, hookData, claims);
+        }
     }
 
     function decreaseLiquidity(uint256 tokenId, uint256 liquidity, bytes calldata hookData, bool claims)
@@ -109,7 +132,9 @@ contract NonfungiblePositionManager is INonfungiblePositionManager, BaseLiquidit
         returns (BalanceDelta delta)
     {
         TokenPosition memory tokenPos = tokenPositions[tokenId];
-        delta = _lockAndDecreaseLiquidity(tokenPos.owner, tokenPos.range, liquidity, hookData, claims);
+
+        // TODO: @sauce update once _decreaseLiquidity returns callerDelta/thisDelta
+        delta = _unlockAndDecreaseLiquidity(tokenPos.owner, tokenPos.range, liquidity, hookData, claims);
     }
 
     function burn(uint256 tokenId, address recipient, bytes calldata hookData, bool claims)
@@ -138,7 +163,8 @@ contract NonfungiblePositionManager is INonfungiblePositionManager, BaseLiquidit
         returns (BalanceDelta delta)
     {
         TokenPosition memory tokenPos = tokenPositions[tokenId];
-        delta = _lockAndCollect(tokenPos.owner, tokenPos.range, hookData, claims);
+        // TODO: @sauce update once _collect returns callerDelta/thisDel
+        delta = _unlockAndCollect(tokenPos.owner, tokenPos.range, hookData, claims);
     }
 
     function feesOwed(uint256 tokenId) external view returns (uint256 token0Owed, uint256 token1Owed) {

diff --git a/contracts/base/BaseLiquidityManagement.sol b/contracts/base/BaseLiquidityManagement.sol
@@ -225,7 +225,7 @@ abstract contract BaseLiquidityManagement is IBaseLiquidityManagement, SafeCallb
         return (tokensOwed, callerDelta, thisDelta);
     }
 
-    function _lockAndIncreaseLiquidity(
+    function _unlockAndIncreaseLiquidity(
         address owner,
         LiquidityRange memory range,
         uint256 liquidityToAdd,
@@ -289,7 +289,7 @@ abstract contract BaseLiquidityManagement is IBaseLiquidityManagement, SafeCallb
         _closeAllDeltas(range.poolKey.currency0, range.poolKey.currency1);
     }
 
-    function _lockAndDecreaseLiquidity(
+    function _unlockAndDecreaseLiquidity(
         address owner,
         LiquidityRange memory range,
         uint256 liquidityToRemove,
@@ -341,7 +341,7 @@ abstract contract BaseLiquidityManagement is IBaseLiquidityManagement, SafeCallb
         _closeAllDeltas(range.poolKey.currency0, range.poolKey.currency1);
     }
 
-    function _lockAndCollect(address owner, LiquidityRange memory range, bytes memory hookData, bool claims)
+    function _unlockAndCollect(address owner, LiquidityRange memory range, bytes memory hookData, bool claims)
         internal
         returns (BalanceDelta)
     {