wip

.forge-snapshots/autocompound_exactUnclaimedFees.snap

@@ -1,5 +1 @@
-<<<<<<< HEAD
-265935
-=======
-262456
->>>>>>> sauce/posm-batch-execute
+299933

.forge-snapshots/autocompound_exactUnclaimedFees_exactCustodiedFees.snap

@@ -1,5 +1 @@
-<<<<<<< HEAD
-198308
-=======
-194829
->>>>>>> sauce/posm-batch-execute
+239395

.forge-snapshots/autocompound_excessFeesCredit.snap

@@ -1,5 +1 @@
-<<<<<<< HEAD
-286474
-=======
-282995
->>>>>>> sauce/posm-batch-execute
+320472

.forge-snapshots/decreaseLiquidity_erc20.snap

@@ -1,5 +1 @@
-<<<<<<< HEAD
-184325
-=======
-180479
->>>>>>> sauce/posm-batch-execute
+215156

.forge-snapshots/decreaseLiquidity_erc6909.snap

@@ -1,5 +1 @@
-<<<<<<< HEAD
-184337
-=======
-180491
->>>>>>> sauce/posm-batch-execute
+215168

.forge-snapshots/increaseLiquidity_erc20.snap

@@ -1,5 +1 @@
-<<<<<<< HEAD
-178692
-=======
-175213
->>>>>>> sauce/posm-batch-execute
+194836

.forge-snapshots/increaseLiquidity_erc6909.snap

@@ -1,5 +1 @@
-<<<<<<< HEAD
-154281
-=======
-150802
->>>>>>> sauce/posm-batch-execute
+194848

.forge-snapshots/mintWithLiquidity.snap

@@ -1,5 +1 @@
-<<<<<<< HEAD
-476792
-=======
-472424
->>>>>>> sauce/posm-batch-execute
+511680

contracts/NonfungiblePositionManager.sol

@@ -36,6 +36,9 @@ contract NonfungiblePositionManager is INonfungiblePositionManager, BaseLiquidit
     // maps the ERC721 tokenId to the keys that uniquely identify a liquidity position (owner, range)
     mapping(uint256 tokenId => TokenPosition position) public tokenPositions;
 
+    // TODO: TSTORE this jawn
+    address internal msgSender;
+
     constructor(IPoolManager _manager)
         BaseLiquidityManagement(_manager)
         ERC721Permit("Uniswap V4 Positions NFT-V1", "UNI-V4-POS", "1")
@@ -58,9 +61,14 @@ contract NonfungiblePositionManager is INonfungiblePositionManager, BaseLiquidit
 
         // close the deltas
         for (uint256 i; i < currencies.length; i++) {
-            currencies[i].close(manager, msg.sender);
+            currencies[i].close(manager, msgSender);
             currencies[i].close(manager, address(this));
         }
+
+        // TODO: @sara handle the return
+        // vanilla: return int128[2]
+        // batch: return int128[data.length]
+        return returnData;
     }
 
     // NOTE: more gas efficient as LiquidityAmounts is used offchain
@@ -81,9 +89,14 @@ contract NonfungiblePositionManager is INonfungiblePositionManager, BaseLiquidit
             _mint(recipient, (tokenId = nextTokenId++));
             tokenPositions[tokenId] = TokenPosition({owner: recipient, range: range});
         } else {
+            msgSender = msg.sender;
             bytes[] memory data = new bytes[](1);
             data[0] = abi.encodeWithSelector(this.mint.selector, range, liquidity, deadline, recipient, hookData);
-            bytes memory result = unlockAndExecute(data);
+
+            Currency[] memory currencies = new Currency[](2);
+            currencies[0] = range.poolKey.currency0;
+            currencies[1] = range.poolKey.currency1;
+            bytes memory result = unlockAndExecute(data, currencies);
             delta = abi.decode(result, (BalanceDelta));
         }
     }
@@ -118,9 +131,14 @@ contract NonfungiblePositionManager is INonfungiblePositionManager, BaseLiquidit
         if (manager.isUnlocked()) {
             _increaseLiquidity(tokenPos.owner, tokenPos.range, liquidity, hookData);
         } else {
+            msgSender = msg.sender;
             bytes[] memory data = new bytes[](1);
             data[0] = abi.encodeWithSelector(this.increaseLiquidity.selector, tokenId, liquidity, hookData, claims);
-            bytes memory result = unlockAndExecute(data);
+
+            Currency[] memory currencies = new Currency[](2);
+            currencies[0] = tokenPos.range.poolKey.currency0;
+            currencies[1] = tokenPos.range.poolKey.currency1;
+            bytes memory result = unlockAndExecute(data, currencies);
             delta = abi.decode(result, (BalanceDelta));
         }
     }
