@pendle/core-v2 5.8.3-factory → 5.8.4-beta

package/contracts/router/swap-aggregator/ParaswapScaleHelper.sol

@@ -0,0 +1,252 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+pragma solidity ^0.8.17;
+
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+
+interface IAugustusV6 {
+    // ============ Generic Swap ============
+    struct GenericData {
+        IERC20 srcToken;
+        IERC20 destToken;
+        uint256 fromAmount;
+        uint256 toAmount;
+        uint256 quotedAmount;
+        bytes32 metadata;
+        address payable beneficiary;
+    }
+
+    function swapExactAmountIn(
+        address executor,
+        GenericData calldata swapData,
+        uint256 partnerAndFee,
+        bytes calldata permit,
+        bytes calldata executorData
+    ) external payable;
+
+    // ============ UniswapV2 Swap ============
+    struct UniswapV2Data {
+        IERC20 srcToken;
+        IERC20 destToken;
+        uint256 fromAmount;
+        uint256 toAmount;
+        uint256 quotedAmount;
+        bytes32 metadata;
+        address payable beneficiary;
+        bytes pools;
+    }
+
+    function swapExactAmountInOnUniswapV2(
+        UniswapV2Data calldata uniData,
+        uint256 partnerAndFee,
+        bytes calldata permit
+    ) external payable returns (uint256 receivedAmount, uint256 paraswapShare, uint256 partnerShare);
+
+    // ============ UniswapV3 Swap ============
+    struct UniswapV3Data {
+        IERC20 srcToken;
+        IERC20 destToken;
+        uint256 fromAmount;
+        uint256 toAmount;
+        uint256 quotedAmount;
+        bytes32 metadata;
+        address payable beneficiary;
+        bytes pools;
+    }
+
+    function swapExactAmountInOnUniswapV3(
+        UniswapV3Data calldata uniData,
+        uint256 partnerAndFee,
+        bytes calldata permit
+    ) external payable returns (uint256 receivedAmount, uint256 paraswapShare, uint256 partnerShare);
+
+    // ============ BalancerV2 Swap ============
+    struct BalancerV2Data {
+        uint256 fromAmount;
+        uint256 toAmount;
+        uint256 quotedAmount;
+        bytes32 metadata;
+        uint256 beneficiaryAndApproveFlag;
+    }
+
+    function swapExactAmountInOnBalancerV2(
+        BalancerV2Data calldata balancerData,
+        uint256 partnerAndFee,
+        bytes calldata permit,
+        bytes calldata data
+    ) external payable returns (uint256 receivedAmount, uint256 paraswapShare, uint256 partnerShare);
+
+    // ============ CurveV1 Swap ============
+    struct CurveV1Data {
+        uint256 curveData;
+        uint256 curveAssets;
+        IERC20 srcToken;
+        IERC20 destToken;
+        uint256 fromAmount;
+        uint256 toAmount;
+        uint256 quotedAmount;
+        bytes32 metadata;
+        address payable beneficiary;
+    }
+
+    function swapExactAmountInOnCurveV1(
+        CurveV1Data calldata curveV1Data,
+        uint256 partnerAndFee,
+        bytes calldata permit
+    ) external payable returns (uint256 receivedAmount, uint256 paraswapShare, uint256 partnerShare);
+
+    // ============ CurveV2 Swap ============
+    struct CurveV2Data {
+        uint256 curveData;
+        uint256 i;
+        uint256 j;
+        address poolAddress;
+        IERC20 srcToken;
+        IERC20 destToken;
+        uint256 fromAmount;
+        uint256 toAmount;
+        uint256 quotedAmount;
+        bytes32 metadata;
+        address payable beneficiary;
+    }
+
+    function swapExactAmountInOnCurveV2(
+        CurveV2Data calldata curveV2Data,
+        uint256 partnerAndFee,
+        bytes calldata permit
+    ) external payable returns (uint256 receivedAmount, uint256 paraswapShare, uint256 partnerShare);
+
+    // ============ MakerPSM Swap ============
+    struct MakerPSMData {
+        IERC20 srcToken;
+        IERC20 destToken;
+        uint256 fromAmount;
+        uint256 toAmount;
+        uint256 toll;
+        uint256 to18ConversionFactor;
+        address exchange;
+        address gemJoinAddress;
+        bytes32 metadata;
+        uint256 beneficiaryDirectionApproveFlag;
+    }
+
+    function swapExactAmountInOutOnMakerPSM(
+        MakerPSMData calldata makerPSMData,
+        bytes calldata permit
+    ) external returns (uint256 spentAmount, uint256 receivedAmount);
+}
+
+contract ParaswapScaleHelper {
+    function _paraswapScaling(
+        bytes calldata rawCallData,
+        uint256 amountIn
+    ) internal pure returns (bytes memory scaledCallData) {
+        bytes4 selector = bytes4(rawCallData[:4]);
+        bytes calldata dataToDecode = rawCallData[4:];
+
+        // Handle Generic Swap
+        if (selector == IAugustusV6.swapExactAmountIn.selector) {
+            (
+                address executor,
+                IAugustusV6.GenericData memory swapData,
+                uint256 partnerAndFee,
+                bytes memory permit,
+                bytes memory executorData
+            ) = abi.decode(dataToDecode, (address, IAugustusV6.GenericData, uint256, bytes, bytes));
+
+            // Direct scaling calculation
+            swapData.toAmount = (swapData.toAmount * amountIn) / swapData.fromAmount;
+            swapData.quotedAmount = (swapData.quotedAmount * amountIn) / swapData.fromAmount;
+            swapData.fromAmount = amountIn;
+
+            return abi.encodeWithSelector(selector, executor, swapData, partnerAndFee, permit, executorData);
+        }
+        // Handle UniswapV2
+        else if (selector == IAugustusV6.swapExactAmountInOnUniswapV2.selector) {
+            (IAugustusV6.UniswapV2Data memory uniData, uint256 partnerAndFee, bytes memory permit) = abi.decode(
+                dataToDecode,
+                (IAugustusV6.UniswapV2Data, uint256, bytes)
+            );
+
+            // Direct scaling calculation
+            uniData.toAmount = (uniData.toAmount * amountIn) / uniData.fromAmount;
+            uniData.quotedAmount = (uniData.quotedAmount * amountIn) / uniData.fromAmount;
+            uniData.fromAmount = amountIn;
+
+            return abi.encodeWithSelector(selector, uniData, partnerAndFee, permit);
+        }
+        // Handle UniswapV3
+        else if (selector == IAugustusV6.swapExactAmountInOnUniswapV3.selector) {
+            (IAugustusV6.UniswapV3Data memory uniV3Data, uint256 partnerAndFee, bytes memory permit) = abi.decode(
+                dataToDecode,
+                (IAugustusV6.UniswapV3Data, uint256, bytes)
+            );
+
+            // Direct scaling calculation
+            uniV3Data.toAmount = (uniV3Data.toAmount * amountIn) / uniV3Data.fromAmount;
+            uniV3Data.quotedAmount = (uniV3Data.quotedAmount * amountIn) / uniV3Data.fromAmount;
+            uniV3Data.fromAmount = amountIn;
+
+            return abi.encodeWithSelector(selector, uniV3Data, partnerAndFee, permit);
+        }
+        // Handle BalancerV2
+        else if (selector == IAugustusV6.swapExactAmountInOnBalancerV2.selector) {
+            (
+                IAugustusV6.BalancerV2Data memory balancerData,
+                uint256 partnerAndFee,
+                bytes memory permit,
+                bytes memory data
+            ) = abi.decode(dataToDecode, (IAugustusV6.BalancerV2Data, uint256, bytes, bytes));
+
+            // Direct scaling calculation
+            balancerData.toAmount = (balancerData.toAmount * amountIn) / balancerData.fromAmount;
+            balancerData.quotedAmount = (balancerData.quotedAmount * amountIn) / balancerData.fromAmount;
+            balancerData.fromAmount = amountIn;
+
+            return abi.encodeWithSelector(selector, balancerData, partnerAndFee, permit, data);
+        }
+        // Handle CurveV1
+        else if (selector == IAugustusV6.swapExactAmountInOnCurveV1.selector) {
+            (IAugustusV6.CurveV1Data memory curveV1Data, uint256 partnerAndFee, bytes memory permit) = abi.decode(
+                dataToDecode,
+                (IAugustusV6.CurveV1Data, uint256, bytes)
+            );
+
+            // Direct scaling calculation
+            curveV1Data.toAmount = (curveV1Data.toAmount * amountIn) / curveV1Data.fromAmount;
+            curveV1Data.quotedAmount = (curveV1Data.quotedAmount * amountIn) / curveV1Data.fromAmount;
+            curveV1Data.fromAmount = amountIn;
+
+            return abi.encodeWithSelector(selector, curveV1Data, partnerAndFee, permit);
+        }
+        // Handle CurveV2
+        else if (selector == IAugustusV6.swapExactAmountInOnCurveV2.selector) {
+            (IAugustusV6.CurveV2Data memory curveV2Data, uint256 partnerAndFee, bytes memory permit) = abi.decode(
+                dataToDecode,
+                (IAugustusV6.CurveV2Data, uint256, bytes)
+            );
+
+            // Direct scaling calculation
+            curveV2Data.toAmount = (curveV2Data.toAmount * amountIn) / curveV2Data.fromAmount;
+            curveV2Data.quotedAmount = (curveV2Data.quotedAmount * amountIn) / curveV2Data.fromAmount;
+            curveV2Data.fromAmount = amountIn;
+
+            return abi.encodeWithSelector(selector, curveV2Data, partnerAndFee, permit);
+        }
+        // Handle MakerPSM
+        else if (selector == IAugustusV6.swapExactAmountInOutOnMakerPSM.selector) {
+            (IAugustusV6.MakerPSMData memory makerPSMData, bytes memory permit) = abi.decode(
+                dataToDecode,
+                (IAugustusV6.MakerPSMData, bytes)
+            );
+
+            // Direct scaling calculation
+            makerPSMData.toAmount = (makerPSMData.toAmount * amountIn) / makerPSMData.fromAmount;
+            makerPSMData.fromAmount = amountIn;
+
+            return abi.encodeWithSelector(selector, makerPSMData, permit);
+        }
+
+        revert("ParaswapScaleHelper: Unsupported swap selector");
+    }
+}

