TAKE_PAIR (#254)

* TAKE_PAIR

* getfullcredit

* take pair recipient

* add recipient test

.forge-snapshots/PositionManager_burn_nonEmpty_native_withTakePair.snap

@@ -0,0 +1 @@
+122739

.forge-snapshots/PositionManager_burn_nonEmpty_withTakePair.snap

@@ -0,0 +1 @@
+129817

.forge-snapshots/PositionManager_collect_withTakePair.snap

@@ -0,0 +1 @@
+149846

.forge-snapshots/PositionManager_decreaseLiquidity_withTakePair.snap

@@ -0,0 +1 @@
+115389

.forge-snapshots/PositionManager_mint_nativeWithSweep_withClose.snap

@@ -1 +1 @@
-345325
+345348

.forge-snapshots/PositionManager_mint_nativeWithSweep_withSettlePair.snap

@@ -1 +1 @@
-344866
+344889

.forge-snapshots/PositionManager_mint_settleWithBalance_sweep.snap

@@ -1 +1 @@
-371125
+371171

src/PositionManager.sol

@@ -175,6 +175,9 @@ contract PositionManager is
         } else if (action == Actions.SETTLE_PAIR) {
             (Currency currency0, Currency currency1) = params.decodeCurrencyPair();
             _settlePair(currency0, currency1);
+        } else if (action == Actions.TAKE_PAIR) {
+            (Currency currency0, Currency currency1, address to) = params.decodeCurrencyPairAndAddress();
+            _takePair(currency0, currency1, to);
         } else if (action == Actions.SWEEP) {
             (Currency currency, address to) = params.decodeCurrencyAndAddress();
             _sweep(currency, _mapRecipient(to));
@@ -271,6 +274,12 @@ contract PositionManager is
         _settle(currency1, caller, _getFullDebt(currency1));
     }
 
+    function _takePair(Currency currency0, Currency currency1, address to) internal {
+        address recipient = _mapRecipient(to);
+        _take(currency0, recipient, _getFullCredit(currency0));
+        _take(currency1, recipient, _getFullCredit(currency1));
+    }
+
     /// @dev this is overloaded with ERC721Permit._burn
     function _burn(
         uint256 tokenId,

src/libraries/Actions.sol

@@ -27,12 +27,13 @@ library Actions {
     uint256 constant TAKE = 0x12;
     uint256 constant TAKE_ALL = 0x13;
     uint256 constant TAKE_PORTION = 0x14;
+    uint256 constant TAKE_PAIR = 0x15;
 
-    uint256 constant CLOSE_CURRENCY = 0x15;
-    uint256 constant CLEAR_OR_TAKE = 0x16;
-    uint256 constant SWEEP = 0x17;
+    uint256 constant CLOSE_CURRENCY = 0x16;
+    uint256 constant CLEAR_OR_TAKE = 0x17;
+    uint256 constant SWEEP = 0x18;
 
     // minting/burning 6909s to close deltas
-    uint256 constant MINT_6909 = 0x18;
-    uint256 constant BURN_6909 = 0x19;
+    uint256 constant MINT_6909 = 0x19;
+    uint256 constant BURN_6909 = 0x20;
 }

src/libraries/CalldataDecoder.sol

@@ -174,6 +174,19 @@ library CalldataDecoder {
         }
     }
 
+    /// @dev equivalent to: abi.decode(params, (Currency, Currency, address)) in calldata
+    function decodeCurrencyPairAndAddress(bytes calldata params)
+        internal
+        pure
+        returns (Currency currency0, Currency currency1, address _address)
+    {
+        assembly ("memory-safe") {
+            currency0 := calldataload(params.offset)
+            currency1 := calldataload(add(params.offset, 0x20))
+            _address := calldataload(add(params.offset, 0x40))
+        }
+    }
+
     /// @dev equivalent to: abi.decode(params, (Currency, address)) in calldata
     function decodeCurrencyAndAddress(bytes calldata params)
         internal

test/libraries/CalldataDecoder.t.sol

@@ -160,6 +160,18 @@ contract CalldataDecoderTest is Test {
         assertEq(Currency.unwrap(currency1), Currency.unwrap(_currency1));
     }
 
+    function test_fuzz_decodeCurrencyPairAndAddress(Currency _currency0, Currency _currency1, address __address)
+        public
+        view
+    {
+        bytes memory params = abi.encode(_currency0, _currency1, __address);
+        (Currency currency0, Currency currency1, address _address) = decoder.decodeCurrencyPairAndAddress(params);
+
+        assertEq(Currency.unwrap(currency0), Currency.unwrap(_currency0));
+        assertEq(Currency.unwrap(currency1), Currency.unwrap(_currency1));
+        assertEq(_address, __address);
+    }
+
     function test_fuzz_decodeCurrencyAndUint256(Currency _currency, uint256 _amount) public view {
         bytes memory params = abi.encode(_currency, _amount);
         (Currency currency, uint256 amount) = decoder.decodeCurrencyAndUint256(params);

test/mocks/MockCalldataDecoder.sol

@@ -102,6 +102,14 @@ contract MockCalldataDecoder {
         return params.decodeCurrencyPair();
     }
 
+    function decodeCurrencyPairAndAddress(bytes calldata params)
+        external
+        pure
+        returns (Currency currency0, Currency currency1, address _address)
+    {
+        return params.decodeCurrencyPairAndAddress();
+    }
+
     function decodeCurrencyAndUint256(bytes calldata params) external pure returns (Currency currency, uint256 _uint) {
         return params.decodeCurrencyAndUint256();
     }