@@ -135,9 +153,14 @@ contract NonfungiblePositionManager is INonfungiblePositionManager, BaseLiquidit
         if (manager.isUnlocked()) {
             _decreaseLiquidity(tokenPos.owner, tokenPos.range, liquidity, hookData);
         } else {
+            msgSender = msg.sender;
             bytes[] memory data = new bytes[](1);
             data[0] = abi.encodeWithSelector(this.decreaseLiquidity.selector, tokenId, liquidity, hookData, claims);
-            bytes memory result = unlockAndExecute(data);
+
+            Currency[] memory currencies = new Currency[](2);
+            currencies[0] = tokenPos.range.poolKey.currency0;
+            currencies[1] = tokenPos.range.poolKey.currency1;
+            bytes memory result = unlockAndExecute(data, currencies);
             delta = abi.decode(result, (BalanceDelta));
         }
     }
@@ -175,9 +198,14 @@ contract NonfungiblePositionManager is INonfungiblePositionManager, BaseLiquidit
         if (manager.isUnlocked()) {
             _collect(recipient, tokenPos.range, hookData);
         } else {
+            msgSender = msg.sender;
             bytes[] memory data = new bytes[](1);
             data[0] = abi.encodeWithSelector(this.collect.selector, tokenId, recipient, hookData, claims);
-            bytes memory result = unlockAndExecute(data);
+
+            Currency[] memory currencies = new Currency[](2);
+            currencies[0] = tokenPos.range.poolKey.currency0;
+            currencies[1] = tokenPos.range.poolKey.currency1;
+            bytes memory result = unlockAndExecute(data, currencies);
             delta = abi.decode(result, (BalanceDelta));
         }
     }

contracts/libraries/TransientLiquidityDelta.sol

@@ -52,8 +52,8 @@ library TransientLiquidityDelta {
 
     function close(Currency currency, IPoolManager manager, address holder) internal {
         // getDelta(currency, holder);
-        bytes32 hashSlot = _computeSlot(caller, currency);
-        int128 delta;
+        bytes32 hashSlot = _computeSlot(holder, currency);
+        int256 delta;
         assembly {
             delta := tload(hashSlot)
         }

test/position-managers/Execute.t.sol

@@ -87,7 +87,10 @@ contract ExecuteTest is Test, Deployers, GasSnapshot, LiquidityFuzzers {
             INonfungiblePositionManager.increaseLiquidity.selector, tokenId, liquidityToAdd, ZERO_BYTES, false
         );
 
-        lpm.unlockAndExecute(data);
+        Currency[] memory currencies = new Currency[](2);
+        currencies[0] = currency0;
+        currencies[1] = currency1;
+        lpm.unlockAndExecute(data, currencies);
 
         (,, uint256 liquidity,,,,) = lpm.positions(address(this), range.toId());
         assertEq(liquidity, initialLiquidity + liquidityToAdd);
@@ -112,7 +115,10 @@ contract ExecuteTest is Test, Deployers, GasSnapshot, LiquidityFuzzers {
             INonfungiblePositionManager.increaseLiquidity.selector, tokenId, liquidityToAdd2, ZERO_BYTES, false
         );
 
-        lpm.unlockAndExecute(data);
+        Currency[] memory currencies = new Currency[](2);
+        currencies[0] = currency0;
+        currencies[1] = currency1;
+        lpm.unlockAndExecute(data, currencies);
 
         (,, uint256 liquidity,,,,) = lpm.positions(address(this), range.toId());
         assertEq(liquidity, initialiLiquidity + liquidityToAdd + liquidityToAdd2);
@@ -137,7 +143,10 @@ contract ExecuteTest is Test, Deployers, GasSnapshot, LiquidityFuzzers {
             INonfungiblePositionManager.increaseLiquidity.selector, tokenId, liquidityToAdd, ZERO_BYTES, false
         );
 
-        lpm.unlockAndExecute(data);
+        Currency[] memory currencies = new Currency[](2);
+        currencies[0] = currency0;
+        currencies[1] = currency1;
+        lpm.unlockAndExecute(data, currencies);
 
         (,, uint256 liquidity,,,,) = lpm.positions(address(this), range.toId());
         assertEq(liquidity, intialLiquidity + liquidityToAdd);