package/contracts/router/swap-aggregator/PendleSwap.sol

@@ -5,14 +5,32 @@ import "../../core/libraries/TokenHelper.sol";
 import "./IPSwapAggregator.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "./OKXScaleHelper.sol";
-import "./OneInchScaleHelper.sol";
-
-contract PendleSwap is IPSwapAggregator, TokenHelper, OKXScaleHelper, OneInchScaleHelper {
+import "./ParaswapScaleHelper.sol";
+
+import "../../core/libraries/BoringOwnableUpgradeable.sol";
+import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
+
+contract PendleSwap is
+    IPSwapAggregator,
+    TokenHelper,
+    OKXScaleHelper,
+    ParaswapScaleHelper,
+    BoringOwnableUpgradeable,
+    UUPSUpgradeable
+{
     using Address for address;
     using SafeERC20 for IERC20;
 
     address private constant KYBER_SCALING_HELPER = 0x2f577A41BeC1BE1152AeEA12e73b7391d15f655D;
 
+    constructor() {
+        _disableInitializers();
+    }
+
+    function initialize() external initializer {
+        __BoringOwnable_init();
+    }
+
     function swap(address tokenIn, uint256 amountIn, SwapData calldata data) external payable {
         _approveForExtRouter(tokenIn, data);
         data.extRouter.functionCallWithValue(
@@ -54,10 +72,10 @@ contract PendleSwap is IPSwapAggregator, TokenHelper, OKXScaleHelper, OneInchSca
             require(isSuccess, "PendleSwap: Kyber scaling failed");
         } else if (swapType == SwapType.ODOS) {
             scaledCallData = _odosScaling(rawCallData, amountIn);
+        } else if (swapType == SwapType.PARASWAP) {
+            scaledCallData = _paraswapScaling(rawCallData, amountIn);
         } else if (swapType == SwapType.OKX) {
             scaledCallData = _okxScaling(rawCallData, amountIn);
-        } else if (swapType == SwapType.ONE_INCH) {
-            scaledCallData = _oneInchScaling(rawCallData, amountIn);
         } else {
             assert(false);
         }
@@ -86,6 +104,8 @@ contract PendleSwap is IPSwapAggregator, TokenHelper, OKXScaleHelper, OneInchSca
     }
 
     receive() external payable {}
+
+    function _authorizeUpgrade(address) internal virtual override onlyOwner {}
 }
 
 interface IKyberScalingHelper {

package/deployments/1-core.json

@@ -32,7 +32,7 @@
         "ActionStorageV4": "0x6a0Ed0A9193FCBe7ae9B0F3D90F88e365Cca64fC"
     },
     "routerStatic": "0x263833d47eA3fA4a30f269323aba6a107f9eB14C",
-    "pendleSwap": "0x313e7Ef7d52f5C10aC04ebaa4d33CDc68634c212",
+    "pendleSwap": "0xFE6228A3866426e96611ED7A3D0Dee918244fcB3",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "yieldContractFactoryV3": "0xdF3601014686674e53d1Fa52F7602525483F9122",
     "marketFactoryV3": "0x1A6fCc85557BC4fB7B534ed835a03EF056552D52",
@@ -44,7 +44,7 @@
     "poolDeployHelperV2": "0xF642d8Daa026B8aEd6dFE82FACbA2E077AF199E2",
     "limitRouter": "0x000000000000c9B3E2C3Ec88B1B4c0cD853f4321",
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
-    "reflector": "0x5039Da22E5126e7c4e9284376116716A91782faF",
+    "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",
     "syFactory": "0x466CeD3b33045Ea986B2f306C8D0aA8067961CF8",
     "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",

package/deployments/10-core.json

@@ -31,7 +31,7 @@
         "ActionStorageV4": "0x6a0Ed0A9193FCBe7ae9B0F3D90F88e365Cca64fC"
     },
     "routerStatic": "0x704478Dd72FD7F9B83d1F1e0fc18C14B54F034d0",
