Merge branch 'dev' into fix/cantina-11-comments

Author: lucas-manuel

src/ForeignController.sol

@@ -482,46 +482,6 @@ contract ForeignController is ReentrancyGuard, AccessControlEnumerable {
         );
     }
 
-    /**********************************************************************************************/
-    /*** Relayer Morpho functions                                                               ***/
-    /**********************************************************************************************/
-
-    function setSupplyQueueMorpho(address morphoVault, Id[] memory newSupplyQueue)
-        external
-        nonReentrant
-        onlyRole(RELAYER)
-        rateLimitExists(RateLimitHelpers.makeAddressKey(LIMIT_4626_DEPOSIT, morphoVault))
-    {
-        proxy.doCall(
-            morphoVault,
-            abi.encodeCall(IMetaMorpho(morphoVault).setSupplyQueue, (newSupplyQueue))
-        );
-    }
-
-    function updateWithdrawQueueMorpho(address morphoVault, uint256[] calldata indexes)
-        external
-        nonReentrant
-        onlyRole(RELAYER)
-        rateLimitExists(RateLimitHelpers.makeAddressKey(LIMIT_4626_DEPOSIT, morphoVault))
-    {
-        proxy.doCall(
-            morphoVault,
-            abi.encodeCall(IMetaMorpho(morphoVault).updateWithdrawQueue, (indexes))
-        );
-    }
-
-    function reallocateMorpho(address morphoVault, MarketAllocation[] calldata allocations)
-        external
-        nonReentrant
-        onlyRole(RELAYER)
-        rateLimitExists(RateLimitHelpers.makeAddressKey(LIMIT_4626_DEPOSIT, morphoVault))
-    {
-        proxy.doCall(
-            morphoVault,
-            abi.encodeCall(IMetaMorpho(morphoVault).reallocate, (allocations))
-        );
-    }
-
     /**********************************************************************************************/
     /*** Spark Vault functions                                                                  ***/
     /**********************************************************************************************/

src/libraries/UniswapV4Lib.sol

@@ -450,11 +450,10 @@ library UniswapV4Lib {
     {
         bytes memory actions = abi.encodePacked(
             uint8(Actions.INCREASE_LIQUIDITY),
-            uint8(Actions.CLOSE_CURRENCY),
-            uint8(Actions.CLOSE_CURRENCY)
+            uint8(Actions.SETTLE_PAIR)
         );
 
-        bytes[] memory params = new bytes[](3);
+        bytes[] memory params = new bytes[](2);
 
         params[0] = abi.encode(
             tokenId,            // Position to increase
@@ -464,8 +463,10 @@ library UniswapV4Lib {
             ""                  // No hook data needed
         );
 
-        params[1] = abi.encode(poolKey.currency0);
-        params[2] = abi.encode(poolKey.currency1);
+        params[1] = abi.encode(
+            poolKey.currency0,  // First token to settle
+            poolKey.currency1   // Second token to settle
+        );
 
         return _getModifyLiquiditiesCallData(actions, params);
     }