@pendle/core-v2 6.2.2-beta → 6.2.2-sweed

package/build/artifacts/contracts/router/math/MarketApproxLibOnchain.sol/MarketApproxPtInLibOnchain.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/60dc35d3ec0f36307f99aa359ac3d1ac.json"
+  "buildInfo": "../../../../build-info/12eb35b5b348d1105fc3bf7e3a4f3c46.json"
 }

package/build/artifacts/contracts/router/math/MarketApproxLibOnchain.sol/MarketApproxPtInLibOnchain.json

@@ -3,8 +3,8 @@
   "contractName": "MarketApproxPtInLibOnchain",
   "sourceName": "contracts/router/math/MarketApproxLibOnchain.sol",
   "abi": [],
-  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220ffd315b05fd67dae88e8e1f5f555123ebbecc53999ecad8a9c9341fb3bb90d9264736f6c634300081e0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220ffd315b05fd67dae88e8e1f5f555123ebbecc53999ecad8a9c9341fb3bb90d9264736f6c634300081e0033",
+  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220b0868bb4298d8da3aeedd7565fd996be41092fe6c05fb897c23ab162d07c0cde64736f6c634300081e0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220b0868bb4298d8da3aeedd7565fd996be41092fe6c05fb897c23ab162d07c0cde64736f6c634300081e0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/artifacts/contracts/router/math/MarketApproxLibOnchain.sol/MarketApproxPtOutLibOnchain.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/60dc35d3ec0f36307f99aa359ac3d1ac.json"
+  "buildInfo": "../../../../build-info/12eb35b5b348d1105fc3bf7e3a4f3c46.json"
 }

package/build/artifacts/contracts/router/math/MarketApproxLibOnchain.sol/MarketApproxPtOutLibOnchain.json

@@ -3,8 +3,8 @@
   "contractName": "MarketApproxPtOutLibOnchain",
   "sourceName": "contracts/router/math/MarketApproxLibOnchain.sol",
   "abi": [],
-  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea264697066735822122037fa50a1d72752a7bdeefae4255e4f969136a4ae5e0c9786161454ac1ad0aa7864736f6c634300081e0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea264697066735822122037fa50a1d72752a7bdeefae4255e4f969136a4ae5e0c9786161454ac1ad0aa7864736f6c634300081e0033",
+  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220bdac815aee4957526dbaf4139a1d47f754a46f1cdbe4ce2835840b5c365c55ac64736f6c634300081e0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220bdac815aee4957526dbaf4139a1d47f754a46f1cdbe4ce2835840b5c365c55ac64736f6c634300081e0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/artifacts/contracts/router/math/MarketApproxLibV2.sol/MarketApproxPtInLibV2.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/60dc35d3ec0f36307f99aa359ac3d1ac.json"
+  "buildInfo": "../../../../build-info/12eb35b5b348d1105fc3bf7e3a4f3c46.json"
 }

package/build/artifacts/contracts/router/math/MarketApproxLibV2.sol/MarketApproxPtInLibV2.json

@@ -3,8 +3,8 @@
   "contractName": "MarketApproxPtInLibV2",
   "sourceName": "contracts/router/math/MarketApproxLibV2.sol",
   "abi": [],
-  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea26469706673582212205d9c002a9aba32a38aa28bf1782c85f7998a73162fa9a5002c9c2d990ea8e07f64736f6c634300081e0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea26469706673582212205d9c002a9aba32a38aa28bf1782c85f7998a73162fa9a5002c9c2d990ea8e07f64736f6c634300081e0033",
+  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea264697066735822122049cf3d35ceb1875cb2342df2b6c47f396f34930179c3cd7531222018ee36ef5264736f6c634300081e0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea264697066735822122049cf3d35ceb1875cb2342df2b6c47f396f34930179c3cd7531222018ee36ef5264736f6c634300081e0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/artifacts/contracts/router/math/MarketApproxLibV2.sol/MarketApproxPtOutLibV2.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/60dc35d3ec0f36307f99aa359ac3d1ac.json"
+  "buildInfo": "../../../../build-info/12eb35b5b348d1105fc3bf7e3a4f3c46.json"
 }

package/build/artifacts/contracts/router/math/MarketApproxLibV2.sol/MarketApproxPtOutLibV2.json

@@ -3,8 +3,8 @@
   "contractName": "MarketApproxPtOutLibV2",
   "sourceName": "contracts/router/math/MarketApproxLibV2.sol",
   "abi": [],
