@pendle/core-v2 2.22.0 → 2.22.1

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/IExecutorHelper.sol/IExecutorHelper.json

@@ -5,11 +5,6 @@
   "abi": [
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -17,11 +12,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executeBalV2Swap",
+      "name": "executeBalV2",
       "outputs": [
         {
           "internalType": "uint256",
@@ -34,11 +29,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -46,11 +36,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executeCamelotSwap",
+      "name": "executeCamelot",
       "outputs": [
         {
           "internalType": "uint256",
@@ -63,11 +53,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -75,11 +60,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executeCurveSwap",
+      "name": "executeCurve",
       "outputs": [
         {
           "internalType": "uint256",
@@ -92,11 +77,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -104,11 +84,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executeDODOSwap",
+      "name": "executeDODO",
       "outputs": [
         {
           "internalType": "uint256",
@@ -121,11 +101,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -133,11 +108,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executeFraxSwap",
+      "name": "executeFrax",
       "outputs": [
         {
           "internalType": "uint256",
@@ -150,11 +125,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -162,11 +132,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executeGMXSwap",
+      "name": "executeGMX",
       "outputs": [
         {
           "internalType": "uint256",
@@ -179,11 +149,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -191,11 +156,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executeHashflowSwap",
+      "name": "executeHashflow",
       "outputs": [
         {
           "internalType": "uint256",
@@ -208,11 +173,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -220,11 +180,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executeKyberDMMSwap",
+      "name": "executeKSClassic",
       "outputs": [
         {
           "internalType": "uint256",
@@ -237,11 +197,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -249,7 +204,7 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
@@ -266,11 +221,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -278,11 +228,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executePSMSwap",
+      "name": "executeMaverick",
       "outputs": [
         {
           "internalType": "uint256",
@@ -295,11 +245,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -307,11 +252,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executePlatypusSwap",
+      "name": "executePSM",
       "outputs": [
         {
           "internalType": "uint256",
@@ -324,11 +269,30 @@
     },
     {
       "inputs": [
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        },
         {
           "internalType": "uint256",
-          "name": "index",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
-        },
+        }
+      ],
+      "name": "executePlatypus",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "payable",
+      "type": "function"
+    },
+    {
+      "inputs": [
         {
           "internalType": "bytes",
           "name": "data",
@@ -336,11 +300,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executeRfqSwap",
+      "name": "executeRfq",
       "outputs": [
         {
           "internalType": "uint256",
@@ -353,11 +317,30 @@
     },
     {
       "inputs": [
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        },
         {
           "internalType": "uint256",
-          "name": "index",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
-        },
+        }
+      ],
+      "name": "executeStEth",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "payable",
+      "type": "function"
+    },
+    {
+      "inputs": [
         {
           "internalType": "bytes",
           "name": "data",
@@ -365,7 +348,7 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
@@ -382,11 +365,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -394,11 +372,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executeSynthetixSwap",
+      "name": "executeSynthetix",
       "outputs": [
         {
           "internalType": "uint256",
@@ -411,11 +389,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -423,11 +396,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executeUniSwap",
+      "name": "executeUniV3KSElastic",
       "outputs": [
         {
           "internalType": "uint256",
@@ -440,11 +413,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -452,11 +420,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executeUniV3ProMMSwap",
+      "name": "executeUniswap",
       "outputs": [
         {
           "internalType": "uint256",
@@ -469,11 +437,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -481,11 +444,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executeVelodromeSwap",
+      "name": "executeVelodrome",
       "outputs": [
         {
           "internalType": "uint256",
@@ -498,11 +461,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "index",
-          "type": "uint256"
-        },
         {
           "internalType": "bytes",
           "name": "data",
@@ -510,11 +468,11 @@
         },
         {
           "internalType": "uint256",
-          "name": "previousAmountOut",
+          "name": "flagsAndPrevAmountOut",
           "type": "uint256"
         }
       ],
-      "name": "executeWrappedstETHSwap",
+      "name": "executeWrappedstETH",
       "outputs": [
         {
           "internalType": "uint256",

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/594ca8730c6d9878319615f9b9938cd2.json"
+  "buildInfo": "../../../../../build-info/dcbed5fed64e93b93634433a5cec9a09.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/594ca8730c6d9878319615f9b9938cd2.json"
+  "buildInfo": "../../../../../build-info/dcbed5fed64e93b93634433a5cec9a09.json"
 }

package/build/artifacts/contracts/router/swap-aggregator/kyberswap/ScalingDataLib.sol/ScalingDataLib.json

@@ -3,8 +3,8 @@
   "contractName": "ScalingDataLib",
   "sourceName": "contracts/router/swap-aggregator/kyberswap/ScalingDataLib.sol",
   "abi": [],
-  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220cfba1793d0bf2005e9ec0047b2572c3062305c74344dcf37d39ad9fc7600e96b64736f6c63430008110033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea2646970667358221220cfba1793d0bf2005e9ec0047b2572c3062305c74344dcf37d39ad9fc7600e96b64736f6c63430008110033",
+  "bytecode": "0x60566037600b82828239805160001a607314602a57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212203f5b8e7755d6600a60d4536d4ab8981573bb3aa21de1e490fe4057922f61db1264736f6c63430008110033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600080fdfea26469706673582212203f5b8e7755d6600a60d4536d4ab8981573bb3aa21de1e490fe4057922f61db1264736f6c63430008110033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/contracts/core/StandardizedYield/implementations/Swell/PendleSwETH.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.17;
 import "../../SYBase.sol";
 import "../../../../interfaces/ISwETH.sol";
 
-contract PendleSwETH is SYBase {
+contract SwETHSY is SYBase {
     using Math for uint256;
 
     address public immutable swETH;
@@ -34,10 +34,6 @@ contract PendleSwETH is SYBase {
         }
     }
 
-    /**
-     * Withdrawal to sfrxETH and frxETH is done normally as other ERC4626.
-     * Withdrawal to ETH is on the other hand not possible
-     */
     function _redeem(
         address receiver,
         address /*tokenOut*/,
@@ -51,10 +47,6 @@ contract PendleSwETH is SYBase {
                                EXCHANGE-RATE
     //////////////////////////////////////////////////////////////*/
 
-    /**
-     * @notice Calculates and updates the exchange rate of shares to underlying asset token
-     * @dev It is the exchange rate of sfrxETH to frxETH
-     */
     function exchangeRate() public view virtual override returns (uint256) {
         return ISwETH(swETH).getRate();
     }

package/contracts/oracles/PendleLpOracleLib.sol

@@ -3,34 +3,42 @@ pragma solidity 0.8.17;
 
 import "./PendlePtOracleLib.sol";
 
-// Reference: https://file.notion.so/f/s/15d1406b-0d81-41a4-8ac3-9b56e30fdf50/LP_Oracle_Doc.pdf?id=201fc56f-959b-4836-9511-73852e166816&table=block&spaceId=33abd05a-56a2-4ce6-8673-929c5984a0fd&expirationTimestamp=1683863581610&signature=IY3jlxvXkWRJZhsccYpQdQaKlm1_NUIb1ypDmuaR7hI&downloadName=LP_Oracle_Doc.pdf
-
 library PendleLpOracleLib {
     using PendlePtOracleLib for IPMarket;
-    using PYIndexLib for PYIndex;
     using Math for uint256;
     using Math for int256;
     using MarketMathCore for MarketState;
 
     /**
-     * This function returns the approximated twap rate LP/Asset on market
+      * This function returns the approximated twap rate LP/asset on market, but take into account the current rate of SY
+     This is to account for special cases where underlying asset becomes insolvent and has decreasing exchangeRate
      * @param market market to get rate from
      * @param duration twap duration
-     *
      */
-    function getLpToAssetRate(
+    function getLpToAssetRate(IPMarket market, uint32 duration) internal view returns (uint256) {
+        (uint256 syIndex, uint256 pyIndex) = PendlePtOracleLib.getSYandPYIndexCurrent(market);
+        uint256 lpToAssetRateRaw = _getLpToAssetRateRaw(market, duration, pyIndex);
+        return (lpToAssetRateRaw * syIndex) / pyIndex;
+    }
+
+    function _getLpToAssetRateRaw(
         IPMarket market,
-        uint32 duration
-    ) internal view returns (uint256 lpToAssetRate) {
+        uint32 duration,
+        uint256 pyIndex
+    ) private view returns (uint256 lpToAssetRateRaw) {
         MarketState memory state = market.readState(address(0));
-        MarketPreCompute memory comp = _getMarketPreCompute(market, state);
+
+        MarketPreCompute memory comp = state.getMarketPreCompute(
+            PYIndex.wrap(pyIndex),
+            block.timestamp
+        );
 
         int256 totalHypotheticalAsset;
         if (state.expiry <= block.timestamp) {
             // 1 PT = 1 Asset post-expiry
             totalHypotheticalAsset = state.totalPt + comp.totalAsset;
         } else {
-            (int256 rateOracle, int256 rateHypTrade) = _getPtRates(market, state, duration);
+            (int256 rateOracle, int256 rateHypTrade) = _getPtRatesRaw(market, state, duration);
             int256 cParam = LogExpMath.exp(
                 comp.rateScalar.mulDown((rateOracle - comp.rateAnchor))
             );
@@ -45,46 +53,19 @@ library PendleLpOracleLib {
                 (state.totalPt + tradeSize).divDown(rateOracle);
         }
 
-        lpToAssetRate = _calcLpPrice(totalHypotheticalAsset, state.totalLp).Uint();
+        lpToAssetRateRaw = totalHypotheticalAsset.divDown(state.totalLp).Uint();
     }
 
-    function _getMarketPreCompute(
-        IPMarket market,
-        MarketState memory state
-    ) private view returns (MarketPreCompute memory) {
-        return state.getMarketPreCompute(_getPYIndexCurrent(market), block.timestamp);
-    }
-
-    function _getPYIndexCurrent(IPMarket market) private view returns (PYIndex) {
-        (IStandardizedYield SY, , IPYieldToken YT) = market.readTokens();
-        uint256 ytIndex = YT.pyIndexStored();
-        uint256 pyIndexCurrent;
-        if (YT.doCacheIndexSameBlock() && YT.pyIndexLastUpdatedBlock() == block.number) {
-            pyIndexCurrent = ytIndex;
-        } else {
-            uint256 syIndex = SY.exchangeRate();
-            pyIndexCurrent = Math.max(syIndex, ytIndex);
-        }
-        return PYIndex.wrap(pyIndexCurrent);
-    }
-
-    function _getPtRates(
+    function _getPtRatesRaw(
         IPMarket market,
         MarketState memory state,
         uint32 duration
     ) private view returns (int256 rateOracle, int256 rateHypTrade) {
-        rateOracle = Math.IONE.divDown(market.getPtToAssetRate(duration).Int());
+        rateOracle = Math.IONE.divDown(market.getPtToAssetRateRaw(duration).Int());
         int256 rateLastTrade = MarketMathCore._getExchangeRateFromImpliedRate(
             state.lastLnImpliedRate,
             state.expiry - block.timestamp
         );
         rateHypTrade = (rateLastTrade + rateOracle) / 2;
     }
-
-    function _calcLpPrice(
-        int256 totalHypotheticalAsset,
-        int256 totalLp
-    ) private pure returns (int256) {
-        return totalHypotheticalAsset.divDown(totalLp);
-    }
 }