Add transfer support

.forge-snapshots/PositionManager_increaseLiquidity_erc20.snap

@@ -1 +1 @@
-148697
+148651

.forge-snapshots/PositionManager_increaseLiquidity_native.snap

@@ -1 +1 @@
-133879
+133778

.forge-snapshots/PositionManager_mint.snap

@@ -1 +1 @@
-368776
+368730

.forge-snapshots/PositionManager_mint_native.snap

@@ -1 +1 @@
-336858
+336757

.forge-snapshots/PositionManager_mint_nativeWithSweep.snap

@@ -1 +1 @@
-343796
+346786

.forge-snapshots/PositionManager_mint_onSameTickLower.snap

@@ -1 +1 @@
-311458
+311412

.forge-snapshots/PositionManager_mint_onSameTickUpper.snap

@@ -1 +1 @@
-312100
+312054

.forge-snapshots/PositionManager_mint_sameRange.snap

@@ -1 +1 @@
-237682
+237636

.forge-snapshots/PositionManager_mint_warmedPool_differentRange.snap

@@ -1 +1 @@
-317476
+317430

.forge-snapshots/PositionManager_multicall_initialize_mint.snap

@@ -1 +1 @@
-413266
+413220

src/PositionManager.sol

@@ -85,8 +85,8 @@ contract PositionManager is
             return _burn(params);
         } else if (action == Actions.SETTLE_WITH_BALANCE) {
             return _settleWithBalance(params);
-        } else if (action == Actions.SWEEP_ERC20_TO) {
-            _sweepERC20To(params);
+        } else if (action == Actions.SWEEP) {
+            _sweep(params);
         } else {
             revert UnsupportedAction(action);
         }
@@ -158,9 +158,6 @@ contract PositionManager is
         address caller = _msgSender();
         if (currencyDelta < 0) {
             _settle(currency, caller, uint256(-currencyDelta));
-
-            // if there are native tokens left over after settling, return to locker
-            if (currency.isNative()) _sweepNativeToken(caller);
         } else if (currencyDelta > 0) {
             _take(currency, caller, uint256(currencyDelta));
         }
@@ -171,7 +168,6 @@ contract PositionManager is
     /// @param params is an encoding of Currency, uint256 amount
     /// @dev if amount == FULL_DELTA, it settles the full negative delta
     /// @dev uses this addresses balance to settle a negative delta
-    /// @dev Should not be called for NATIVE settling bc does not sweep.
     function _settleWithBalance(bytes memory params) internal returns (bytes memory) {
         (Currency currency, uint256 amount) = abi.decode(params, (Currency, uint256));
 
@@ -230,18 +226,12 @@ contract PositionManager is
         liquidity = poolManager.getPositionLiquidity(config.poolKey.toId(), positionId);
     }
 
-    /// @dev Send excess native tokens back to the recipient (locker)
-    /// @param recipient the receiver of the excess native tokens. Should be the caller, the one that sent the native tokens
-    function _sweepNativeToken(address recipient) internal {
-        uint256 nativeBalance = address(this).balance;
-        if (nativeBalance > 0) recipient.safeTransferETH(nativeBalance);
-    }
-
+    /// @notice Sweeps the entire contract balance of specified currency to the recipient
     /// @param params an encoding of Currency, address