-  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea26469706673582212201cd9461d84f27bcd4024b3a0137ee6ee586d26a615597922f01d742e071a080864736f6c634300081e0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea26469706673582212201cd9461d84f27bcd4024b3a0137ee6ee586d26a615597922f01d742e071a080864736f6c634300081e0033",
+  "bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220dbc17b419b5e9a7b3c2284d5c2a6be5d088b1930b974ac93eebb0ec433ae1bd564736f6c634300081e0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220dbc17b419b5e9a7b3c2284d5c2a6be5d088b1930b974ac93eebb0ec433ae1bd564736f6c634300081e0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/build/artifacts/contracts/router/swap-aggregator/IPSwapAggregator.sol/IPSwapAggregator.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/f66bca3892b8b601398dc2ff0232dd42.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/OKXScaleHelper.sol/IOKXDexRouter.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/f66bca3892b8b601398dc2ff0232dd42.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/OKXScaleHelper.sol/OKXScaleHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/f66bca3892b8b601398dc2ff0232dd42.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/ParaswapScaleHelper.sol/IAugustusV6.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/f66bca3892b8b601398dc2ff0232dd42.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/ParaswapScaleHelper.sol/ParaswapScaleHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/f66bca3892b8b601398dc2ff0232dd42.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/PendleSwap.sol/IKyberScalingHelper.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/f66bca3892b8b601398dc2ff0232dd42.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/PendleSwap.sol/IOdosRouterV2.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/f66bca3892b8b601398dc2ff0232dd42.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/PendleSwap.sol/PendleSwap.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/3885fcad17d5d083318ce76e68576b1f.json"
+  "buildInfo": "../../../../build-info/f66bca3892b8b601398dc2ff0232dd42.json"
 }

package/contracts/LiquidityMining/GaugeController/PendleGaugeControllerBaseUpg.sol

@@ -43,6 +43,7 @@ abstract contract PendleGaugeControllerBaseUpg is IPGaugeController, BoringOwnab
     IPMarketFactory public immutable marketFactory2;
     IPMarketFactory public immutable marketFactory3;
     IPMarketFactory public immutable marketFactory4;
+    IPMarketFactory public immutable marketFactory5;
 
     mapping(address => MarketRewardData) public rewardData;
     mapping(uint128 => bool) public epochRewardReceived;
@@ -57,7 +58,8 @@ abstract contract PendleGaugeControllerBaseUpg is IPGaugeController, BoringOwnab
             marketFactory.isValidMarket(msg.sender) ||
             marketFactory2.isValidMarket(msg.sender) ||
             marketFactory3.isValidMarket(msg.sender) ||
-            marketFactory4.isValidMarket(msg.sender)
+            marketFactory4.isValidMarket(msg.sender) ||
+            marketFactory5.isValidMarket(msg.sender)
         ) {
             isValidMarket[msg.sender] = true;
             _;
@@ -71,13 +73,15 @@ abstract contract PendleGaugeControllerBaseUpg is IPGaugeController, BoringOwnab
         address _marketFactory,
         address _marketFactory2,
         address _marketFactory3,
-        address _marketFactory4
+        address _marketFactory4,
+        address _marketFactory5
     ) {
         pendle = _pendle;
         marketFactory = IPMarketFactory(_marketFactory);
         marketFactory2 = IPMarketFactory(_marketFactory2);
         marketFactory3 = IPMarketFactory(_marketFactory3);
         marketFactory4 = IPMarketFactory(_marketFactory4);
+        marketFactory5 = IPMarketFactory(_marketFactory5);
     }
 
     /**

package/contracts/LiquidityMining/GaugeController/PendleGaugeControllerMainchainUpg.sol

@@ -18,8 +18,18 @@ contract PendleGaugeControllerMainchainUpg is PendleGaugeControllerBaseUpg, IPGa
         address _marketFactory,
         address _marketFactory2,
         address _marketFactory3,
-        address _marketFactory4
-    ) PendleGaugeControllerBaseUpg(_pendle, _marketFactory, _marketFactory2, _marketFactory3, _marketFactory4) {
+        address _marketFactory4,
+        address _marketFactory5
+    )
+        PendleGaugeControllerBaseUpg(
+            _pendle,
+            _marketFactory,
+            _marketFactory2,
+            _marketFactory3,
+            _marketFactory4,
+            _marketFactory5
+        )
+    {
         votingController = _votingController;
         _disableInitializers();
     }

package/contracts/LiquidityMining/GaugeController/PendleGaugeControllerSidechainUpg.sol

@@ -13,9 +13,17 @@ contract PendleGaugeControllerSidechainUpg is PendleGaugeControllerBaseUpg, Pend
         address _marketFactory2,
         address _marketFactory3,
         address _marketFactory4,
+        address _marketFactory5,
         address _PendleMsgReceiveEndpointUpg
     )
-        PendleGaugeControllerBaseUpg(_pendle, _marketFactory, _marketFactory2, _marketFactory3, _marketFactory4)
+        PendleGaugeControllerBaseUpg(
+            _pendle,
+            _marketFactory,
+            _marketFactory2,
+            _marketFactory3,
+            _marketFactory4,
+            _marketFactory5
+        )
         PendleMsgReceiverAppUpg(_PendleMsgReceiveEndpointUpg)
     {
         _disableInitializers();

package/contracts/LiquidityMining/VotingController/PendleVotingControllerUpg.sol

@@ -167,14 +167,6 @@ contract PendleVotingControllerUpg is PendleMsgSenderAppUpg, VotingControllerSto
      * - `pool` must not have been added before (even if has been removed).
      * - `chainId` must be valid.
      */