-    "pendleSwap": "0x313e7Ef7d52f5C10aC04ebaa4d33CDc68634c212",
+    "pendleSwap": "0xd4e9B0d466789d7F6201442eecCBA6a75A552db0",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "yieldContractFactoryV3": "0xfa6B22FC4c3Ad88B68c16b3061a16b1714F6Bd57",
     "marketFactoryV3": "0x4A2B38b9cBd83c86F261a4d64c243795D4d44aBC",
@@ -42,7 +42,7 @@
     "poolDeployHelper": "0x439B4d66255eFf74e621FBacb00D7162b588Ff4b",
     "limitRouter": "0x000000000000c9B3E2C3Ec88B1B4c0cD853f4321",
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
-    "reflector": "0x5039Da22E5126e7c4e9284376116716A91782faF",
+    "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
     "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
     "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",

package/deployments/146-core.json

@@ -28,24 +28,23 @@
         "ActionStorageV4": "0xdED51dca2ECED7a0BAab3D9711A87f214769Da0f"
     },
     "routerStatic": "0x0013ACc071f732fd6BF8210AB46A3794a7D8945e",
-    "pendleSwap": "0xd4e9B0d466789d7F6201442eecCBA6a75A552db0",
+    "pendleSwap": "0xFE6228A3866426e96611ED7A3D0Dee918244fcB3",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
+    "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
+    "limitRouter": "0x000000000000c9B3E2C3Ec88B1B4c0cD853f4321",
     "yieldContractFactoryV5": "0x0582D93FD9c9d42f26bE5D86a5f75291F92102C2",
     "marketFactoryV5": "0xFeE31A6eC6eBefa0b5A594Bf5b1139e3c6fAA0fB",
     "poolDeployHelperV2": "0x0b692f06CA82e3075dC537224450885Fd138e655",
