@pendle/core-v2 0.12.2-testnet → 0.13.1-testnet

package/contracts/interfaces/ISJoe.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

package/contracts/interfaces/IStETH.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 interface IStETH {
     function getSharesByPooledEth(uint256 _ethAmount) external view returns (uint256);

package/contracts/interfaces/IStargateLPStaking.sol

@@ -20,7 +20,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 interface IStargateLPStaking {
     struct PoolInfo {

package/contracts/interfaces/IStargatePool.sol

@@ -20,7 +20,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 interface IStargatePool {
     struct SwapObj {

package/contracts/interfaces/IStargateRouter.sol

@@ -20,7 +20,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 interface IStargateRouter {
     function addLiquidity(

package/contracts/interfaces/ISuperComposableYield.sol

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
 
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 interface ISuperComposableYield is IERC20Metadata {

package/contracts/interfaces/IWAvax.sol

@@ -20,7 +20,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

package/contracts/interfaces/IWETH.sol

@@ -20,7 +20,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

package/contracts/interfaces/IWXBTRFLY.sol

@@ -20,7 +20,7 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 interface IWXBTRFLY {
     function wrapFromBTRFLY(uint256 _amount) external returns (uint256);

package/contracts/interfaces/IWstETH.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 interface IWstETH {
     function wrap(uint256 _stETHAmount) external returns (uint256);

package/contracts/interfaces/IYearnVault.sol

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  */
 
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 interface IYearnVault {
     function deposit(uint256 amount) external returns (uint256);

package/contracts/offchain-helpers/BaseSplitCodeFactoryContract.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
-import "../libraries/helpers/BaseSplitCodeFactory.sol";
-import "../periphery/BoringOwnableUpgradeable.sol";
+pragma solidity 0.8.17;
+
+import "../core/libraries/BoringOwnableUpgradeable.sol";
+import "../core/libraries/BaseSplitCodeFactory.sol";
 
 contract BaseSplitCodeFactoryContract is BoringOwnableUpgradeable {
     event Deployed(

package/contracts/offchain-helpers/ImplicitSwapfeeContract.sol

@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.17;
+
+import "../interfaces/IPMarket.sol";
+
+contract ImplicitSwapfeeContract {
+    using MarketMathCore for MarketState;
+
+    int256 public constant K = 100;
+    
+    constructor() {}
+
+    function execute(
+        address market,
+        MarketState calldata prevState,
+        int256 netPtToAccount
+    ) external view returns (int256 netScyToAccount) {
+        (,, IPYieldToken YT) = IPMarket(market).readTokens();
+        PYIndex index = PYIndex.wrap(YT.pyIndexStored());
+
+        for(int256 i = 0; i < K; ++i) {
+            (int256 scyToAccount, ) = prevState.executeTradeCore(index, netPtToAccount / K, block.timestamp);
+            netScyToAccount += scyToAccount;
+        }
+    }
+}

package/contracts/offchain-helpers/MarketMathStatic.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
-import "../libraries/math/MarketApproxLib.sol";
+import "../router/base/MarketApproxLib.sol";
 import "../interfaces/IPMarket.sol";
 
 library MarketMathStatic {
@@ -209,7 +209,7 @@ library MarketMathStatic {
         MarketState memory state = IPMarket(market).readState();
 
         (uint256 scyFromBurn, uint256 ptFromBurn) = state.removeLiquidity(netLpToRemove);
-        (netPtFromSwap, , netScyFee) = state.approxSwapExactScyForPt(
+        (netPtFromSwap, netScyFee) = state.approxSwapExactScyForPt(
             pyIndex(market),
             scyFromBurn,
             block.timestamp,
@@ -317,7 +317,7 @@ library MarketMathStatic {
         )
     {
         MarketState memory state = IPMarket(market).readState();
-        (netPtOut, , netScyFee) = state.approxSwapExactScyForPt(
+        (netPtOut, netScyFee) = state.approxSwapExactScyForPt(
             pyIndex(market),
             exactScyIn,
             block.timestamp,
@@ -434,7 +434,7 @@ library MarketMathStatic {
         MarketState memory state = IPMarket(market).readState();
         PYIndex index = pyIndex(market);
 
-        (netYtOut, , netScyFee) = state.approxSwapExactScyForYt(
+        (netYtOut, netScyFee) = state.approxSwapExactScyForYt(
             index,
             exactScyIn,
             block.timestamp,
@@ -552,7 +552,7 @@ library MarketMathStatic {
         MarketState memory state = IPMarket(market).readState();
         PYIndex index = pyIndex(market);
 
-        (netYtOut, , totalPtToSwap, netScyFee) = state.approxSwapExactPtForYt(
+        (netYtOut, totalPtToSwap, netScyFee) = state.approxSwapExactPtForYt(
             index,
             exactPtIn,
             block.timestamp,
@@ -578,7 +578,7 @@ library MarketMathStatic {
         MarketState memory state = IPMarket(market).readState();
         PYIndex index = pyIndex(market);
 
-        (netPtOut, , totalPtSwapped, netScyFee) = state.approxSwapExactYtForPt(
+        (netPtOut, totalPtSwapped, netScyFee) = state.approxSwapExactYtForPt(
             index,
             exactYtIn,
             block.timestamp,

package/contracts/offchain-helpers/RouterStatic.sol

@@ -1,16 +1,17 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 import "../interfaces/IPYieldContractFactory.sol";
 import "../interfaces/IPMarketFactory.sol";
 import "../interfaces/IPVotingEscrowMainchain.sol";
-import "../periphery/BoringOwnableUpgradeable.sol";
+
 import "./MarketMathStatic.sol";
+
+import "../core/libraries/BoringOwnableUpgradeable.sol";
+import "../LiquidityMining/libraries/VeBalanceLib.sol";
+
 import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
-import "../periphery/BoringOwnableUpgradeable.sol";
-import "../libraries/math/WeekMath.sol";
-import "../libraries/Errors.sol";
 
 /// EXCLUDED FROM ALL AUDITS, TO BE CALLED ONLY BY PENDLE's SDK
 contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeable {
@@ -19,7 +20,7 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
     using VeBalanceLib for LockedPosition;
 
     uint128 public constant MAX_LOCK_TIME = 104 weeks;
-    uint128 public constant MIN_LOCK_TIME = 1 days;
+    uint128 public constant MIN_LOCK_TIME = 1 weeks;
 
     struct TokenAmount {
         address token;
@@ -354,14 +355,6 @@ contract RouterStatic is Initializable, BoringOwnableUpgradeable, UUPSUpgradeabl
             );
     }
 
-    function removeLiquidityDualScyAndPt(address market, uint256 netLpToRemove)
-        external
-        view
-        returns (uint256 netScyOut, uint256 netPtOut)
-    {
-        return MarketMathStatic.removeLiquidityDualScyAndPtStatic(market, netLpToRemove);
-    }
-
     function removeLiquidityDualScyAndPtStatic(address market, uint256 netLpToRemove)
         external
         view

package/contracts/{core/actions → router}/ActionAddRemoveLiq.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 import "./base/ActionBaseMintRedeem.sol";
-import "../../interfaces/IPActionAddRemoveLiq.sol";
-import "../../interfaces/IPMarket.sol";
-import "../../libraries/Errors.sol";
+import "../interfaces/IPActionAddRemoveLiq.sol";
+import "../interfaces/IPMarket.sol";
+import "../core/libraries/Errors.sol";
 
 contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
     using Math for uint256;
@@ -280,7 +280,7 @@ contract ActionAddRemoveLiq is IPActionAddRemoveLiq, ActionBaseMintRedeem {
 
         MarketState memory state = IPMarket(market).readState();
         (uint256 scyFromBurn, uint256 ptFromBurn) = state.removeLiquidity(netLpToRemove);
-        (uint256 ptFromSwap, , ) = state.approxSwapExactScyForPt(
+        (uint256 ptFromSwap, ) = state.approxSwapExactScyForPt(
             YT.newIndex(),
             scyFromBurn,
             block.timestamp,

package/contracts/{core/actions → router}/ActionCallback.sol

@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
-import "../../interfaces/IPMarketFactory.sol";
-import "../../interfaces/IPMarket.sol";
-import "../../interfaces/IPMarketSwapCallback.sol";
-import "../../libraries/SCY/SCYUtils.sol";
-import "../../libraries/math/MarketApproxLib.sol";
-import "../../libraries/Errors.sol";
+import "../interfaces/IPMarketFactory.sol";
+import "../interfaces/IPMarket.sol";
+import "../interfaces/IPMarketSwapCallback.sol";
+import "../core/libraries/Errors.sol";
 
+import "./base/MarketApproxLib.sol";
 import "./base/ActionBaseMintRedeem.sol";
 import "./base/CallbackHelper.sol";
+
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 contract ActionCallback is IPMarketSwapCallback, CallbackHelper {

package/contracts/{core/actions → router}/ActionMintRedeem.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 import "./base/ActionBaseMintRedeem.sol";
-import "../../interfaces/IPMarket.sol";
-import "../../interfaces/IPActionMintRedeem.sol";
-import "../../libraries/Errors.sol";
+import "../interfaces/IPMarket.sol";
+import "../interfaces/IPActionMintRedeem.sol";
+import "../core/libraries/Errors.sol";
 
 contract ActionMintRedeem is IPActionMintRedeem, ActionBaseMintRedeem {
     using MarketMathCore for MarketState;

package/contracts/{core/actions → router}/ActionMisc.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
-import "../../interfaces/IPMarket.sol";
-import "../../interfaces/IPActionMisc.sol";
-import "../../libraries/Errors.sol";
+import "../interfaces/IPMarket.sol";
+import "../interfaces/IPActionMisc.sol";
+import "../core/libraries/Errors.sol";
 
 contract ActionMisc is IPActionMisc {
     using Math for uint256;

package/contracts/{core/actions → router}/ActionSwapPT.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 import "./base/ActionBaseMintRedeem.sol";
-import "../../interfaces/IPActionSwapPT.sol";
-import "../../interfaces/IPMarket.sol";
-import "../../libraries/Errors.sol";
+import "../interfaces/IPActionSwapPT.sol";
+import "../interfaces/IPMarket.sol";
+import "../core/libraries/Errors.sol";
 
 contract ActionSwapPT is IPActionSwapPT, ActionBaseMintRedeem {
     using MarketMathCore for MarketState;
@@ -204,7 +204,7 @@ contract ActionSwapPT is IPActionSwapPT, ActionBaseMintRedeem {
     ) internal returns (uint256 netPtOut, uint256 netScyFee) {
         MarketState memory state = IPMarket(market).readState();
 
-        (netPtOut, , ) = state.approxSwapExactScyForPt(
+        (netPtOut, ) = state.approxSwapExactScyForPt(
             YT.newIndex(),
             exactScyIn,
             block.timestamp,

package/contracts/{core/actions → router}/ActionSwapPTYT.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
-import "../../interfaces/IPActionSwapPTYT.sol";
-import "../../interfaces/IPMarket.sol";
+import "../interfaces/IPActionSwapPTYT.sol";
+import "../interfaces/IPMarket.sol";
 import "./base/CallbackHelper.sol";
 
 contract ActionSwapPTYT is IPActionSwapPTYT, CallbackHelper {
@@ -36,7 +36,7 @@ contract ActionSwapPTYT is IPActionSwapPTYT, CallbackHelper {
         PT.safeTransferFrom(msg.sender, market, exactPtIn);
 
         uint256 totalPtToSwap;
-        (netYtOut, , totalPtToSwap, netScyFee) = state.approxSwapExactPtForYt(
+        (netYtOut, totalPtToSwap, netScyFee) = state.approxSwapExactPtForYt(
             YT.newIndex(),
             exactPtIn,
             block.timestamp,
@@ -67,7 +67,7 @@ contract ActionSwapPTYT is IPActionSwapPTYT, CallbackHelper {
         YT.safeTransferFrom(msg.sender, address(YT), exactYtIn);
 
         uint256 totalPtSwapped;
-        (netPtOut, , totalPtSwapped, netScyFee) = state.approxSwapExactYtForPt(
+        (netPtOut, totalPtSwapped, netScyFee) = state.approxSwapExactYtForPt(
             YT.newIndex(),
             exactYtIn,
             block.timestamp,

package/contracts/{core/actions → router}/ActionSwapYT.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 import "./base/ActionBaseMintRedeem.sol";
 import "./base/CallbackHelper.sol";
-import "../../interfaces/IPActionSwapYT.sol";
-import "../../interfaces/IPMarket.sol";
-import "../../libraries/Errors.sol";
+import "../interfaces/IPActionSwapYT.sol";
+import "../interfaces/IPMarket.sol";
+import "../core/libraries/Errors.sol";
 
 contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
     using Math for uint256;
@@ -223,7 +223,7 @@ contract ActionSwapYT is IPActionSwapYT, ActionBaseMintRedeem, CallbackHelper {
     ) internal returns (uint256 netYtOut, uint256 netScyFee) {
         MarketState memory state = IPMarket(market).readState();
 
-        (netYtOut, , ) = state.approxSwapExactScyForYt(
+        (netYtOut, ) = state.approxSwapExactScyForYt(
             YT.newIndex(),
             exactScyIn,
             block.timestamp,

package/contracts/{core → router}/PendleRouter.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";
 import "@openzeppelin/contracts/proxy/Proxy.sol";
 import "../interfaces/IPAllAction.sol";
 import "../interfaces/IPMarketSwapCallback.sol";
-import "../periphery/BoringOwnableUpgradeable.sol";
-import "../libraries/Errors.sol";
+import "../core/libraries/BoringOwnableUpgradeable.sol";
+import "../core/libraries/Errors.sol";
 
 /// @dev this contract will be deployed behind an ERC1967 proxy
 /// calls to the ERC1967 proxy will be resolved at this contract, and proxied again to the

package/contracts/{core/actions → router}/base/ActionBaseMintRedeem.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
-import "../../../libraries/kyberswap/KyberSwapHelper.sol";
-import "../../../libraries/helpers/TokenHelper.sol";
-import "../../../interfaces/ISuperComposableYield.sol";
-import "../../../interfaces/IPYieldToken.sol";
-import "../../../libraries/Errors.sol";
+import "../kyberswap/KyberSwapHelper.sol";
+import "../../core/libraries/TokenHelper.sol";
+import "../../interfaces/ISuperComposableYield.sol";
+import "../../interfaces/IPYieldToken.sol";
+import "../../core/libraries/Errors.sol";
 
 // solhint-disable no-empty-blocks
 abstract contract ActionBaseMintRedeem is TokenHelper, KyberSwapHelper {

package/contracts/{core/actions → router}/base/CallbackHelper.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-pragma solidity 0.8.15;
+pragma solidity 0.8.17;
 
 abstract contract CallbackHelper {
     enum ActionType {