-    function addPool(uint64 chainId, address pool) external onlyAddPoolHelperAndOwner {
-        if (_isPoolActive(pool)) revert Errors.VCPoolAlreadyActive(pool);
-        if (allRemovedPools.contains(pool)) revert Errors.VCPoolAlreadyAddAndRemoved(pool);
-
-        _addPool(chainId, pool);
-        emit AddPool(chainId, pool);
-    }
-
     function addMultiPools(uint64[] memory chainIds, address[] memory pools) external onlyAddPoolHelperAndOwner {
         if (chainIds.length != pools.length) revert Errors.ArrayLengthMismatch();
         for (uint256 i = 0; i < chainIds.length; ++i) {
@@ -193,15 +185,19 @@ contract PendleVotingControllerUpg is PendleMsgSenderAppUpg, VotingControllerSto
      * - Previous week's results should have been broadcasted prior to calling this function.
      * - `pool` must be currently active.
      */
-    function removePool(address pool) external onlyRemovePoolHelperAndOwner {
-        if (!_isPoolActive(pool)) revert Errors.VCInactivePool(pool);
 
-        uint64 chainId = poolData[pool].chainId;
+    function removeMultiPools(address[] calldata pools) external onlyRemovePoolHelperAndOwner {
+        for (uint256 i = 0; i < pools.length; ++i) {
+            address pool = pools[i];
+            if (!_isPoolActive(pool)) revert Errors.VCInactivePool(pool);
+
+            uint64 chainId = poolData[pool].chainId;
 
-        applyPoolSlopeChanges(pool);
-        _removePool(pool);
+            applyPoolSlopeChanges(pool);
+            _removePool(pool);
 
-        emit RemovePool(chainId, pool);
+            emit RemovePool(chainId, pool);
+        }
     }
 
     /**

package/contracts/core/Market/PendleGauge.sol

@@ -69,6 +69,8 @@ abstract contract PendleGauge is RewardManager, IPGauge {
 
         totalActiveSupply = totalActiveSupply - activeBalance[user] + newActiveBalance;
         activeBalance[user] = newActiveBalance;
+
+        emit UpdateActiveBalance(user, newActiveBalance);
     }
 
     function _calcVeBoostedLpBalance(address user, uint256 lpBalance) internal virtual returns (uint256) {

package/contracts/core/Market/{v3/PendleMarketFactoryV3.sol → PendleMarketFactoryV6Upg.sol}

@@ -2,17 +2,19 @@
 pragma solidity ^0.8.17;
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
-import "../../../interfaces/IPMarketV3.sol";
-import "../../../interfaces/IPYieldContractFactory.sol";
-import "../../../interfaces/IPMarketFactoryV3.sol";
+import "../../interfaces/IPMarket.sol";
+import "../../interfaces/IPYieldContractFactory.sol";
+import "../../interfaces/IPMarketFactory.sol";
 
-import "../../libraries/BaseSplitCodeFactory.sol";
-import "../../libraries/Errors.sol";
-import "../../libraries/BoringOwnableUpgradeableV2.sol";
+import "../libraries/BaseSplitCodeFactory.sol";
+import "../libraries/Errors.sol";
+import "../libraries/BoringOwnableUpgradeableV2.sol";
 
-contract PendleMarketFactoryV3 is BoringOwnableUpgradeableV2, IPMarketFactoryV3 {
+contract PendleMarketFactoryV6Upg is BoringOwnableUpgradeableV2, IPMarketFactory {
     using EnumerableSet for EnumerableSet.AddressSet;
 
+    uint256 public constant VERSION = 6;
+
     address public immutable marketCreationCodeContractA;
     uint256 public immutable marketCreationCodeSizeA;
     address public immutable marketCreationCodeContractB;
@@ -42,11 +44,9 @@ contract PendleMarketFactoryV3 is BoringOwnableUpgradeableV2, IPMarketFactoryV3
         uint256 _marketCreationCodeSizeA,
         address _marketCreationCodeContractB,
         uint256 _marketCreationCodeSizeB,
-        address _treasury,
-        uint8 _reserveFeePercent,
         address _vePendle,
         address _gaugeController
-    ) initializer {
+    ) {
         yieldContractFactory = _yieldContractFactory;
         maxLnFeeRateRoot = uint256(LogExpMath.ln(int256((105 * PMath.IONE) / 100))); // ln(1.05)
 
@@ -55,11 +55,15 @@ contract PendleMarketFactoryV3 is BoringOwnableUpgradeableV2, IPMarketFactoryV3
         marketCreationCodeContractB = _marketCreationCodeContractB;
         marketCreationCodeSizeB = _marketCreationCodeSizeB;
 
-        __BoringOwnableV2_init(msg.sender);
-        setTreasuryAndFeeReserve(_treasury, _reserveFeePercent);
-
         vePendle = _vePendle;
         gaugeController = _gaugeController;
+
+        _disableInitializers();
+    }
+
+    function initialize(address _owner, address _treasury, uint8 _reserveFeePercent) external initializer {
+        __BoringOwnableV2_init(_owner);
+        setTreasuryAndFeeReserve(_treasury, _reserveFeePercent);
     }
 
     /**
@@ -127,7 +131,7 @@ contract PendleMarketFactoryV3 is BoringOwnableUpgradeableV2, IPMarketFactoryV3
     function setOverriddenFee(address router, address market, uint80 newFee) public onlyOwner {
         if (!allMarkets.contains(market)) revert Errors.MFNotPendleMarket(market);
 
-        uint80 marketFee = IPMarketV3(market).getNonOverrideLnFeeRateRoot();
+        uint80 marketFee = IPMarket(market).getNonOverrideLnFeeRateRoot();
         if (newFee >= marketFee) revert Errors.MarketFactoryOverriddenFeeTooHigh(newFee, marketFee);
 
         // NOTE: newFee = 0 allowed !!

package/contracts/core/Market/{v3/PendleMarketV3.sol → PendleMarketV6.sol}

@@ -1,13 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.17;
 
-import "../../../interfaces/IPMarketV3.sol";
-import "../../../interfaces/IPMarketFactoryV3.sol";
-import "../../../interfaces/IPMarketSwapCallback.sol";
+import "../../interfaces/IPMarket.sol";
+import "../../interfaces/IPMarketFactory.sol";
+import "../../interfaces/IPMarketSwapCallback.sol";
 
-import "../../erc20/PendleERC20.sol";
-import "../PendleGauge.sol";
-import "../OracleLib.sol";
+import "../erc20/PendleERC20.sol";
+import "./PendleGauge.sol";
+import "./OracleLib.sol";
+import "../libraries/StringLib.sol";
 
 /**
 Invariance to maintain:
@@ -15,13 +16,16 @@ Invariance to maintain:
 - address(0) & address(this) should never have any rewards & activeBalance accounting done. This is
     guaranteed by address(0) & address(this) check in each updateForTwo function
 */
-contract PendleMarketV3 is PendleERC20, PendleGauge, IPMarketV3 {
+contract PendleMarketV6 is PendleERC20, PendleGauge, IPMarket {
     using PMath for uint256;
     using PMath for int256;
     using MarketMathCore for MarketState;
     using SafeERC20 for IERC20;
     using PYIndexLib for IPYieldToken;
+    using PYIndexLib for PYIndex;
     using OracleLib for OracleLib.Observation[65535];
+    using StringLib for string;
+    using StringLib for StringLib.slice;
 
     struct MarketStorage {
         int128 totalPt;
@@ -34,8 +38,13 @@ contract PendleMarketV3 is PendleERC20, PendleGauge, IPMarketV3 {
         // 1 SLOT = 144 bits
     }
 
-    string private constant NAME = "Pendle Market";
-    string private constant SYMBOL = "PENDLE-LPT";
+    string private constant PT_NAME_PREF = "PT ";
+    string private constant PT_SYMBOL_PREF = "PT-";
+
+    string private constant LP_NAME_PREF = "PLP ";
+    string private constant LP_SYMBOL_PREF = "PLP-";
+
+    uint256 public constant VERSION = 6;
 
     IPPrincipalToken internal immutable PT;
     IStandardizedYield internal immutable SY;
@@ -64,7 +73,10 @@ contract PendleMarketV3 is PendleERC20, PendleGauge, IPMarketV3 {
         uint80 _lnFeeRateRoot,
         address _vePendle,
         address _gaugeController
-    ) PendleERC20(NAME, SYMBOL, 18) PendleGauge(IPPrincipalToken(_PT).SY(), _vePendle, _gaugeController) {
+    )
+        PendleERC20(_getLPName(_PT), _getLPSymbol(_PT), 18)
+        PendleGauge(IPPrincipalToken(_PT).SY(), _vePendle, _gaugeController)
+    {
         PT = IPPrincipalToken(_PT);
         SY = IStandardizedYield(PT.SY());
         YT = IPYieldToken(PT.YT());
@@ -82,6 +94,14 @@ contract PendleMarketV3 is PendleERC20, PendleGauge, IPMarketV3 {
         factory = msg.sender;
     }
 
+    function _getLPName(address _PT) internal view returns (string memory) {
+        return LP_NAME_PREF.toSlice().concat(IPPrincipalToken(_PT).name().stripPrefixSlice(PT_NAME_PREF));
+    }
+
+    function _getLPSymbol(address _PT) internal view returns (string memory) {
+        return LP_SYMBOL_PREF.toSlice().concat(IPPrincipalToken(_PT).symbol().stripPrefixSlice(PT_SYMBOL_PREF));
+    }
+
     /**
      * @notice PendleMarket allows users to provide in PT & SY in exchange for LPs, which
      * will grant LP holders more exchange fee over time
@@ -164,9 +184,10 @@ contract PendleMarketV3 is PendleERC20, PendleGauge, IPMarketV3 {
         bytes calldata data
     ) external nonReentrant notExpired returns (uint256 netSyOut, uint256 netSyFee) {
         MarketState memory market = readState(msg.sender);
+        PYIndex index = YT.newIndex();
 
         uint256 netSyToReserve;
-        (netSyOut, netSyFee, netSyToReserve) = market.swapExactPtForSy(YT.newIndex(), exactPtIn, block.timestamp);
+        (netSyOut, netSyFee, netSyToReserve) = market.swapExactPtForSy(index, exactPtIn, block.timestamp);
 
         if (receiver != address(this)) IERC20(SY).safeTransfer(receiver, netSyOut);
         IERC20(SY).safeTransfer(market.treasury, netSyToReserve);
@@ -180,6 +201,10 @@ contract PendleMarketV3 is PendleERC20, PendleGauge, IPMarketV3 {
         if (_selfBalance(PT) < market.totalPt.Uint())
             revert Errors.MarketInsufficientPtReceived(_selfBalance(PT), market.totalPt.Uint());
 
+        if (index.syToAsset(netSyFee - netSyToReserve) == 0) {
+            revert Errors.MarketZeroNetLPFee();
+        }
+
         emit Swap(msg.sender, receiver, exactPtIn.neg(), netSyOut.Int(), netSyFee, netSyToReserve);
     }
 
@@ -200,8 +225,10 @@ contract PendleMarketV3 is PendleERC20, PendleGauge, IPMarketV3 {
     ) external nonReentrant notExpired returns (uint256 netSyIn, uint256 netSyFee) {
         MarketState memory market = readState(msg.sender);
 
+        PYIndex index = YT.newIndex();
+
         uint256 netSyToReserve;
-        (netSyIn, netSyFee, netSyToReserve) = market.swapSyForExactPt(YT.newIndex(), exactPtOut, block.timestamp);
+        (netSyIn, netSyFee, netSyToReserve) = market.swapSyForExactPt(index, exactPtOut, block.timestamp);
 
         if (receiver != address(this)) IERC20(PT).safeTransfer(receiver, exactPtOut);
         IERC20(SY).safeTransfer(market.treasury, netSyToReserve);
@@ -216,6 +243,10 @@ contract PendleMarketV3 is PendleERC20, PendleGauge, IPMarketV3 {
         if (_selfBalance(SY) < market.totalSy.Uint())
             revert Errors.MarketInsufficientSyReceived(_selfBalance(SY), market.totalSy.Uint());
 
+        if (index.syToAsset(netSyFee - netSyToReserve) == 0) {
+            revert Errors.MarketZeroNetLPFee();
+        }
+
         emit Swap(msg.sender, receiver, exactPtOut.Int(), netSyIn.neg(), netSyFee, netSyToReserve);
     }
 
@@ -279,7 +310,7 @@ contract PendleMarketV3 is PendleERC20, PendleGauge, IPMarketV3 {
 
         uint80 overriddenFee;
 
-        (market.treasury, overriddenFee, market.reserveFeePercent) = IPMarketFactoryV3(factory).getMarketConfig(
+        (market.treasury, overriddenFee, market.reserveFeePercent) = IPMarketFactory(factory).getMarketConfig(
             address(this),
             router
         );
@@ -332,6 +363,10 @@ contract PendleMarketV3 is PendleERC20, PendleGauge, IPMarketV3 {
         return MiniHelpers.isCurrentlyExpired(expiry);
     }
 
+    function reentrancyGuardEntered() external view override(PendleERC20, IPMarket) returns (bool) {
+        return _reentrancyGuardEntered();
+    }
+
     /*///////////////////////////////////////////////////////////////
                     PENDLE GAUGE - RELATED
     //////////////////////////////////////////////////////////////*/

package/contracts/core/YieldContracts/PendlePrincipalToken.sol

@@ -12,6 +12,8 @@ import "../erc20/PendleERC20.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
 contract PendlePrincipalToken is PendleERC20, Initializable, IPPrincipalToken {
+    uint256 public constant VERSION = 6;
+
     address public immutable SY;
     address public immutable factory;
     uint256 public immutable expiry;
@@ -60,4 +62,8 @@ contract PendlePrincipalToken is PendleERC20, Initializable, IPPrincipalToken {
     function isExpired() public view returns (bool) {
         return MiniHelpers.isCurrentlyExpired(expiry);
     }
+
+    function reentrancyGuardEntered() external view override(PendleERC20, IPPrincipalToken) returns (bool) {
+        return _reentrancyGuardEntered();
+    }
 }

package/contracts/core/YieldContracts/{PendleYieldContractFactory.sol → PendleYieldContractFactoryUpg.sol}

@@ -38,12 +38,13 @@ import "../libraries/StringLib.sol";
 import "./PendlePrincipalToken.sol";
 import "./PendleYieldToken.sol";
 
-/// @dev If this contract is ever made upgradeable, please pay attention to the numContractDeployed variable
-contract PendleYieldContractFactory is BoringOwnableUpgradeableV2, IPYieldContractFactory {
+contract PendleYieldContractFactoryUpg is BoringOwnableUpgradeableV2, IPYieldContractFactory {
     using ExpiryUtils for string;
     using StringLib for string;
     using StringLib for StringLib.slice;
 
+    uint256 public constant VERSION = 6;
+
     string private constant PT_PREFIX = "PT";
     string private constant YT_PREFIX = "YT";
     string private constant SY_SYMBOL_PREF = "SY-";
@@ -82,15 +83,18 @@ contract PendleYieldContractFactory is BoringOwnableUpgradeableV2, IPYieldContra
         ytCreationCodeSizeA = _ytCreationCodeSizeA;
         ytCreationCodeContractB = _ytCreationCodeContractB;
         ytCreationCodeSizeB = _ytCreationCodeSizeB;
+
+        _disableInitializers();
     }
 
     function initialize(
         uint96 _expiryDivisor,
         uint128 _interestFeeRate,
         uint128 _rewardFeeRate,
-        address _treasury
+        address _treasury,
+        address _owner
     ) external initializer {
-        __BoringOwnableV2_init(msg.sender);
+        __BoringOwnableV2_init(_owner);
         setExpiryDivisor(_expiryDivisor);
         setInterestFeeRate(_interestFeeRate);
         setRewardFeeRate(_rewardFeeRate);
@@ -114,8 +118,8 @@ contract PendleYieldContractFactory is BoringOwnableUpgradeableV2, IPYieldContra
 
         (, , uint8 assetDecimals) = _SY.assetInfo();
 
-        string memory syCoreName = _stripSYPrefix(_SY.name());
-        string memory syCoreSymbol = _stripSYPrefix(_SY.symbol());
+        string memory syCoreName = _SY.name().stripPrefix(SY_NAME_PREF);
+        string memory syCoreSymbol = _SY.symbol().stripPrefix(SY_SYMBOL_PREF);
 
         PT = Create2.deploy(
             0,
@@ -189,11 +193,4 @@ contract PendleYieldContractFactory is BoringOwnableUpgradeableV2, IPYieldContra
         treasury = newTreasury;
         emit SetTreasury(newTreasury);
     }
-
-    function _stripSYPrefix(string memory _str) internal pure returns (string memory) {
-        StringLib.slice memory str = _str.toSlice();
-        StringLib.slice memory delim_name = SY_NAME_PREF.toSlice();
-        StringLib.slice memory delim_symbol = SY_SYMBOL_PREF.toSlice();
-        return str.beyond(delim_name).beyond(delim_symbol).toString();
-    }
 }

package/contracts/core/YieldContracts/PendleYieldToken.sol

@@ -35,6 +35,8 @@ contract PendleYieldToken is IPYieldToken, PendleERC20, RewardManagerAbstract, I
         mapping(address => uint256) userRewardOwed;
     }
 
+    uint256 public constant VERSION = 6;
+
     address public immutable SY;
     address public immutable PT;
     address public immutable factory;
@@ -240,6 +242,10 @@ contract PendleYieldToken is IPYieldToken, PendleERC20, RewardManagerAbstract, I
         return _pyIndexStored;
     }
 
+    function reentrancyGuardEntered() external view override(PendleERC20, IPYieldToken) returns (bool) {
+        return _reentrancyGuardEntered();
+    }
+
     /**
      * @notice do a final rewards redeeming, and sets post-expiry data
      * @dev has no effect if called pre-expiry

package/contracts/core/erc20/PendleERC20.sol

@@ -53,6 +53,18 @@ contract PendleERC20 is Context, IERC20, IERC20Metadata {
         _status = _NOT_ENTERED;
     }
 
+    function reentrancyGuardEntered() external view virtual returns (bool) {
+        return _reentrancyGuardEntered();
+    }
+
+    /**
+     * @dev Returns true if the reentrancy guard is currently set to "entered", which indicates there is a
+     * `nonReentrant` function in the call stack.
+     */
+    function _reentrancyGuardEntered() internal view returns (bool) {
+        return _status == _ENTERED;
+    }
+
     /**
      * @dev Sets the values for {name}, {symbol} and {decimals}.
      *

package/contracts/core/libraries/Errors.sol

@@ -30,6 +30,7 @@ library Errors {
     error MarketZeroAmountsInput();
     error MarketZeroAmountsOutput();
     error MarketZeroLnImpliedRate();
+    error MarketZeroNetLPFee();
     error MarketInsufficientPtForTrade(int256 currentAmount, int256 requiredAmount);
     error MarketInsufficientPtReceived(uint256 actualBalance, uint256 requiredBalance);
     error MarketInsufficientSyReceived(uint256 actualBalance, uint256 requiredBalance);
@@ -180,4 +181,10 @@ library Errors {
     // Swap Aggregator
     error SAInsufficientTokenIn(address tokenIn, uint256 amountExpected, uint256 amountActual);
     error UnsupportedSelector(uint256 aggregatorType, bytes4 selector);
+
+    // Cross Chain Oracle App
+    error FeedNotInitialized();
+    error ExchangeRateCallFailed();
+    error InvalidDestinationEid();
+    error InvalidMsgType();
 }

package/contracts/core/libraries/StringLib.sol

@@ -757,4 +757,16 @@ library StringLib {
 
         return ret;
     }
+
+    function stripPrefix(string memory _str, string memory _prefix) internal pure returns (string memory) {
+        slice memory s = toSlice(_str);
+        slice memory d = toSlice(_prefix);
+        return toString(beyond(s, d));
+    }
+
+    function stripPrefixSlice(string memory _str, string memory _delim) internal pure returns (slice memory) {
+        slice memory s = toSlice(_str);
+        slice memory d = toSlice(_delim);
+        return beyond(s, d);
+    }
 }