-    "limitRouter": "0x000000000000c9B3E2C3Ec88B1B4c0cD853f4321",
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
-    "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
-    "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
-    "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",
     "syFactory": "0x466CeD3b33045Ea986B2f306C8D0aA8067961CF8",
-    "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
-    "beta": {
-        "PendleChainlinkOracleFactory": "0x0000000000000000000000000000000000000000"
-    },
     "receiverEndpoint": "0x3209E9412cca80B18338f2a56ADA59c484c39644",
     "vePendle": "0xE017CCC08505Ac8fbb5a364680e459d9fBaEE74d",
     "gaugeController": "0xeE708FC793a02F1eDd5BB9DBD7fD13010D1F7136",
-    "commonDeployTest": "0x8cbF9190b6EA4BeD4655888273e2A313a77400fD"
+    "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",
+    "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
+    "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
+    "beta": {
+        "PendleChainlinkOracleFactory": "0x0000000000000000000000000000000000000000"
+    }
 }

package/deployments/42161-core.json

@@ -4,7 +4,7 @@
         "chainId": 42161,
         "treasury": "0xCbcb48e22622a3778b6F14C2f5d258Ba026b05e6",
         "governance": "0x7877AdFaDEd756f3248a0EBfe8Ac2E2eF87b75Ac",