-    function _sweepERC20To(bytes calldata params) internal {
+    function _sweep(bytes calldata params) internal {
         (Currency currency, address to) = abi.decode(params, (Currency, address));
-        uint256 tokenBalance = ERC20(Currency.unwrap(currency)).balanceOf(address(this));
-        if (tokenBalance > 0) currency.transfer(to, tokenBalance);
+        uint256 balance = currency.balanceOfSelf();
+        if (balance > 0) currency.transfer(to, balance);
     }
 
     // implementation of abstract function DeltaResolver._pay

src/interfaces/IPositionManager.sol

@@ -6,7 +6,6 @@ import {PoolKey} from "@uniswap/v4-core/src/types/PoolKey.sol";
 interface IPositionManager {
     error NotApproved(address caller);
     error DeadlinePassed();
-    error NothingToSettle();
     error IncorrectUseOfTake();
     error IncorrectUseOfSettle();
     error IncorrectPositionConfigForTokenId(uint256 tokenId);

src/libraries/Actions.sol

@@ -27,5 +27,5 @@ library Actions {
 
     // settle using the balance contract
     uint256 constant SETTLE_WITH_BALANCE = 0x24;
-    uint256 constant SWEEP_ERC20_TO = 0x25;
+    uint256 constant SWEEP = 0x25;
 }

test/position-managers/Gas.t.sol

@@ -376,7 +376,13 @@ contract GasTest is Test, PosmTestSetup, GasSnapshot {
 
     function test_gas_mint_native_excess() public {
         uint256 liquidityToAdd = 10_000 ether;
-        bytes memory calls = getMintEncoded(configNative, liquidityToAdd, address(this), ZERO_BYTES);
+
+        Plan memory planner = Planner.init();
+        planner.add(Actions.MINT_POSITION, abi.encode(configNative, liquidityToAdd, address(this), ZERO_BYTES));
+        planner.add(Actions.CLOSE_CURRENCY, abi.encode(nativeKey.currency0));
+        planner.add(Actions.CLOSE_CURRENCY, abi.encode(nativeKey.currency1));
+        planner.add(Actions.SWEEP, abi.encode(CurrencyLibrary.NATIVE, address(this)));
+        bytes memory calls = planner.encode();
 
         (uint256 amount0,) = LiquidityAmounts.getAmountsForLiquidity(
             SQRT_PRICE_1_1,

test/position-managers/IncreaseLiquidity.t.sol

@@ -343,8 +343,8 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
         planner.add(Actions.MINT_POSITION, abi.encode(config, liquidityAlice, alice, ZERO_BYTES));
         planner.add(Actions.SETTLE_WITH_BALANCE, abi.encode(currency0, type(uint256).max));
         planner.add(Actions.SETTLE_WITH_BALANCE, abi.encode(currency1, type(uint256).max));
-        planner.add(Actions.SWEEP_ERC20_TO, abi.encode(currency0, address(this)));
-        planner.add(Actions.SWEEP_ERC20_TO, abi.encode(currency1, address(this)));
+        planner.add(Actions.SWEEP, abi.encode(currency0, address(this)));
+        planner.add(Actions.SWEEP, abi.encode(currency1, address(this)));
 
         uint256 balanceBefore0 = currency0.balanceOf(address(this));
         uint256 balanceBefore1 = currency1.balanceOf(address(this));
@@ -370,6 +370,6 @@ contract IncreaseLiquidityTest is Test, PosmTestSetup, Fuzzers {
         assertEq(IERC20(Currency.unwrap(currency1)).balanceOf(address(lpm)), 0);
 
         assertEq(currency0.balanceOf(address(this)), balanceBefore0 - amount0);
-        assertEq(currency1.balanceOf(address(this)), balanceBefore0 - amount0);
+        assertEq(currency1.balanceOf(address(this)), balanceBefore1 - amount1);
     }
 }

test/position-managers/NativeToken.t.sol

@@ -105,7 +105,15 @@ contract PositionManagerTest is Test, PosmTestSetup, LiquidityFuzzers {
         uint256 balance1Before = currency1.balanceOfSelf();
 
         uint256 tokenId = lpm.nextTokenId();
-        bytes memory calls = getMintEncoded(config, liquidityToAdd, address(this), ZERO_BYTES);
+
+        Plan memory planner = Planner.init();
+        planner.add(Actions.MINT_POSITION, abi.encode(config, liquidityToAdd, address(this), ZERO_BYTES));
+        planner.add(Actions.CLOSE_CURRENCY, abi.encode(nativeKey.currency0));
+        planner.add(Actions.CLOSE_CURRENCY, abi.encode(nativeKey.currency1));
+        // sweep the excess eth
+        planner.add(Actions.SWEEP, abi.encode(currency0, address(this)));
+
+        bytes memory calls = planner.encode();
 
         (uint256 amount0,) = LiquidityAmounts.getAmountsForLiquidity(
             SQRT_PRICE_1_1,
@@ -293,7 +301,14 @@ contract PositionManagerTest is Test, PosmTestSetup, LiquidityFuzzers {
             uint128(liquidityToAdd)
         );
 
-        bytes memory calls = getIncreaseEncoded(tokenId, config, liquidityToAdd, ZERO_BYTES); // double the liquidity
+        Plan memory planner = Planner.init();
+        planner.add(Actions.INCREASE_LIQUIDITY, abi.encode(tokenId, config, liquidityToAdd, ZERO_BYTES));
+        planner.add(Actions.CLOSE_CURRENCY, abi.encode(nativeKey.currency0));
+        planner.add(Actions.CLOSE_CURRENCY, abi.encode(nativeKey.currency1));
+        // sweep the excess eth
+        planner.add(Actions.SWEEP, abi.encode(currency0, address(this)));
+        bytes memory calls = planner.encode();
+
         bytes[] memory result = lpm.modifyLiquidities{value: amount0 * 2}(calls, _deadline); // overpay on increase liquidity
         BalanceDelta delta = abi.decode(result[0], (BalanceDelta));