@pendle/core-v2 1.2.1-testnet → 1.3.0-testnet

package/contracts/interfaces/IStandardizedYield.sol

@@ -146,15 +146,15 @@ interface IStandardizedYield is IERC20Metadata {
 
     function isValidTokenOut(address token) external view returns (bool);
 
-    function previewDeposit(address tokenIn, uint256 amountTokenToDeposit)
-        external
-        view
-        returns (uint256 amountSharesOut);
+    function previewDeposit(
+        address tokenIn,
+        uint256 amountTokenToDeposit
+    ) external view returns (uint256 amountSharesOut);
 
-    function previewRedeem(address tokenOut, uint256 amountSharesToRedeem)
-        external
-        view
-        returns (uint256 amountTokenOut);
+    function previewRedeem(
+        address tokenOut,
+        uint256 amountSharesToRedeem
+    ) external view returns (uint256 amountTokenOut);
 
     /**
      * @notice This function contains information to interpret what the asset is
@@ -165,9 +165,5 @@ interface IStandardizedYield is IERC20Metadata {
     function assetInfo()
         external
         view
-        returns (
-            AssetType assetType,
-            address assetAddress,
-            uint8 assetDecimals
-        );
+        returns (AssetType assetType, address assetAddress, uint8 assetDecimals);
 }

package/contracts/interfaces/IStargateRouter.sol

@@ -23,11 +23,7 @@
 pragma solidity 0.8.17;
 
 interface IStargateRouter {
-    function addLiquidity(
-        uint256 _poolId,
-        uint256 _amountLD,
-        address _to
-    ) external;
+    function addLiquidity(uint256 _poolId, uint256 _amountLD, address _to) external;
 
     function instantRedeemLocal(
         uint16 _srcPoolId,

package/contracts/offchain-helpers/BaseSplitCodeFactoryContract.sol

@@ -17,7 +17,10 @@ contract BaseSplitCodeFactoryContract is BoringOwnableUpgradeable {
         __BoringOwnable_init();
     }
 
-    function deploy(string memory name, bytes calldata creationCode)
+    function deploy(
+        string memory name,
+        bytes calldata creationCode
+    )
         external
         onlyOwner
         returns (

package/contracts/offchain-helpers/BulkSellerOffchain.sol

@@ -9,11 +9,9 @@ contract BulkSellerOffchain {
     using BulkSellerMathCore for BulkSellerState;
     using Math for uint256;
 
-    function calcCurrentRates(IPBulkSeller bulk)
-        external
-        view
-        returns (uint256 rateTokenToSy, uint256 rateSyToToken)
-    {
+    function calcCurrentRates(
+        IPBulkSeller bulk
+    ) external view returns (uint256 rateTokenToSy, uint256 rateSyToToken) {
         BulkSellerState memory state = bulk.readState();
         address SY = bulk.SY();
         address token = bulk.token();
@@ -32,14 +30,12 @@ contract BulkSellerOffchain {
         }
     }
 
-    function getCurrentState(IPBulkSeller bulk)
+    function getCurrentState(
+        IPBulkSeller bulk
+    )
         external
         view
-        returns (
-            BulkSellerState memory state,
-            uint256 tokenProp,
-            uint256 hypoTokenBal
-        )
+        returns (BulkSellerState memory state, uint256 tokenProp, uint256 hypoTokenBal)
     {
         state = bulk.readState();
 

package/contracts/offchain-helpers/Multicall2.sol

@@ -16,10 +16,9 @@ contract Multicall2 {
         bytes returnData;
     }
 
-    function aggregate(Call[] memory calls)
-        public
-        returns (uint256 blockNumber, bytes[] memory returnData)
-    {
+    function aggregate(
+        Call[] memory calls
+    ) public returns (uint256 blockNumber, bytes[] memory returnData) {
         blockNumber = block.number;
         returnData = new bytes[](calls.length);
         for (uint256 i = 0; i < calls.length; i++) {
@@ -29,14 +28,9 @@ contract Multicall2 {
         }
     }
 
-    function blockAndAggregate(Call[] memory calls)
-        public
-        returns (
-            uint256 blockNumber,
-            bytes32 blockHash,
-            Result[] memory returnData
-        )
-    {
+    function blockAndAggregate(
+        Call[] memory calls
+    ) public returns (uint256 blockNumber, bytes32 blockHash, Result[] memory returnData) {
         (blockNumber, blockHash, returnData) = tryBlockAndAggregate(true, calls);
     }
 
@@ -72,10 +66,10 @@ contract Multicall2 {
         blockHash = blockhash(block.number - 1);
     }
 
-    function tryAggregate(bool requireSuccess, Call[] memory calls)
-        public
-        returns (Result[] memory returnData)
-    {
+    function tryAggregate(
+        bool requireSuccess,
+        Call[] memory calls
+    ) public returns (Result[] memory returnData) {
         returnData = new Result[](calls.length);
         for (uint256 i = 0; i < calls.length; i++) {
             (bool success, bytes memory ret) = calls[i].target.call(calls[i].callData);
@@ -88,14 +82,10 @@ contract Multicall2 {
         }
     }
 
-    function tryBlockAndAggregate(bool requireSuccess, Call[] memory calls)
-        public
-        returns (
-            uint256 blockNumber,
-            bytes32 blockHash,
-            Result[] memory returnData
-        )
-    {
+    function tryBlockAndAggregate(
+        bool requireSuccess,
+        Call[] memory calls
+    ) public returns (uint256 blockNumber, bytes32 blockHash, Result[] memory returnData) {
         blockNumber = block.number;
         blockHash = blockhash(block.number);
         returnData = tryAggregate(requireSuccess, calls);

package/contracts/offchain-helpers/router-static/PendleRouterStatic.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts/proxy/Proxy.sol";
 import "../../interfaces/IPRouterStatic.sol";
-import "./StorageLayout.sol";
+import "./base/StorageLayout.sol";
 
 // solhint-disable no-empty-blocks
 contract PendleRouterStatic is Proxy, StorageLayout {

package/contracts/offchain-helpers/router-static/base/ActionInfoStatic.sol

@@ -21,11 +21,9 @@ contract ActionInfoStatic is IPActionInfoStatic {
     }
 
     /// can be SY, PY or Market
-    function getTokensInOut(address token)
-        external
-        view
-        returns (address[] memory tokensIn, address[] memory tokensOut)
-    {
+    function getTokensInOut(
+        address token
+    ) external view returns (address[] memory tokensIn, address[] memory tokensOut) {
         try IStandardizedYield(token).getTokensIn() returns (address[] memory res) {
             return (res, IStandardizedYield(token).getTokensOut());
         } catch {}
@@ -80,10 +78,10 @@ contract ActionInfoStatic is IPActionInfoStatic {
         res.unclaimedRewards = _zipTokenAmounts(rewardTokens, rewardsOut);
     }
 
-    function getUserMarketInfo(address market, address user)
-        external
-        returns (UserMarketInfo memory res)
-    {
+    function getUserMarketInfo(
+        address market,
+        address user
+    ) external returns (UserMarketInfo memory res) {
         IPMarket _market = IPMarket(market);
         MarketState memory state = _market.readState(address(this));
 
@@ -107,11 +105,10 @@ contract ActionInfoStatic is IPActionInfoStatic {
         res.unclaimedRewards = _zipTokenAmounts(rewardTokens, rewardsOut);
     }
 
-    function _zipTokenAmounts(address[] memory tokens, uint256[] memory amounts)
-        internal
-        pure
-        returns (TokenAmount[] memory res)
-    {
+    function _zipTokenAmounts(
+        address[] memory tokens,
+        uint256[] memory amounts
+    ) internal pure returns (TokenAmount[] memory res) {
         res = new TokenAmount[](tokens.length);
 
         for (uint256 i = 0; i < tokens.length; i++) {

package/contracts/offchain-helpers/router-static/base/ActionMarketAuxStatic.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.17;
 
 import "../../../interfaces/IPMarket.sol";
 import "../../../interfaces/IPRouterStatic.sol";
-import "../StorageLayout.sol";
+import "./StorageLayout.sol";
 
 contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
     using MarketMathCore for MarketState;
@@ -13,7 +13,9 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
     using PYIndexLib for PYIndex;
     using PYIndexLib for IPYieldToken;
 
-    function getMarketState(address market)
+    function getMarketState(
+        address market
+    )
         public
         returns (
             address pt,
@@ -35,10 +37,10 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
         marketExchangeRateExcludeFee = getTradeExchangeRateExcludeFee(market, state);
     }
 
-    function getTradeExchangeRateExcludeFee(address market, MarketState memory state)
-        public
-        returns (uint256)
-    {
+    function getTradeExchangeRateExcludeFee(
+        address market,
+        MarketState memory state
+    ) public returns (uint256) {
         if (IPMarket(market).isExpired()) return Math.ONE;
 
         MarketPreCompute memory comp = state.getMarketPreCompute(
@@ -55,10 +57,10 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
         return preFeeExchangeRate.Uint();
     }
 
-    function getTradeExchangeRateIncludeFee(address market, int256 netPtOut)
-        public
-        returns (uint256)
-    {
+    function getTradeExchangeRateIncludeFee(
+        address market,
+        int256 netPtOut
+    ) public returns (uint256) {
         if (IPMarket(market).isExpired()) return Math.ONE;
 
         int256 netPtToAccount = netPtOut;
@@ -86,19 +88,19 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
         }
     }
 
-    function calcPriceImpactPt(address market, int256 netPtOut)
-        public
-        returns (uint256 priceImpact)
-    {
+    function calcPriceImpactPt(
+        address market,
+        int256 netPtOut
+    ) public returns (uint256 priceImpact) {
         uint256 preTradeRate = getTradeExchangeRateIncludeFee(market, _getSign(netPtOut));
         uint256 tradedRate = getTradeExchangeRateIncludeFee(market, netPtOut);
         priceImpact = _calculateImpact(preTradeRate, tradedRate);
     }
 
-    function calcPriceImpactYt(address market, int256 netPtOut)
-        public
-        returns (uint256 priceImpact)
-    {
+    function calcPriceImpactYt(
+        address market,
+        int256 netPtOut
+    ) public returns (uint256 priceImpact) {
         uint256 ytPreTradeRate = _calcVirtualYTPrice(
             getTradeExchangeRateIncludeFee(market, _getSign(netPtOut))
         );
@@ -108,10 +110,10 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
         priceImpact = _calculateImpact(ytPreTradeRate, ytTradedRate);
     }
 
-    function calcPriceImpactPY(address market, int256 netPtOut)
-        public
-        returns (uint256 priceImpact)
-    {
+    function calcPriceImpactPY(
+        address market,
+        int256 netPtOut
+    ) public returns (uint256 priceImpact) {
         uint256 ptPreTradeRate = getTradeExchangeRateIncludeFee(market, _getSign(netPtOut));
         uint256 ytPreTradeRate = _calcVirtualYTPrice(ptPreTradeRate);
         uint256 ptTradeRate = getTradeExchangeRateIncludeFee(market, netPtOut);
@@ -129,11 +131,9 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
         return lnImpliedRate.exp();
     }
 
-    function _calcVirtualYTPrice(uint256 ptAssetExchangeRate)
-        private
-        pure
-        returns (uint256 ytAssetExchangeRate)
-    {
+    function _calcVirtualYTPrice(
+        uint256 ptAssetExchangeRate
+    ) private pure returns (uint256 ytAssetExchangeRate) {
         // 1 asset = EX pt
         // 1 pt = 1/EX Asset
         // 1 yt + 1/EX Asset = 1 Asset
@@ -150,11 +150,10 @@ contract ActionMarketAuxStatic is IPActionMarketAuxStatic {
         return netPtOut > 0 ? int256(1) : int256(-1);
     }
 
-    function _calculateImpact(uint256 rateBefore, uint256 rateTraded)
-        private
-        pure
-        returns (uint256 impact)
-    {
+    function _calculateImpact(
+        uint256 rateBefore,
+        uint256 rateTraded
+    ) private pure returns (uint256 impact) {
         impact = (rateBefore.Int() - rateTraded.Int()).abs().divDown(rateBefore);
     }
 

package/contracts/offchain-helpers/router-static/base/ActionMarketCoreStatic.sol

@@ -3,7 +3,7 @@ pragma solidity 0.8.17;
 
 import "../../../interfaces/IPMarket.sol";
 import "../../../interfaces/IPRouterStatic.sol";
-import "../StorageLayout.sol";
+import "./StorageLayout.sol";
 
 contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     using Math for uint256;
@@ -22,15 +22,7 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         address market,
         uint256 netSyDesired,
         uint256 netPtDesired
-    )
-        public
-        view
-        returns (
-            uint256 netLpOut,
-            uint256 netSyUsed,
-            uint256 netPtUsed
-        )
-    {
+    ) public view returns (uint256 netLpOut, uint256 netSyUsed, uint256 netPtUsed) {
         MarketState memory state = _readState(market);
         (, netLpOut, netSyUsed, netPtUsed) = state.addLiquidity(
             netSyDesired,
@@ -71,7 +63,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     /// @dev netPtToSwap is the parameter to approx
-    function addLiquiditySinglePtStatic(address market, uint256 netPtIn)
+    function addLiquiditySinglePtStatic(
+        address market,
+        uint256 netPtIn
+    )
         public
         returns (
             uint256 netLpOut,
@@ -110,7 +105,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     /// @dev netPtFromSwap is the parameter to approx
-    function addLiquiditySingleSyStatic(address market, uint256 netSyIn)
+    function addLiquiditySingleSyStatic(
+        address market,
+        uint256 netSyIn
+    )
         public
         returns (
             uint256 netLpOut,
@@ -196,7 +194,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         (netLpOut, netYtOut, netSyToPY) = addLiquiditySingleSyKeepYtStatic(market, netSyMinted);
     }
 
-    function addLiquiditySingleSyKeepYtStatic(address market, uint256 netSyIn)
+    function addLiquiditySingleSyKeepYtStatic(
+        address market,
+        uint256 netSyIn
+    )
         public
         returns (
             uint256 netLpOut,
@@ -217,11 +218,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         (, netLpOut, , ) = state.addLiquidity(netSyIn - netSyToPY, netYtOut, block.timestamp);
     }
 
-    function removeLiquidityDualSyAndPtStatic(address market, uint256 netLpToRemove)
-        public
-        view
-        returns (uint256 netSyOut, uint256 netPtOut)
-    {
+    function removeLiquidityDualSyAndPtStatic(
+        address market,
+        uint256 netLpToRemove
+    ) public view returns (uint256 netSyOut, uint256 netPtOut) {
         MarketState memory state = _readState(market);
         (netSyOut, netPtOut) = state.removeLiquidity(netLpToRemove);
     }
@@ -231,22 +231,17 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         uint256 netLpToRemove,
         address tokenOut,
         address bulk
-    )
-        public
-        view
-        returns (
-            uint256 netTokenOut,
-            uint256 netPtOut,
-            uint256 netSyToRedeem
-        )
-    {
+    ) public view returns (uint256 netTokenOut, uint256 netPtOut, uint256 netSyToRedeem) {
         (netSyToRedeem, netPtOut) = removeLiquidityDualSyAndPtStatic(market, netLpToRemove);
         netTokenOut = _redeemSyToTokenStatic(market, tokenOut, netSyToRedeem, bulk);
     }
 
     /// @dev netPtFromSwap is the parameter to approx
     /// @notice should revert post-expiry
-    function removeLiquiditySinglePtStatic(address market, uint256 netLpToRemove)
+    function removeLiquiditySinglePtStatic(
+        address market,
+        uint256 netLpToRemove
+    )
         public
         returns (
             uint256 netPtOut,
@@ -277,7 +272,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
-    function removeLiquiditySingleSyStatic(address market, uint256 netLpToRemove)
+    function removeLiquiditySingleSyStatic(
+        address market,
+        uint256 netLpToRemove
+    )
         public
         returns (
             uint256 netSyOut,
@@ -321,7 +319,6 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         public
         returns (
             uint256 netTokenOut,
-            uint256 netSyToRedeem,
             uint256 netSyFee,
             uint256 priceImpact,
             uint256 exchangeRateAfter,
@@ -342,12 +339,15 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
             netSyFromSwap
         ) = removeLiquiditySingleSyStatic(market, netLpToRemove);
 
-        netTokenOut = _redeemSyToTokenStatic(market, tokenOut, netSyToRedeem, bulk);
+        netTokenOut = _redeemSyToTokenStatic(market, tokenOut, netSyOut, bulk);
     }
 
     // ============ SWAP PT ============
 
-    function swapExactPtForSyStatic(address market, uint256 exactPtIn)
+    function swapExactPtForSyStatic(
+        address market,
+        uint256 exactPtIn
+    )
         public
         returns (
             uint256 netSyOut,
@@ -366,14 +366,12 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
-    function swapSyForExactPtStatic(address market, uint256 exactPtOut)
+    function swapSyForExactPtStatic(
+        address market,
+        uint256 exactPtOut
+    )
         public
-        returns (
-            uint256 netSyIn,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        )
+        returns (uint256 netSyIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter)
     {
         MarketState memory state = _readState(market);
         (netSyIn, netSyFee, ) = state.swapSyForExactPt(
@@ -386,7 +384,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     /// @dev netPtOut is the parameter to approx
-    function swapExactSyForPtStatic(address market, uint256 exactSyIn)
+    function swapExactSyForPtStatic(
+        address market,
+        uint256 exactSyIn
+    )
         public
         returns (
             uint256 netPtOut,
@@ -410,14 +411,12 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     /// @dev netPtIn is the parameter to approx
-    function swapPtForExactSyStatic(address market, uint256 exactSyOut)
+    function swapPtForExactSyStatic(
+        address market,
+        uint256 exactSyOut
+    )
         public
-        returns (
-            uint256 netPtIn,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        )
+        returns (uint256 netPtIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter)
     {
         MarketState memory state = _readState(market);
 
@@ -482,7 +481,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
 
     // ============ SWAP YT ============
 
-    function swapSyForExactYtStatic(address market, uint256 exactYtOut)
+    function swapSyForExactYtStatic(
+        address market,
+        uint256 exactYtOut
+    )
         public
         returns (
             uint256 netSyIn,
@@ -512,7 +514,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     /// @dev netYtOut is the parameter to approx
-    function swapExactSyForYtStatic(address market, uint256 exactSyIn)
+    function swapExactSyForYtStatic(
+        address market,
+        uint256 exactSyIn
+    )
         public
         returns (
             uint256 netYtOut,
@@ -538,7 +543,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         exchangeRateAfter = _getTradeExchangeRateExcludeFee(market, state);
     }
 
-    function swapExactYtForSyStatic(address market, uint256 exactYtIn)
+    function swapExactYtForSyStatic(
+        address market,
+        uint256 exactYtIn
+    )
         public
         returns (
             uint256 netSyOut,
@@ -575,7 +583,6 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
         public
         returns (
             uint256 netTokenOut,
-            uint256 netSyToRedeem,
             uint256 netSyFee,
             uint256 priceImpact,
             uint256 exchangeRateAfter,
@@ -596,18 +603,16 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
             netPYToRedeemSyOutInt
         ) = swapExactYtForSyStatic(market, exactYtIn);
 
-        netTokenOut = _redeemSyToTokenStatic(market, tokenOut, netSyToRedeem, bulk);
+        netTokenOut = _redeemSyToTokenStatic(market, tokenOut, netSyOut, bulk);
     }
 
     /// @dev netYtIn is the parameter to approx
-    function swapYtForExactSyStatic(address market, uint256 exactSyOut)
+    function swapYtForExactSyStatic(
+        address market,
+        uint256 exactSyOut
+    )
         public
-        returns (
-            uint256 netYtIn,
-            uint256 netSyFee,
-            uint256 priceImpact,
-            uint256 exchangeRateAfter
-        )
+        returns (uint256 netYtIn, uint256 netSyFee, uint256 priceImpact, uint256 exchangeRateAfter)
     {
         MarketState memory state = _readState(market);
 
@@ -649,7 +654,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     // totalPtToSwap is the param to approx
-    function swapExactPtForYtStatic(address market, uint256 exactPtIn)
+    function swapExactPtForYtStatic(
+        address market,
+        uint256 exactPtIn
+    )
         public
         returns (
             uint256 netYtOut,
@@ -676,7 +684,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
     }
 
     // totalPtSwapped is the param to approx
-    function swapExactYtForPtStatic(address market, uint256 exactYtIn)
+    function swapExactYtForPtStatic(
+        address market,
+        uint256 exactYtIn
+    )
         public
         returns (
             uint256 netPtOut,
@@ -745,10 +756,10 @@ contract ActionMarketCoreStatic is StorageLayout, IPActionMarketCoreStatic {
             );
     }
 
-    function _getTradeExchangeRateExcludeFee(address market, MarketState memory state)
-        internal
-        returns (uint256)
-    {
+    function _getTradeExchangeRateExcludeFee(
+        address market,
+        MarketState memory state
+    ) internal returns (uint256) {
         return IPRouterStatic(address(this)).getTradeExchangeRateExcludeFee(market, state);
     }