-        "devMultisig": "0x3c0f8F070E6400C1C4eD10CfF85dE4c643b66bd3",
+        "devMultisig": "0xE6F0489ED91dc27f40f9dbe8f81fccbFC16b9cb1",
         "pendle": "0x0c880f6761F1af8d9Aa9C466984b80DAb9a8c9e8",
         "lzEndpoint": "0x3c2269811836af69497E5F486A85D7316753cf62",
         "wrappedNative": "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
@@ -31,7 +31,7 @@
         "ActionStorageV4": "0x6a0Ed0A9193FCBe7ae9B0F3D90F88e365Cca64fC"
     },
     "routerStatic": "0xAdB09F65bd90d19e3148D9ccb693F3161C6DB3E8",
-    "pendleSwap": "0x313e7Ef7d52f5C10aC04ebaa4d33CDc68634c212",
+    "pendleSwap": "0xFE6228A3866426e96611ED7A3D0Dee918244fcB3",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "yieldContractFactoryV3": "0xEb38531db128EcA928aea1B1CE9E5609B15ba146",
     "marketFactoryV3": "0x2FCb47B58350cD377f94d3821e7373Df60bD9Ced",
@@ -42,7 +42,7 @@
     "poolDeployHelper": "0xEE2eF4ADaf5Bd61FD107fD169CAe3AB79958B928",
     "limitRouter": "0x000000000000c9B3E2C3Ec88B1B4c0cD853f4321",
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
-    "reflector": "0x5039Da22E5126e7c4e9284376116716A91782faF",
+    "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
     "vePendleAirdropDistributor": "0x3942F7B55094250644cFfDa7160226Caa349A38E",
     "externalRewardsDistributor": "0xae898a7d07f8e27f25e13d0f351a7401f9a5bf9d",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",

package/deployments/5000-core.json

@@ -29,7 +29,7 @@
         "ActionStorageV4": "0x6a0Ed0A9193FCBe7ae9B0F3D90F88e365Cca64fC"
     },
     "routerStatic": "0xCAd502Bb55d1A3F79952F969BFF3f011CF30a94a",
-    "pendleSwap": "0x313e7Ef7d52f5C10aC04ebaa4d33CDc68634c212",
+    "pendleSwap": "0xFE6228A3866426e96611ED7A3D0Dee918244fcB3",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "yieldContractFactoryV3": "0x964840644B88C583500F473E4B829Ab629aF96A8",
     "marketFactoryV3": "0xD228EC1f7D4313fe321fab511A872475D07F5bA6",
