@pendle/core-v2 5.2.0 → 5.2.1-beta-1

package/contracts/interfaces/IPActionSwapYTV3.sol

@@ -13,7 +13,7 @@ interface IPActionSwapYTV3 is IPAllEventsV3 {
         uint256 minYtOut,
         ApproxParams calldata guessYtOut,
         TokenInput calldata input,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external payable returns (uint256 netYtOut, uint256 netSyFee, uint256 netSyInterm);
 
     function swapExactSyForYt(
@@ -22,7 +22,7 @@ interface IPActionSwapYTV3 is IPAllEventsV3 {
         uint256 exactSyIn,
         uint256 minYtOut,
         ApproxParams calldata guessYtOut,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 netYtOut, uint256 netSyFee);
 
     function swapExactYtForToken(
@@ -30,7 +30,7 @@ interface IPActionSwapYTV3 is IPAllEventsV3 {
         address market,
         uint256 exactYtIn,
         TokenOutput calldata output,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 netTokenOut, uint256 netSyFee, uint256 netSyInterm);
 
     function swapExactYtForSy(
@@ -38,7 +38,7 @@ interface IPActionSwapYTV3 is IPAllEventsV3 {
         address market,
         uint256 exactYtIn,
         uint256 minSyOut,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 netSyOut, uint256 netSyFee);
 
     function swapExactPtForYt(

package/contracts/interfaces/IPAllActionTypeV3.sol

@@ -104,6 +104,10 @@ struct LimitOrderData {
     bytes optData;
 }
 
+struct LimitOrder_OptData_V1 {
+    uint256 netOffchain;
+}
+
 struct ApproxParams {
     uint256 guessMin;
     uint256 guessMax;

package/contracts/interfaces/IPAllActionV3.sol

@@ -9,6 +9,7 @@ import "./IPActionMiscV3.sol";
 import "./IPActionCallbackV3.sol";
 import "./IPActionStorageV4.sol";
 import "./IPActionSimple.sol";
+import "./IPActionSwapLimitV3.sol";
 
 interface IPAllActionV3 is
     IPActionAddRemoveLiqV3,
@@ -17,5 +18,6 @@ interface IPAllActionV3 is
     IPActionMiscV3,
     IPActionCallbackV3,
     IPActionStorageV4,
-    IPActionSimple
+    IPActionSimple,
+    IPActionSwapLimitV3
 {}

package/contracts/interfaces/IPAllEventsV3.sol

@@ -265,10 +265,53 @@ interface IPActionStorageEvents {
     event SelectorToFacetSet(bytes4 indexed selector, address indexed facet);
 }
 
+interface IPActionSwapLimitV3Events {
+    event SwapMaxPtForTokenLimitOnly(
+        address indexed caller,
+        address indexed market,
+        address indexed token,
+        address receiver,
+        uint256 maxPtIn,
+        uint256 netTokenOut,
+        uint256 netSyInterm,
+        uint256 netPtReturned
+    );
+
+    event SwapMaxPtForSyLimitOnly(
+        address indexed caller,
+        address indexed market,
+        address indexed receiver,
+        uint256 maxPtIn,
+        uint256 netSyOut,
+        uint256 netPtReturned
+    );
+
+    event SwapMaxTokenForYtLimitOnly(
+        address indexed caller,
+        address indexed market,
+        address indexed token,
+        address receiver,
+        uint256 maxTokenIn,
+        uint256 netYtOut,
+        uint256 netSyInterm,
+        uint256 netSyReturned
+    );
+
+    event SwapMaxSyForYtLimitOnly(
+        address indexed caller,
+        address indexed market,
+        address indexed receiver,
+        uint256 maxSyIn,
+        uint256 netYtOut,
+        uint256 netSyReturned
+    );
+}
+
 interface IPAllEventsV3 is
     IPActionAddRemoveLiqV3Events,
     IPActionSwapPTV3Events,
     IPActionSwapYTV3Events,
     IPActionMiscV3Events,
-    IPActionStorageEvents
+    IPActionStorageEvents,
+    IPActionSwapLimitV3Events
 {}

package/contracts/router/ActionAddRemoveLiqV3.sol

@@ -88,7 +88,7 @@ contract ActionAddRemoveLiqV3 is IPActionAddRemoveLiqV3, ActionBase, ActionDeleg
         uint256 netPtIn,
         uint256 minLpOut,
         ApproxParams calldata guessPtSwapToSy,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 netLpOut, uint256 netSyFee) {
         if (canUseOnchainApproximation(guessPtSwapToSy, limit)) {
             return delegateToAddLiquiditySinglePtSimple(receiver, market, netPtIn, minLpOut);
@@ -140,7 +140,7 @@ contract ActionAddRemoveLiqV3 is IPActionAddRemoveLiqV3, ActionBase, ActionDeleg
         uint256 minLpOut,
         ApproxParams calldata guessPtReceivedFromSy,
         TokenInput calldata input,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external payable returns (uint256 netLpOut, uint256 netSyFee, uint256 netSyInterm) {
         if (canUseOnchainApproximation(guessPtReceivedFromSy, limit)) {
             return delegateToAddLiquiditySingleTokenSimple(receiver, market, minLpOut, input);
@@ -179,7 +179,7 @@ contract ActionAddRemoveLiqV3 is IPActionAddRemoveLiqV3, ActionBase, ActionDeleg
         uint256 netSyIn,
         uint256 minLpOut,
         ApproxParams calldata guessPtReceivedFromSy,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 netLpOut, uint256 netSyFee) {
         if (canUseOnchainApproximation(guessPtReceivedFromSy, limit)) {
             return delegateToAddLiquiditySingleSySimple(receiver, market, netSyIn, minLpOut);
@@ -211,7 +211,7 @@ contract ActionAddRemoveLiqV3 is IPActionAddRemoveLiqV3, ActionBase, ActionDeleg
         uint256 netSyIn,
         uint256 minLpOut,
         ApproxParams calldata guessPtReceivedFromSy,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) internal returns (uint256 netLpOut, uint256 netSyFee) {
         uint256 netSyLeft = netSyIn;
         uint256 netPtReceived;
@@ -397,7 +397,7 @@ contract ActionAddRemoveLiqV3 is IPActionAddRemoveLiqV3, ActionBase, ActionDeleg
         uint256 netLpToRemove,
         uint256 minPtOut,
         ApproxParams calldata guessPtReceivedFromSy,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 netPtOut, uint256 netSyFee) {
         if (canUseOnchainApproximation(guessPtReceivedFromSy, limit)) {
             return delegateToRemoveLiquiditySinglePtSimple(receiver, market, netLpToRemove, minPtOut);
@@ -439,7 +439,7 @@ contract ActionAddRemoveLiqV3 is IPActionAddRemoveLiqV3, ActionBase, ActionDeleg
         address market,
         uint256 netLpToRemove,
         TokenOutput calldata output,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 netTokenOut, uint256 netSyFee, uint256 netSyInterm) {
         (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
 
@@ -466,7 +466,7 @@ contract ActionAddRemoveLiqV3 is IPActionAddRemoveLiqV3, ActionBase, ActionDeleg
         address market,
         uint256 netLpToRemove,
         uint256 minSyOut,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 netSyOut, uint256 netSyFee) {
         _transferFrom(IERC20(market), msg.sender, market, netLpToRemove);
 
@@ -481,7 +481,7 @@ contract ActionAddRemoveLiqV3 is IPActionAddRemoveLiqV3, ActionBase, ActionDeleg
         address market,
         uint256 netLpToRemove,
         uint256 minSyOut,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) internal returns (uint256 netSyOut, uint256 netSyFee) {
         if (IPMarket(market).isExpired()) {
             netSyOut = __removeLpToSyAfterExpiry(receiver, market, netLpToRemove);
@@ -505,7 +505,7 @@ contract ActionAddRemoveLiqV3 is IPActionAddRemoveLiqV3, ActionBase, ActionDeleg
         address receiver,
         address market,
         uint256 netLpToRemove,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) internal returns (uint256 netSyOut, uint256 netSyFee) {
         uint256 netPtLeft;
 

package/contracts/router/ActionMiscV3.sol

@@ -205,20 +205,6 @@ contract ActionMiscV3 is IPActionMiscV3, ActionBase {
         }
     }
 
-    /// @dev Deprecated, please use swapTokensToTokens which support unwrapping ETH too
-    function swapTokenToToken(
-        address receiver,
-        uint256 minTokenOut,
-        TokenInput calldata inp
-    ) external payable returns (uint256 netTokenOut) {
-        _swapTokenInput(inp);
-
-        netTokenOut = _selfBalance(inp.tokenMintSy);
-        if (netTokenOut < minTokenOut) revert("Slippage: INSUFFICIENT_TOKEN_OUT");
-
-        _transferOut(inp.tokenMintSy, receiver, netTokenOut);
-    }
-
     /// @dev The interface might change in the future, check with Pendle team before use
     function swapTokenToTokenViaSy(
         address receiver,
@@ -239,7 +225,7 @@ contract ActionMiscV3 is IPActionMiscV3, ActionBase {
         uint256 netYtIn,
         uint256 netLpIn,
         TokenOutput calldata output,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 totalTokenOut, ExitPreExpReturnParams memory params) {
         IStandardizedYield SY;
 
@@ -257,7 +243,7 @@ contract ActionMiscV3 is IPActionMiscV3, ActionBase {
         uint256 netYtIn,
         uint256 netLpIn,
         uint256 minSyOut,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (ExitPreExpReturnParams memory params) {
         (, params) = _exitPreExpToSy(false, receiver, market, netPtIn, netYtIn, netLpIn, limit);
         require(params.totalSyOut >= minSyOut, "Slippage: INSUFFICIENT_SY_OUT");
@@ -272,7 +258,7 @@ contract ActionMiscV3 is IPActionMiscV3, ActionBase {
         uint256 netPtIn,
         uint256 netYtIn,
         uint256 netLpIn,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) internal returns (IStandardizedYield SY, ExitPreExpReturnParams memory p) {
         IPPrincipalToken PT;
         IPYieldToken YT;

package/contracts/router/ActionSwapLimitV3.sol

@@ -0,0 +1,126 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.17;
+
+import "./base/ActionBase.sol";
+import "../interfaces/IPActionSwapLimitV3.sol";
+
+contract ActionSwapLimitV3 is IPActionSwapLimitV3, ActionBase {
+    using PMath for uint256;
+
+    function swapMaxPtForTokenLimitOnly(
+        address receiver,
+        address market,
+        uint256 maxPtIn,
+        uint256 minTokenPtRate,
+        TokenOutput calldata output,
+        LimitOrderData memory limit
+    ) external returns (uint256 netTokenOut, uint256 netPtReturned, uint256 netSyFee, uint256 netSyInterm) {
+        (IStandardizedYield SY, IPPrincipalToken PT, ) = IPMarket(market).readTokens();
+        _transferFrom(PT, msg.sender, address(this), maxPtIn);
+
+        (netSyInterm, netPtReturned, netSyFee) = _swapMaxPtForSyLimitOnly(address(SY), PT, maxPtIn, 0, limit);
+
+        netTokenOut = _redeemSyToToken(receiver, address(SY), netSyInterm, output, false);
+
+        uint256 netPtUsed = maxPtIn - netPtReturned;
+        if (netTokenOut.divDown(netPtUsed) < minTokenPtRate) revert("Slippage LO: INSUFFICIENT_TOKEN_OUT");
+
+        emit SwapMaxPtForTokenLimitOnly(
+            msg.sender,
+            market,
+            output.tokenOut,
+            receiver,
+            maxPtIn,
+            netTokenOut,
+            netSyInterm,
+            netPtReturned
+        );
+    }
+
+    function swapMaxPtForSyLimitOnly(
+        address receiver,
+        address market,
+        uint256 maxPtIn,
+        uint256 minSyPtRate,
+        LimitOrderData memory limit
+    ) external returns (uint256 netSyOut, uint256 netPtReturned, uint256 netSyFee) {
+        (, IPPrincipalToken PT, ) = IPMarket(market).readTokens();
+        _transferFrom(PT, msg.sender, address(this), maxPtIn);
+
+        (netSyOut, netPtReturned, netSyFee) = _swapMaxPtForSyLimitOnly(receiver, PT, maxPtIn, minSyPtRate, limit);
+
+        emit SwapMaxPtForSyLimitOnly(msg.sender, market, receiver, maxPtIn, netSyOut, netPtReturned);
+    }
+
+    function swapMaxTokenForYtLimitOnly(
+        address receiver,
+        address market,
+        uint256 minSyInterm,
+        uint256 minYtSyRate,
+        TokenInput calldata input,
+        LimitOrderData memory limit
+    ) external payable returns (uint256 netYtOut, uint256 netSyReturned, uint256 netSyFee, uint256 netSyInterm) {
+        (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
+
+        netSyInterm = _mintSyFromToken(address(this), address(SY), minSyInterm, input);
+        (netYtOut, netSyReturned, netSyFee) = _swapMaxSyForYtLimitOnly(receiver, SY, netSyInterm, minYtSyRate, limit);
+
+        emit SwapMaxTokenForYtLimitOnly(
+            msg.sender,
+            market,
+            input.tokenIn,
+            receiver,
+            input.netTokenIn,
+            netYtOut,
+            netSyInterm,
+            netSyReturned
+        );
+    }
+
+    function swapMaxSyForYtLimitOnly(
+        address receiver,
+        address market,
+        uint256 maxSyIn,
+        uint256 minYtSyRate,
+        LimitOrderData memory limit
+    ) external returns (uint256 netYtOut, uint256 netSyReturned, uint256 netSyFee) {
+        (IStandardizedYield SY, , ) = IPMarket(market).readTokens();
+
+        _transferFrom(SY, msg.sender, address(this), maxSyIn);
+        (netYtOut, netSyReturned, netSyFee) = _swapMaxSyForYtLimitOnly(receiver, SY, maxSyIn, minYtSyRate, limit);
+
+        emit SwapMaxSyForYtLimitOnly(msg.sender, market, receiver, maxSyIn, netYtOut, netSyReturned);
+    }
+
+    function _swapMaxPtForSyLimitOnly(
+        address receiver,
+        IPPrincipalToken PT,
+        uint256 maxPtIn,
+        uint256 minSyPtRate,
+        LimitOrderData memory limit
+    ) internal returns (uint256 netSyOut, uint256 netPtReturned, uint256 netSyFee) {
+        (netPtReturned, netSyOut, netSyFee, ) = _fillLimit(receiver, PT, maxPtIn, limit);
+        if (netSyOut == 0) revert("Slippage LO: NO_ORDER_FILLED");
+
+        uint256 netPtUsed = maxPtIn - netPtReturned;
+        if (netSyOut.divDown(netPtUsed) < minSyPtRate) revert("Slippage LO: INSUFFICIENT_SY_OUT");
+
+        _transferOut(address(PT), msg.sender, netPtReturned);
+    }
+
+    function _swapMaxSyForYtLimitOnly(
+        address receiver,
+        IStandardizedYield SY,
+        uint256 maxSyIn,
+        uint256 minYtSyRate,
+        LimitOrderData memory limit
+    ) internal returns (uint256 netYtOut, uint256 netSyReturned, uint256 netSyFee) {
+        (netSyReturned, netYtOut, netSyFee, ) = _fillLimit(receiver, SY, maxSyIn, limit);
+        if (netYtOut == 0) revert("Slippage LO: NO_ORDER_FILLED");
+
+        uint256 netSyUsed = maxSyIn - netSyReturned;
+        if (netYtOut.divDown(netSyUsed) < minYtSyRate) revert("Slippage LO: INSUFFICIENT_YT_OUT");
+
+        _transferOut(address(SY), msg.sender, netSyReturned);
+    }
+}

package/contracts/router/ActionSwapPTV3.sol

@@ -16,7 +16,7 @@ contract ActionSwapPTV3 is IPActionSwapPTV3, ActionBase, ActionDelegateBase {
         uint256 minPtOut,
         ApproxParams calldata guessPtOut,
         TokenInput calldata input,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external payable returns (uint256 netPtOut, uint256 netSyFee, uint256 netSyInterm) {
         if (canUseOnchainApproximation(guessPtOut, limit)) {
             return delegateToSwapExactTokenForPtSimple(receiver, market, minPtOut, input);
@@ -44,7 +44,7 @@ contract ActionSwapPTV3 is IPActionSwapPTV3, ActionBase, ActionDelegateBase {
         uint256 exactSyIn,
         uint256 minPtOut,
         ApproxParams calldata guessPtOut,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 netPtOut, uint256 netSyFee) {
         if (canUseOnchainApproximation(guessPtOut, limit)) {
             return delegateToSwapExactSyForPtSimple(receiver, market, exactSyIn, minPtOut);
@@ -63,7 +63,7 @@ contract ActionSwapPTV3 is IPActionSwapPTV3, ActionBase, ActionDelegateBase {
         address market,
         uint256 exactPtIn,
         TokenOutput calldata output,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 netTokenOut, uint256 netSyFee, uint256 netSyInterm) {
         (IStandardizedYield SY, IPPrincipalToken PT, ) = IPMarket(market).readTokens();
         _transferFrom(PT, msg.sender, _entry_swapExactPtForSy(market, limit), exactPtIn);
@@ -89,7 +89,7 @@ contract ActionSwapPTV3 is IPActionSwapPTV3, ActionBase, ActionDelegateBase {
         address market,
         uint256 exactPtIn,
         uint256 minSyOut,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 netSyOut, uint256 netSyFee) {
         (, IPPrincipalToken PT, ) = IPMarket(market).readTokens();
         _transferFrom(PT, msg.sender, _entry_swapExactPtForSy(market, limit), exactPtIn);

package/contracts/router/ActionSwapYTV3.sol

@@ -21,7 +21,7 @@ contract ActionSwapYTV3 is CallbackHelper, IPActionSwapYTV3, ActionBase, ActionD
         uint256 minYtOut,
         ApproxParams calldata guessYtOut,
         TokenInput calldata input,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external payable returns (uint256 netYtOut, uint256 netSyFee, uint256 netSyInterm) {
         if (canUseOnchainApproximation(guessYtOut, limit)) {
             return delegateToSwapExactTokenForYtSimple(receiver, market, minYtOut, input);
@@ -50,7 +50,7 @@ contract ActionSwapYTV3 is CallbackHelper, IPActionSwapYTV3, ActionBase, ActionD
         uint256 exactSyIn,
         uint256 minYtOut,
         ApproxParams calldata guessYtOut,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 netYtOut, uint256 netSyFee) {
         if (canUseOnchainApproximation(guessYtOut, limit)) {
             return delegateToSwapExactSyForYtSimple(receiver, market, exactSyIn, minYtOut);
@@ -71,7 +71,7 @@ contract ActionSwapYTV3 is CallbackHelper, IPActionSwapYTV3, ActionBase, ActionD
         address market,
         uint256 exactYtIn,
         TokenOutput calldata output,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 netTokenOut, uint256 netSyFee, uint256 netSyInterm) {
         (IStandardizedYield SY, , IPYieldToken YT) = IPMarket(market).readTokens();
         _transferFrom(YT, msg.sender, _entry_swapExactYtForSy(YT, limit), exactYtIn);
@@ -97,7 +97,7 @@ contract ActionSwapYTV3 is CallbackHelper, IPActionSwapYTV3, ActionBase, ActionD
         address market,
         uint256 exactYtIn,
         uint256 minSyOut,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) external returns (uint256 netSyOut, uint256 netSyFee) {
         (IStandardizedYield SY, , IPYieldToken YT) = IPMarket(market).readTokens();
         _transferFrom(YT, msg.sender, _entry_swapExactYtForSy(YT, limit), exactYtIn);

package/contracts/router/base/ActionBase.sol

@@ -161,7 +161,7 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
 
     // ----------------- PT SWAP -----------------
 
-    function _entry_swapExactPtForSy(address market, LimitOrderData calldata limit) internal view returns (address) {
+    function _entry_swapExactPtForSy(address market, LimitOrderData memory limit) internal view returns (address) {
         return _entry_swapExactPtForSy(market, !_isEmptyLimit(limit));
     }
 
@@ -174,7 +174,7 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
         address market,
         uint256 exactPtIn,
         uint256 minSyOut,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) internal returns (uint256 netSyOut, uint256 netSyFee) {
         (, IPPrincipalToken PT, ) = IPMarket(market).readTokens();
 
@@ -202,7 +202,7 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
         if (netSyOut < minSyOut) revert("Slippage: INSUFFICIENT_SY_OUT");
     }
 
-    function _entry_swapExactSyForPt(address market, LimitOrderData calldata limit) internal view returns (address) {
+    function _entry_swapExactSyForPt(address market, LimitOrderData memory limit) internal view returns (address) {
         return _entry_swapExactSyForPt(market, !_isEmptyLimit(limit));
     }
 
@@ -216,7 +216,7 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
         uint256 exactSyIn,
         uint256 minPtOut,
         ApproxParams calldata guessPtOut,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) internal returns (uint256 netPtOut, uint256 netSyFee) {
         (IStandardizedYield SY, , IPYieldToken YT) = IPMarket(market).readTokens();
         uint256 netSyLeft = exactSyIn;
@@ -248,7 +248,7 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
 
     // ----------------- YT SWAP -----------------
 
-    function _entry_swapExactYtForSy(IPYieldToken YT, LimitOrderData calldata limit) internal view returns (address) {
+    function _entry_swapExactYtForSy(IPYieldToken YT, LimitOrderData memory limit) internal view returns (address) {
         return _entry_swapExactYtForSy(YT, !_isEmptyLimit(limit));
     }
 
@@ -263,7 +263,7 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
         IPYieldToken YT,
         uint256 exactYtIn,
         uint256 minSyOut,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) internal returns (uint256 netSyOut, uint256 netSyFee) {
         uint256 netYtLeft = exactYtIn;
         bool doMarketOrder = true;
@@ -292,7 +292,7 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
         if (netSyOut < minSyOut) revert("Slippage: INSUFFICIENT_SY_OUT");
     }
 
-    function _entry_swapExactSyForYt(IPYieldToken YT, LimitOrderData calldata limit) internal view returns (address) {
+    function _entry_swapExactSyForYt(IPYieldToken YT, LimitOrderData memory limit) internal view returns (address) {
         return _entry_swapExactSyForYt(YT, !_isEmptyLimit(limit));
     }
 
@@ -308,7 +308,7 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
         uint256 exactSyIn,
         uint256 minYtOut,
         ApproxParams calldata guessYtOut,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) internal returns (uint256 netYtOut, uint256 netSyFee) {
         uint256 netSyLeft = exactSyIn;
         bool doMarketOrder = true;
@@ -346,8 +346,15 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
         address receiver,
         IERC20 tokenIn,
         uint256 netInput,
-        LimitOrderData calldata lim
+        LimitOrderData memory lim
     ) internal returns (uint256 netLeft, uint256 netOut, uint256 netSyFee, bool doMarketOrder) {
+        {
+            if (lim.optData.length != 0) {
+                LimitOrder_OptData_V1 memory optData = abi.decode(lim.optData, (LimitOrder_OptData_V1));
+                _scaleLimitOrderData(lim, netInput, optData.netOffchain);
+            }
+        }
+
         IPLimitRouter router = IPLimitRouter(lim.limitRouter);
         netLeft = netInput;
 
@@ -386,13 +393,13 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
         doMarketOrder = netLeft > netInput.mulDown(lim.epsSkipMarket);
     }
 
-    function _isEmptyLimit(LimitOrderData calldata a) internal pure returns (bool) {
+    function _isEmptyLimit(LimitOrderData memory a) internal pure returns (bool) {
         return a.normalFills.length == 0 && a.flashFills.length == 0;
     }
 
     // ----------------- ADD & REMOVE LIQUIDITY -----------------
 
-    function _entry_addLiquiditySinglePt(address market, LimitOrderData calldata lim) internal view returns (address) {
+    function _entry_addLiquiditySinglePt(address market, LimitOrderData memory lim) internal view returns (address) {
         return _entry_addLiquiditySinglePt(market, !_isEmptyLimit(lim));
     }
 
@@ -400,7 +407,7 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
         return hasLimitOrder ? address(this) : market;
     }
 
-    function _entry_addLiquiditySingleSy(address market, LimitOrderData calldata lim) internal view returns (address) {
+    function _entry_addLiquiditySingleSy(address market, LimitOrderData memory lim) internal view returns (address) {
         return _entry_addLiquiditySingleSy(market, !_isEmptyLimit(lim));
     }
 
@@ -423,4 +430,20 @@ abstract contract ActionBase is TokenHelper, CallbackHelper, IPLimitOrderType {
             }
         }
     }
+
+    function _scaleLimitOrderData(
+        LimitOrderData memory limit,
+        uint256 onchainAmount,
+        uint256 offchainAmount
+    ) private pure {
+        // we can't scale up. If it's equal, skip
+        if (onchainAmount >= offchainAmount) return;
+
+        for (uint256 i = 0; i < limit.normalFills.length; i++) {
+            limit.normalFills[i].makingAmount = (limit.normalFills[i].makingAmount * onchainAmount) / offchainAmount;
+        }
+        for (uint256 i = 0; i < limit.flashFills.length; i++) {
+            limit.flashFills[i].makingAmount = (limit.flashFills[i].makingAmount * onchainAmount) / offchainAmount;
+        }
+    }
 }

package/contracts/router/base/ActionDelegateBase.sol

@@ -120,7 +120,7 @@ contract ActionDelegateBase is ActionBase {
 
     function canUseOnchainApproximation(
         ApproxParams calldata approx,
-        LimitOrderData calldata limit
+        LimitOrderData memory limit
     ) internal pure returns (bool) {
         return approx.guessOffchain == 0 && _isEmptyLimit(limit);
     }

package/deployments/1-core.json

@@ -20,7 +20,7 @@
     "governanceProxy": "0x2aD631F72fB16d91c4953A7f4260A97C2fE2f31e",
     "yieldContractFactory": "0x70ee0A6DB4F5a2Dc4d9c0b57bE97B9987e75BAFD",
     "marketFactory": "0x27b1dAcd74688aF24a64BD3C9C1B143118740784",
-    "router": "0x888888888889758F76e7103c6CbF23ABbF58F946",
+    "router": "0xD0715C2bf65a6EE65876F30BAEEc8d57664DAB26",
     "routerFacets": {
         "ActionAddRemoveLiqV3": "0x07d16A6D334133039A84271d30b7317DCbd1170D",
         "ActionSwapPTV3": "0xC3B17AbC54d6Ef30500630A776392b9aF1c5e0c0",

package/deployments/1-markets/SUSDS-MAINNET-MAR2025-RELAUNCH.json

@@ -0,0 +1,12 @@
+{
+    "name": "SY sUSDS",
+    "SY": "0xBe3d4ec488A0a042BB86F9176C24f8CD54018BA7",
+    "YT": "0xe88580889A3F02a03e27f9b9c65dD43AD685fC8f",
+    "PT": "0x152b8629fee8105248bA3b7ba6afb94f7a468302",
+    "market": "0x21D85Ff3BEDFF031EF466C7d5295240C8AB2a2b8",
+    "expiry": 1743033600,
+    "scalarRoot": "66210056099000000000",
+    "initAnchor": "1028441141000000000",
+    "lnFeeRateRoot": "499875041000000",
+    "reversedFee": 0.04999999993486881
+}

package/deployments/1-markets/USD0++-MAINNET-JUN2025.json

@@ -0,0 +1,14 @@
+{
+    "name": "SY USD0++",
+    "SY": "0x52453825c287dDef62D647ce51C0979D27c461f7",
+    "YT": "0xEAD01319c2aB0dC2C690EfF5DfC5f465Cd38FC87",
+    "PT": "0xf696FE29Ef85E892b5926313897D178288faA07e",
+    "market": "0x048680F64d6DFf1748ba6D9a01F578433787e24B",
+    "expiry": 1750896000,
+    "scalarRoot": "25840344753000000000",
+    "initAnchor": "1094579386000000000",
+    "lnFeeRateRoot": "1998002662000000",
+    "deployTxHash": "0x84d55092d8c0a23fb5ee3801d2ed904685eb2cc289338a58aed49accac686ab9",
+    "deployBlockNumber": 21220847,
+    "reversedFee": 0.19999999993256523
+}

package/deployments/42161-markets/GUSDC-ARBITRUM-JUN2025.json

@@ -0,0 +1,14 @@
+{
+    "name": "SY gUSDC",
+    "SY": "0x0a9eD458E6c283D1E84237e3347333Aa08221d09",
+    "YT": "0xeb044f64aE0dFD5433726fC5418d6643897cbb6B",
+    "PT": "0x0b6121b4c00ca4FbBb6516C11eB4BF61722E0f8d",
+    "market": "0x22e0F26320aCE985e3CB2434095F18Bfe114E28e",
+    "expiry": 1750896000,
+    "scalarRoot": "21136461043000000000",
+    "initAnchor": "1094191809000000000",
+    "lnFeeRateRoot": "1998002662000000",
+    "deployTxHash": "0xab4a74917f0c839df3b13f6eb81e4286f2c3dcbf268ef51be4cf3a85f658c7ac",
+    "deployBlockNumber": 276038148,
+    "reversedFee": 0.19999999993256523
+}

package/deployments/42161-markets/MUXLP-ARBITRUM-JUN2025.json

@@ -0,0 +1,14 @@
+{
+    "name": "SY MUX",
+    "SY": "0x5220E1Ef8CE83Aa9fE0CCE1b8395cD698d04bc7E",
+    "YT": "0xa661223676633a701B3D1E51bd8c47e2Da07C1f6",
+    "PT": "0x9D8eADeb4e7311e340A5EE39DbF62d7694F1aa85",
+    "market": "0xF1De71573Ee482f13AE4DcF980e83bFAba8b233d",
+    "expiry": 1750896000,
+    "scalarRoot": "23175451492000000000",
+    "initAnchor": "1088578948000000000",
+    "lnFeeRateRoot": "1998002662000000",
+    "deployTxHash": "0x3500a5b6f2145e7172c6fe3a814a455b512be2b5822df332b0f4e90b2564168e",
+    "deployBlockNumber": 276038060,
+    "reversedFee": 0.19999999993256523
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@pendle/core-v2",
   "description": "Core smart contracts of Pendle Protocol.",
   "license": "BUSL-1.1",
-  "version": "5.2.0",
+  "version": "5.2.1-beta-1",
   "homepage": "https://pendle.finance",
   "keywords": [
     "pendle",