@@ -41,7 +41,7 @@
     "poolDeployHelperV2": "0x6E716B682D0b63E7BF2C7b1cD20F2Fc2F3596fc7",
     "limitRouter": "0x000000000000c9B3E2C3Ec88B1B4c0cD853f4321",
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
-    "reflector": "0x5039Da22E5126e7c4e9284376116716A91782faF",
+    "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",
     "syFactory": "0x466CeD3b33045Ea986B2f306C8D0aA8067961CF8",
     "receiverEndpoint": "0xf799E4c029d14f41Dc1918C9A4C67242F565710e",

package/deployments/56-core.json

@@ -31,7 +31,7 @@
         "ActionStorageV4": "0x6a0Ed0A9193FCBe7ae9B0F3D90F88e365Cca64fC"
     },
     "routerStatic": "0x2700ADB035F82a11899ce1D3f1BF8451c296eABb",
-    "pendleSwap": "0x313e7Ef7d52f5C10aC04ebaa4d33CDc68634c212",
+    "pendleSwap": "0xFE6228A3866426e96611ED7A3D0Dee918244fcB3",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "yieldContractFactoryV3": "0x40Ae6da2d92aa3DCb7f8d7a7209FD12BDfcb7C85",
     "marketFactoryV3": "0xC40fEbF5A33b8C92B187d9be0fD3fe0ac2E4B07c",
@@ -42,7 +42,7 @@
     "poolDeployHelper": "0xF536323e5825dCb1Bc9b4DE74D63111189532b5f",
     "limitRouter": "0x000000000000c9B3E2C3Ec88B1B4c0cD853f4321",
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
-    "reflector": "0x5039Da22E5126e7c4e9284376116716A91782faF",
+    "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",
     "syFactory": "0x466CeD3b33045Ea986B2f306C8D0aA8067961CF8",
     "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",

package/deployments/80094-core.json

@@ -28,14 +28,14 @@
         "ActionStorageV4": "0xdED51dca2ECED7a0BAab3D9711A87f214769Da0f"
     },
     "routerStatic": "0x6813d43782395A1F2AAb42f39aeEDE03ac655e09",
-    "pendleSwap": "0x313e7Ef7d52f5C10aC04ebaa4d33CDc68634c212",
+    "pendleSwap": "0xFE6228A3866426e96611ED7A3D0Dee918244fcB3",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "yieldContractFactoryV5": "0x2bEa6BfD8fbFF45aA2a893EB3B6d85D10EFcC70E",
     "marketFactoryV5": "0x8A09574b0401A856d89d1b583eE22E8cb0C5530B",
     "poolDeployHelperV2": "0x96F77F24b3d17166FcaF3a9E3B8330fF38B966F9",
     "limitRouter": "0x000000000000c9B3E2C3Ec88B1B4c0cD853f4321",
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
-    "reflector": "0xFAa7aD6258b1aa40F2cC414E49033dc77183ba76",
+    "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",
     "syFactory": "0x466CeD3b33045Ea986B2f306C8D0aA8067961CF8",
     "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",

package/deployments/8453-core.json

@@ -28,14 +28,14 @@
         "ActionStorageV4": "0x6a0Ed0A9193FCBe7ae9B0F3D90F88e365Cca64fC"
     },
     "routerStatic": "0xB4205a645c7e920BD8504181B1D7f2c5C955C3e7",
-    "pendleSwap": "0x313e7Ef7d52f5C10aC04ebaa4d33CDc68634c212",
+    "pendleSwap": "0xFE6228A3866426e96611ED7A3D0Dee918244fcB3",
     "pyYtLpOracle": "0x9a9fa8338dd5e5b2188006f1cd2ef26d921650c2",
     "yieldContractFactoryV5": "0x963ddBB35c1AE44e2a159E3b5fb5177E0B32660d",
     "marketFactoryV5": "0x59968008a703dC13E6beaECed644bdCe4ee45d13",
     "poolDeployHelper": "0x8D77771fA2518474cc83a613ef3d6140A84dbe56",
     "limitRouter": "0x000000000000c9B3E2C3Ec88B1B4c0cD853f4321",
     "proxyAdmin": "0xA28c08f165116587D4F3E708743B4dEe155c5E64",
-    "reflector": "0x5039Da22E5126e7c4e9284376116716A91782faF",
+    "reflector": "0x73d5DBF81A4f3bFa7b335e6a2d4638D6017a4fA8",
     "commonDeploy": "0x2Ed473F528E5B320f850d17ADfe0e558f0298aA9",
     "syFactory": "0x466CeD3b33045Ea986B2f306C8D0aA8067961CF8",
     "sparkLinearDiscountOracleFactory": "0x34C91651A070664279866E5f3d6B4d5F65cbbFFb",

package/package.json

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

package/typechain-types/PendleCommonSYFactory.ts

@@ -50,6 +50,7 @@ export interface PendleCommonSYFactoryInterface extends utils.Interface {
     "creationCodes(bytes32)": FunctionFragment;
     "deploySY(bytes32,bytes,address)": FunctionFragment;
     "deployUpgradableSY(bytes32,bytes,bytes,address)": FunctionFragment;
+    "implementations(bytes32)": FunctionFragment;
     "initialize(address)": FunctionFragment;
     "nonce()": FunctionFragment;
     "owner()": FunctionFragment;
@@ -75,6 +76,10 @@ export interface PendleCommonSYFactoryInterface extends utils.Interface {
     functionFragment: "deployUpgradableSY",
     values: [BytesLike, BytesLike, BytesLike, string]
   ): string;
+  encodeFunctionData(
+    functionFragment: "implementations",
+    values: [BytesLike]
+  ): string;
   encodeFunctionData(functionFragment: "initialize", values: [string]): string;
   encodeFunctionData(functionFragment: "nonce", values?: undefined): string;
   encodeFunctionData(functionFragment: "owner", values?: undefined): string;
@@ -108,6 +113,10 @@ export interface PendleCommonSYFactoryInterface extends utils.Interface {
     functionFragment: "deployUpgradableSY",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "implementations",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "nonce", data: BytesLike): Result;
   decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
@@ -224,6 +233,11 @@ export interface PendleCommonSYFactory extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<ContractTransaction>;
 
+    implementations(
+      arg0: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<[string]>;
+
     initialize(
       _owner: string,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -282,6 +296,8 @@ export interface PendleCommonSYFactory extends BaseContract {
     overrides?: Overrides & { from?: string | Promise<string> }
   ): Promise<ContractTransaction>;
 
+  implementations(arg0: BytesLike, overrides?: CallOverrides): Promise<string>;
+
   initialize(
     _owner: string,
     overrides?: Overrides & { from?: string | Promise<string> }
@@ -338,6 +354,11 @@ export interface PendleCommonSYFactory extends BaseContract {
       overrides?: CallOverrides
     ): Promise<string>;
 
+    implementations(
+      arg0: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<string>;
+
     initialize(_owner: string, overrides?: CallOverrides): Promise<void>;
 
     nonce(overrides?: CallOverrides): Promise<BigNumber>;
@@ -418,6 +439,11 @@ export interface PendleCommonSYFactory extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<BigNumber>;
 
+    implementations(
+      arg0: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<BigNumber>;
+
     initialize(
       _owner: string,
       overrides?: Overrides & { from?: string | Promise<string> }
@@ -470,6 +496,11 @@ export interface PendleCommonSYFactory extends BaseContract {
       overrides?: Overrides & { from?: string | Promise<string> }
     ): Promise<PopulatedTransaction>;
 
+    implementations(
+      arg0: BytesLike,
+      overrides?: CallOverrides
+    ): Promise<PopulatedTransaction>;
+
     initialize(
       _owner: string,
       overrides?: Overrides & { from?: string | Promise<string> }